OSDN Git Service
satok [Thu, 4 Nov 2010 06:09:52 +0000 (23:09 -0700)]
Merge "Reset selected InputMethodSubtype when the checkbox for the selected InputMethodSubtype was disabled"
Daisuke Miyakawa [Thu, 4 Nov 2010 03:04:32 +0000 (20:04 -0700)]
Show "connecting" just after user's connect action
Bug:
3164013
Change-Id: Ide367d51bcd7fcd97403c92ee049a1bb2633e272
satok [Tue, 2 Nov 2010 19:11:56 +0000 (04:11 +0900)]
Reset selected InputMethodSubtype when the checkbox for the selected InputMethodSubtype was disabled
Change-Id: I04586cb4935b34d03af5e4dac54cfd000474af16
Jake Hamby [Wed, 3 Nov 2010 19:47:51 +0000 (12:47 -0700)]
Implement individual Bluetooth profile connect/disconnect.
Allow individual Bluetooth profiles to be connected/disconnected from
the device's settings pane.
Bug:
3137982
Change-Id: I21512c5bf965fc523f3dc1e83d029b16b5e22440
Amith Yamasani [Tue, 2 Nov 2010 16:52:29 +0000 (09:52 -0700)]
Fragmentize "Factory reset" setting screen.
Split the screen into 2 fragments.
Bug:
3148480
Eric Fischer [Mon, 1 Nov 2010 23:54:51 +0000 (16:54 -0700)]
Split strings referring to "phone" into phone and tablet variants.
Change-Id: If38152590580ff24da1c5593e1da53ac6b1952e2
Amith Yamasani [Tue, 2 Nov 2010 18:35:14 +0000 (11:35 -0700)]
Merge "Directly show edit dialog when a user dictionary word is selected."
Amith Yamasani [Sun, 31 Oct 2010 17:53:27 +0000 (10:53 -0700)]
Directly show edit dialog when a user dictionary word is selected.
Don't show the intermediate Edit/Delete options, since there is now
a direct way to delete an item.
Bug:
3148989
Change-Id: Iae39121ca8926c23bf0b10f4ef9a5dac210d2324
satok [Tue, 2 Nov 2010 07:12:10 +0000 (00:12 -0700)]
Merge "Save and update enabled Subtypes in InputMethodAndSubtypeEnabler"
satok [Mon, 1 Nov 2010 13:30:29 +0000 (22:30 +0900)]
Save and update enabled Subtypes in InputMethodAndSubtypeEnabler
Change-Id: I01ce22b7cc17457dde34967957a27658067ec674
Irfan Sheriff [Mon, 1 Nov 2010 21:23:25 +0000 (14:23 -0700)]
Remove channel control from debug builds
We dont need this in the UI now that
channel settings is gone. The country
code setting can be done from CLI
for debug purposes.
Bug:
2936741
Change-Id: Ic61abac30af99611af4d67662355068cea6dd4ed
Dianne Hackborn [Mon, 1 Nov 2010 19:32:33 +0000 (12:32 -0700)]
Further manage apps fragmentization.
All of the UI under manage apps should now be working. Various
cleanup through new framework APIs. Fragmentized developer settings.
Change-Id: I2b42a2dd0d015e0fdcde497579ddad3dceea9da2
satok [Mon, 1 Nov 2010 10:05:00 +0000 (19:05 +0900)]
Move classes related to input method to com.android.settings.inputmethod
- Updated proguard.flags
Change-Id: I198761b0f0ad5288c8c807a7a3c2e965731fcee5
satok [Mon, 1 Nov 2010 08:09:15 +0000 (17:09 +0900)]
Make InputMethodAndSubtypeUtil and share utilities by LanguageSettings and InputMethodAndSubtypeUtil
Change-Id: I70b9ce62a87a38054be0fce4234104aee9be9a87
Dianne Hackborn [Sat, 30 Oct 2010 01:24:24 +0000 (18:24 -0700)]
Merge "Start fragmentizing Manage Applications."
Daisuke Miyakawa [Sat, 30 Oct 2010 00:53:01 +0000 (17:53 -0700)]
Reduce default settings in WifiSetup XL.
We don't want to show every configurations in default, while
we also don't want to complicate basic wifi logics. In order to
achive both goals, we first introduce tweaked xml file
(wifi_config_preference2.xml). It does contain all the
config components but almost all of them are in "gone" visibility.
Those components are still able to act as data storage, but never
be seen as actual UI components.
Change-Id: I4ad3c1b4cbbe77ca2b628b0be25e2b3eb9d645aa
Dianne Hackborn [Fri, 29 Oct 2010 23:53:04 +0000 (16:53 -0700)]
Start fragmentizing Manage Applications.
Change-Id: I0c3d6a358d0236893aba7257537ec32bfad4170d
Daisuke Miyakawa [Fri, 29 Oct 2010 23:04:43 +0000 (16:04 -0700)]
Merge "Fix layout for WifiSettingsForXL"
Daisuke Miyakawa [Fri, 29 Oct 2010 23:03:23 +0000 (16:03 -0700)]
Fix layout for WifiSettingsForXL
Change-Id: I99b503005d199084062b63a2de1e049926b212a9
Dianne Hackborn [Fri, 29 Oct 2010 22:42:51 +0000 (15:42 -0700)]
am
5f301797: am
4e4ed14e: Fix issue #
3146784: ANR in manage applications
* commit '
5f3017975ac007c54b16cfa292a29832cb2c3c28':
Fix issue #
3146784: ANR in manage applications
Dianne Hackborn [Fri, 29 Oct 2010 22:40:36 +0000 (15:40 -0700)]
am
4e4ed14e: Fix issue #
3146784: ANR in manage applications
* commit '
4e4ed14ee2b82cb90a25b3027eb36f190ce2e1e7':
Fix issue #
3146784: ANR in manage applications
Dianne Hackborn [Fri, 29 Oct 2010 20:49:20 +0000 (13:49 -0700)]
Fix issue #
3146784: ANR in manage applications
See the big comment.
Change-Id: I36164a6fcba58fe2b0e2b3aa216780d0d0e5ed37
Amith Yamasani [Fri, 29 Oct 2010 17:27:26 +0000 (10:27 -0700)]
Remove extra labels from Volume settings.
Bug:
3013561
Amith Yamasani [Thu, 28 Oct 2010 16:50:32 +0000 (09:50 -0700)]
Fix proguard flags to retain FindNearby class.
Bug:
3140836
Amith Yamasani [Wed, 27 Oct 2010 23:27:15 +0000 (16:27 -0700)]
Merge "Bluetooth settings revamp"
Amith Yamasani [Tue, 26 Oct 2010 20:44:33 +0000 (13:44 -0700)]
Bluetooth settings revamp
Added a separate scanning screen.
UI changes to not require long-press options.
Needs TODOs to be filled by BT team.
Bug:
3038327
Eric Fischer [Wed, 27 Oct 2010 21:36:03 +0000 (14:36 -0700)]
Import revised translations.
Change-Id: I0d19c79e3e0ac76527671d181bb77e8944ec4a5f
satok [Tue, 26 Oct 2010 09:58:09 +0000 (18:58 +0900)]
Copy InputMethodSubtypeEnabler from the framework
- TODO: remove InputMethodSubtypeEnabler from the framework
Change-Id: I751f3c73197c855c7f186ff64465d88ed1e2b603
Daisuke Miyakawa [Wed, 27 Oct 2010 00:21:34 +0000 (17:21 -0700)]
Supress auto screen migration after wifi connection
Bug:
3133575
Change-Id: Ibf0a6cd8704d55cb5876c76a547a97664c4b82e4
Irfan Sheriff [Thu, 21 Oct 2010 23:45:15 +0000 (16:45 -0700)]
UI for wps pin from device
Bug:
3119043
Bug:
3112178
Change-Id: I573146ed0c834cb88d5f42c25fe0be3ed501a321
Jean-Baptiste Queru [Tue, 26 Oct 2010 00:59:56 +0000 (17:59 -0700)]
am
28539897: am
8815f032: Merge "Always set right auth_type value in apn."
Merge commit '
28539897151f0980b0a190ce82b3adf6337d081c'
* commit '
28539897151f0980b0a190ce82b3adf6337d081c':
Always set right auth_type value in apn.
Jean-Baptiste Queru [Tue, 26 Oct 2010 00:32:17 +0000 (17:32 -0700)]
am
8815f032: Merge "Always set right auth_type value in apn."
Merge commit '
8815f03202abf3117b6a1f6a058a835915ddae04' into gingerbread-plus-aosp
* commit '
8815f03202abf3117b6a1f6a058a835915ddae04':
Always set right auth_type value in apn.
Jean-Baptiste Queru [Mon, 25 Oct 2010 23:40:13 +0000 (16:40 -0700)]
Merge "Always set right auth_type value in apn."
Eric Fischer [Mon, 25 Oct 2010 23:22:34 +0000 (16:22 -0700)]
am
c26cfa35: (-s ours) am
873a27c3: Import revised translations. DO NOT MERGE
Merge commit '
c26cfa35b8e7d9e1ecc50f93825a05c08afed976'
* commit '
c26cfa35b8e7d9e1ecc50f93825a05c08afed976':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 25 Oct 2010 23:16:14 +0000 (16:16 -0700)]
am
873a27c3: Import revised translations. DO NOT MERGE
Merge commit '
873a27c399a50cb2a4703cc895c1601124ae208d' into gingerbread-plus-aosp
* commit '
873a27c399a50cb2a4703cc895c1601124ae208d':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 25 Oct 2010 22:46:11 +0000 (15:46 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I0cb51009ba4b9954dd673d7f653f0e0b8376ca72
Roy West [Mon, 25 Oct 2010 14:33:41 +0000 (07:33 -0700)]
Fix bug3100739 re dev admin settings strings
Change-Id: Ica5cc926fb8a3ec3af9d4925f086ded0ac683c3a
Marta Białka [Mon, 25 Oct 2010 13:39:04 +0000 (15:39 +0200)]
Always set right auth_type value in apn.
It fixes a bug that automatically sets auth_type value
of editing apn that has and should have that value set
to null (-1 = Not yet set) to auth_type value of an
apn previously displayed in the apn editor. It is
caused by careless persisting and reading data from
SharedPreferences. Fixed to keep and persist (to be
consistent with other apn's Preferences) null value
for not yet set auth_type property.
Change-Id: I4e125a4cdbad968c9f6ea8781a8c849f4c31c929
Daisuke Miyakawa [Sun, 24 Oct 2010 20:43:52 +0000 (13:43 -0700)]
Merge "Disable Wifi when a user press cancel in XL setup"
Eric Fischer [Fri, 22 Oct 2010 23:06:48 +0000 (16:06 -0700)]
am
0b655575: (-s ours) am
901f4fbe: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 22 Oct 2010 23:03:49 +0000 (16:03 -0700)]
am
901f4fbe: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 22 Oct 2010 23:01:29 +0000 (16:01 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 22 Oct 2010 22:31:13 +0000 (15:31 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I3edc02925b4d8bc149dd8a76056f86f3b5130e4e
Dianne Hackborn [Fri, 22 Oct 2010 20:01:02 +0000 (13:01 -0700)]
am
8731cb1b: am
5e34f239: Fix issue #
3124528: Mange applications is including cache files in storage size
Dianne Hackborn [Fri, 22 Oct 2010 19:59:31 +0000 (12:59 -0700)]
am
5e34f239: Fix issue #
3124528: Mange applications is including cache files in storage size
Dianne Hackborn [Fri, 22 Oct 2010 19:18:16 +0000 (12:18 -0700)]
Fix issue #
3124528: Mange applications is including cache files in storage size
Change-Id: If26aeaed7572354feca7b8e65b7451a024a10266
Jaikumar Ganesh [Tue, 19 Oct 2010 00:14:56 +0000 (17:14 -0700)]
Update BT APIs for change in return type.
Change-Id: Ic85b47da50876fd6bdc6e223af4248a8586d82bc
Mathew Inwood [Thu, 21 Oct 2010 17:43:35 +0000 (18:43 +0100)]
Add 'Use My Location for Google services'.
This interfaces to GSF to actually change the setting as Settings doesn't
have the permissions to do it directly. When GSF is not present on the device,
the setting will be hidden.
Depending on change: Ib3809571fe22f40ba34468d39fedfff70f0742ef
Bug:
3093036
Change-Id: I98596cce118f0fa5ebae45a7f8ab9c9f8a3bf2bc
Daisuke Miyakawa [Fri, 22 Oct 2010 02:40:16 +0000 (19:40 -0700)]
Disable Wifi when a user press cancel in XL setup
Bug:
3122182
Change-Id: Id333b9ede9093fa7fb8aa256b720effa5abf290d
Eric Fischer [Fri, 22 Oct 2010 01:31:02 +0000 (18:31 -0700)]
resolved conflicts for merge of
92acdba0 to master
Change-Id: I3598e15091fdb2593a2d9d56f6bf646ddc87e879
Eric Fischer [Fri, 22 Oct 2010 01:22:09 +0000 (18:22 -0700)]
am
a640fb4f: Fix the build. A "--" token is not just text in an XML comment.
Merge commit '
a640fb4f97ee5e317ed51bd585c892d465b3da38' into gingerbread-plus-aosp
* commit '
a640fb4f97ee5e317ed51bd585c892d465b3da38':
Fix the build. A "--" token is not just text in an XML comment.
Eric Fischer [Fri, 22 Oct 2010 01:15:34 +0000 (18:15 -0700)]
Fix the build. A "--" token is not just text in an XML comment.
Change-Id: Ifbc3de1dd209860f516920e5b9c1742813845380
Roy West [Fri, 22 Oct 2010 00:59:54 +0000 (17:59 -0700)]
am
d2927990: (-s ours) am
69827524: Try to fix bug3119318 without breaking the build this time
Merge commit '
d2927990ffe0d8ac385e16a38c189ace00065cff'
* commit '
d2927990ffe0d8ac385e16a38c189ace00065cff':
Try to fix bug3119318 without breaking the build this time
Roy West [Fri, 22 Oct 2010 00:53:37 +0000 (17:53 -0700)]
am
69827524: Try to fix bug3119318 without breaking the build this time
Merge commit '
69827524365ae448d19b2089c46534e925cc2bfd' into gingerbread-plus-aosp
* commit '
69827524365ae448d19b2089c46534e925cc2bfd':
Try to fix bug3119318 without breaking the build this time
Roy West [Fri, 22 Oct 2010 00:18:40 +0000 (17:18 -0700)]
Try to fix bug3119318 without breaking the build this time
Change-Id: Ic89675546f3ab72588ce18fbe7740749da6f870c
Jean-Baptiste Queru [Fri, 22 Oct 2010 00:18:58 +0000 (17:18 -0700)]
Merge from gingerbread-plus-aosp
Change-Id: Ib645dbd78ffc393b6cbe568d9a351ced2d3adc30
Mathias Agopian [Fri, 22 Oct 2010 00:07:11 +0000 (17:07 -0700)]
am
9f869d11: Revert "Fix bug3119318, missing Mount USB storage strings"
Merge commit '
9f869d1198fcf1866ad2a6451df05f5d72653711' into gingerbread-plus-aosp
* commit '
9f869d1198fcf1866ad2a6451df05f5d72653711':
Revert "Fix bug3119318, missing Mount USB storage strings"
Mathias Agopian [Thu, 21 Oct 2010 23:37:59 +0000 (16:37 -0700)]
Revert "Fix bug3119318, missing Mount USB storage strings"
This reverts commit
af06d7a94a69d82ef5f2d8082e75c368f4204afb.
Roy West [Thu, 21 Oct 2010 22:57:35 +0000 (15:57 -0700)]
am
af06d7a9: Fix bug3119318, missing Mount USB storage strings
Merge commit '
af06d7a94a69d82ef5f2d8082e75c368f4204afb' into gingerbread-plus-aosp
* commit '
af06d7a94a69d82ef5f2d8082e75c368f4204afb':
Fix bug3119318, missing Mount USB storage strings
Roy West [Thu, 21 Oct 2010 22:47:14 +0000 (15:47 -0700)]
Fix bug3119318, missing Mount USB storage strings
Change-Id: Iefebd97d85ad4a51f604e9a7fa709ba84c94239d
Nick Pelly [Thu, 21 Oct 2010 20:50:02 +0000 (13:50 -0700)]
am
26d6e470: am
781c0aa2: Merge "NFC Settings cleanup." into gingerbread
Merge commit '
26d6e4704a9e514097ad88c04b29a4e8b325344f'
* commit '
26d6e4704a9e514097ad88c04b29a4e8b325344f':
NFC Settings cleanup.
Dianne Hackborn [Thu, 21 Oct 2010 20:47:00 +0000 (13:47 -0700)]
am
149fec6a: am
7a519955: Merge "Fix issue #
3114356: Storage visualization in Manage Apps is confusing" into gingerbread
Merge commit '
149fec6a899079eba30743e7055834969c138d52'
* commit '
149fec6a899079eba30743e7055834969c138d52':
Fix issue #
3114356: Storage visualization in Manage Apps is confusing
Nick Pelly [Thu, 21 Oct 2010 20:46:55 +0000 (13:46 -0700)]
am
029f23c3: am
ff8018dc: Merge "Fix NFC permission." into gingerbread
Merge commit '
029f23c32c9fe0c7f288d383a8704bfa420d4ed0'
* commit '
029f23c32c9fe0c7f288d383a8704bfa420d4ed0':
Fix NFC permission.
Dianne Hackborn [Thu, 21 Oct 2010 17:41:35 +0000 (10:41 -0700)]
am
5cfa7587: am
916adce0: Fix issue #
3108683: GRH18: Battery usage chart FCs
Merge commit '
5cfa75875fcb2701fbe3b8cf861c4c1d0e38e5e7'
* commit '
5cfa75875fcb2701fbe3b8cf861c4c1d0e38e5e7':
Fix issue #
3108683: GRH18: Battery usage chart FCs
Nick Pelly [Thu, 21 Oct 2010 16:37:55 +0000 (09:37 -0700)]
am
781c0aa2: Merge "NFC Settings cleanup." into gingerbread
Merge commit '
781c0aa21ed1e4a38dc3ec1a5facc7be48386571' into gingerbread-plus-aosp
* commit '
781c0aa21ed1e4a38dc3ec1a5facc7be48386571':
NFC Settings cleanup.
Nick Pelly [Thu, 21 Oct 2010 10:56:18 +0000 (03:56 -0700)]
Merge "NFC Settings cleanup." into gingerbread
Nick Pelly [Thu, 21 Oct 2010 01:42:23 +0000 (18:42 -0700)]
NFC Settings cleanup.
NFC service now tracks its own settings. Call the NFC API to determine
state.
Change-Id: Ibdb33e68abdbe36df31fb13ad95c8ca1b3bcb35b
Signed-off-by: Nick Pelly <npelly@google.com>
Dianne Hackborn [Thu, 21 Oct 2010 00:05:19 +0000 (17:05 -0700)]
am
7a519955: Merge "Fix issue #
3114356: Storage visualization in Manage Apps is confusing" into gingerbread
Merge commit '
7a51995581128a9ade44682abe064d9fcca79aa6' into gingerbread-plus-aosp
* commit '
7a51995581128a9ade44682abe064d9fcca79aa6':
Fix issue #
3114356: Storage visualization in Manage Apps is confusing
Dianne Hackborn [Wed, 20 Oct 2010 23:58:47 +0000 (16:58 -0700)]
Merge "Fix issue #
3114356: Storage visualization in Manage Apps is confusing" into gingerbread
Dianne Hackborn [Wed, 20 Oct 2010 23:01:50 +0000 (16:01 -0700)]
Fix issue #
3114356: Storage visualization in Manage Apps is confusing
Also fixes issue #
3097388: If you launch Manage Applications when SD
card app info isn't available, incomplete information gets cached
Change-Id: If3377a965653590e5bc1df25e38764a83e96b820
Nick Pelly [Wed, 20 Oct 2010 23:47:25 +0000 (16:47 -0700)]
am
ff8018dc: Merge "Fix NFC permission." into gingerbread
Merge commit '
ff8018dcbd0488160519481d4ca1567fa397d44e' into gingerbread-plus-aosp
* commit '
ff8018dcbd0488160519481d4ca1567fa397d44e':
Fix NFC permission.
Nick Pelly [Wed, 20 Oct 2010 23:44:41 +0000 (16:44 -0700)]
Merge "Fix NFC permission." into gingerbread
Nick Pelly [Wed, 20 Oct 2010 23:39:44 +0000 (16:39 -0700)]
Fix NFC permission.
(it's not actually needed right now, hence why nothing was broken).
Change-Id: I52ea0b49a77eca4e3a688d37aa721d3483227553
Dianne Hackborn [Wed, 20 Oct 2010 01:20:40 +0000 (18:20 -0700)]
am
916adce0: Fix issue #
3108683: GRH18: Battery usage chart FCs
Merge commit '
916adce02d5b37038cd78d11a8c884237684f9a8' into gingerbread-plus-aosp
* commit '
916adce02d5b37038cd78d11a8c884237684f9a8':
Fix issue #
3108683: GRH18: Battery usage chart FCs
Jean-Baptiste Queru [Tue, 19 Oct 2010 23:44:23 +0000 (16:44 -0700)]
Fix build
This was causing a resource conflict in open-source crespo builds
Change-Id: I7b683d735c851b830fdbab90c78096736ca4f5dd
Dianne Hackborn [Tue, 19 Oct 2010 23:23:53 +0000 (16:23 -0700)]
Fix issue #
3108683: GRH18: Battery usage chart FCs
Make array more bigger, and bounds check the thing.
Change-Id: Iaffebefd27c16c6ecf57566803859be1a5049b8a
Brad Fitzpatrick [Tue, 19 Oct 2010 17:43:43 +0000 (10:43 -0700)]
am
4036e768: am
d36d650a: NFC: async enabling/disabling, ala Bluewooth & Wifi.
Merge commit '
4036e768d0909ba947eb205d12d1dd3b23ed492b'
* commit '
4036e768d0909ba947eb205d12d1dd3b23ed492b':
NFC: async enabling/disabling, ala Bluewooth & Wifi.
Brad Fitzpatrick [Tue, 19 Oct 2010 17:43:38 +0000 (10:43 -0700)]
am
17001cea: NFC: async enabling/disabling, ala Bluewooth & Wifi.
Merge commit '
17001cea9e198228c55111871518ebdf710f8544'
* commit '
17001cea9e198228c55111871518ebdf710f8544':
NFC: async enabling/disabling, ala Bluewooth & Wifi.
Daisuke Miyakawa [Tue, 19 Oct 2010 17:10:25 +0000 (10:10 -0700)]
UI refresh
Bug:
3110575
Change-Id: Ia6ffef6de8882920b89372052b5e29968bedfe5f
Roy West [Tue, 19 Oct 2010 02:57:59 +0000 (19:57 -0700)]
resolved conflicts for merge of
98f3aff3 to master
Change-Id: Icfc107998728e8571cf1e887027ab0067f3d40f8
Brad Fitzpatrick [Tue, 19 Oct 2010 00:04:16 +0000 (17:04 -0700)]
am
d36d650a: NFC: async enabling/disabling, ala Bluewooth & Wifi.
Merge commit '
d36d650a8132e8aea375239e6dfff92708771b7a' into gingerbread-plus-aosp
* commit '
d36d650a8132e8aea375239e6dfff92708771b7a':
NFC: async enabling/disabling, ala Bluewooth & Wifi.
Brad Fitzpatrick [Mon, 18 Oct 2010 21:04:24 +0000 (14:04 -0700)]
NFC: async enabling/disabling, ala Bluewooth & Wifi.
Don't ANR when toggling.
Bug:
3097279
Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8
Dan Morrill [Mon, 18 Oct 2010 22:43:18 +0000 (15:43 -0700)]
Merge commit '
b7eb8cdad900fc0ddd2d6a7fd79ab7a716c62841' into mergefix
Conflicts:
res/values/strings.xml
Change-Id: I5da845de77ffd95c5008fdc081cc1e3abef4fad5
Brad Fitzpatrick [Mon, 18 Oct 2010 21:04:24 +0000 (14:04 -0700)]
NFC: async enabling/disabling, ala Bluewooth & Wifi.
Don't ANR when toggling.
Bug:
3097279
Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8
Dan Morrill [Mon, 18 Oct 2010 22:23:16 +0000 (15:23 -0700)]
Merge commit '
593a7049f52d46a4e47162e2e3f2c5730e8ccfd8' into mergefix
Conflicts:
res/values/strings.xml
src/com/android/settings/deviceinfo/Memory.java
Change-Id: Id481ad234f2e74bdef66ea9485a548f11f0cab84
Roy West [Mon, 18 Oct 2010 18:33:34 +0000 (11:33 -0700)]
am
dd49624e: Del "erase" from new unmount setting subtext
Merge commit '
dd49624ed049d6f2f9946f71381bcde83f19e5e0' into gingerbread-plus-aosp
* commit '
dd49624ed049d6f2f9946f71381bcde83f19e5e0':
Del "erase" from new unmount setting subtext
Kenny Root [Mon, 18 Oct 2010 17:32:46 +0000 (10:32 -0700)]
am
ea86bcd1: (-s ours) am
3594b1b7: Import revised translations DO NOT MERGE
Merge commit '
ea86bcd12bed863ec6d5109ea84572f355c88609'
* commit '
ea86bcd12bed863ec6d5109ea84572f355c88609':
Import revised translations DO NOT MERGE
Roy West [Mon, 18 Oct 2010 10:12:57 +0000 (03:12 -0700)]
Del "erase" from new unmount setting subtext
Change-Id: I4beca53892d446578f36a7c32847465dcc7999f3
Roy West [Sun, 17 Oct 2010 21:04:25 +0000 (14:04 -0700)]
am
8abc40bb: Correct some typos, impose more consistency.
Merge commit '
8abc40bb11690125fa441775041e0a64c79acc43' into gingerbread-plus-aosp
* commit '
8abc40bb11690125fa441775041e0a64c79acc43':
Correct some typos, impose more consistency.
Nick Pelly [Sun, 17 Oct 2010 18:15:48 +0000 (11:15 -0700)]
am
fb515337: am
e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread
Merge commit '
fb515337c2c8ceefe47b7387ebffa2b3185ef2ba'
* commit '
fb515337c2c8ceefe47b7387ebffa2b3185ef2ba':
Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
Roy West [Sun, 17 Oct 2010 16:19:34 +0000 (09:19 -0700)]
Correct some typos, impose more consistency.
Change-Id: Id2532a8eb619c38a8c683e77ae449b740d7b9bda
Dianne Hackborn [Sat, 16 Oct 2010 23:55:30 +0000 (16:55 -0700)]
am
1337d0f7: Implement issue #
3094621 and #
3094609 - wipe sd card
Merge commit '
1337d0f70b18dd732c6a617be83e5be0bb8f2f87' into gingerbread-plus-aosp
* commit '
1337d0f70b18dd732c6a617be83e5be0bb8f2f87':
Implement issue #
3094621 and #
3094609 - wipe sd card
Dianne Hackborn [Thu, 14 Oct 2010 18:58:30 +0000 (11:58 -0700)]
Implement issue #
3094621 and #
3094609 - wipe sd card
3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command
Implements requested UI changes. Also some final tweaks to
Manage Applications.
Change-Id: I0219195dd0c74d8c003ef1c3f6e09714859d7f89
Amith Yamasani [Sat, 16 Oct 2010 16:43:15 +0000 (09:43 -0700)]
am
8de45a66: am
1bdb7874: Make summary appear for both checked and unchecked NFC checkbox in Settings.
Merge commit '
8de45a6686b298d09c5195e332f202223a555b91'
* commit '
8de45a6686b298d09c5195e332f202223a555b91':
Make summary appear for both checked and unchecked NFC checkbox in Settings.
Roy West [Sat, 16 Oct 2010 16:13:43 +0000 (09:13 -0700)]
am
d3c1749b: am
2c489973: Change USB tab to USB storage if it fits
Merge commit '
d3c1749b779397612f82e347bb0d886b1d9a35bc'
* commit '
d3c1749b779397612f82e347bb0d886b1d9a35bc':
Change USB tab to USB storage if it fits
Roy West [Sat, 16 Oct 2010 15:59:43 +0000 (08:59 -0700)]
am
cfcad4e4: am
d3abea0d: Fix a few more cases of USB storage missed at 4am pass...
Merge commit '
cfcad4e45f422606b5ce5e09a6e53ba58e790f63'
* commit '
cfcad4e45f422606b5ce5e09a6e53ba58e790f63':
Fix a few more cases of USB storage missed at 4am pass...
Jaikumar Ganesh [Sat, 16 Oct 2010 15:52:36 +0000 (08:52 -0700)]
am
7805fa99: am
022299df: Merge "Disconnect dock only if its connected." into gingerbread
Merge commit '
7805fa99ffce21bb9b016ffdd5375d331b9a8a54'
* commit '
7805fa99ffce21bb9b016ffdd5375d331b9a8a54':
Disconnect dock only if its connected.
Kenny Root [Sat, 16 Oct 2010 01:41:47 +0000 (18:41 -0700)]
am
3594b1b7: Import revised translations DO NOT MERGE
Merge commit '
3594b1b73d022d5815bcdef78e6143cfd63ee354' into gingerbread-plus-aosp
* commit '
3594b1b73d022d5815bcdef78e6143cfd63ee354':
Import revised translations DO NOT MERGE
Nick Pelly [Sat, 16 Oct 2010 01:21:06 +0000 (18:21 -0700)]
am
e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread
Merge commit '
e1a9ca686249ebe7c85a98d467bb705e4c3eed2f' into gingerbread-plus-aosp
* commit '
e1a9ca686249ebe7c85a98d467bb705e4c3eed2f':
Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
Kenny Root [Fri, 15 Oct 2010 23:49:33 +0000 (16:49 -0700)]
am
c915d16a: (-s ours) am
b5848295: Merge "Import revised translations" into gingerbread
Merge commit '
c915d16a909cdb69b8de2fa957a388025f022de7'
* commit '
c915d16a909cdb69b8de2fa957a388025f022de7':
Import revised translations