OSDN Git Service
Daisuke Miyakawa [Sat, 29 Jan 2011 20:06:31 +0000 (12:06 -0800)]
am
bb627e40: am
a93196f1: Take care of null in Wifi setup.
* commit '
bb627e40cf7c174eb701eca8825e087355ba5eee':
Take care of null in Wifi setup.
Daisuke Miyakawa [Sat, 29 Jan 2011 20:04:06 +0000 (12:04 -0800)]
am
a93196f1: Take care of null in Wifi setup.
* commit '
a93196f1651a0598d6e398f6fb3c2e513a3b7091':
Take care of null in Wifi setup.
Daisuke Miyakawa [Sat, 29 Jan 2011 19:55:24 +0000 (11:55 -0800)]
Take care of null in Wifi setup.
The preference isn't available in Wifi setup launched from
SetupWizard, causing NPE.
Bug:
3404998
Change-Id: Ia0dabea95e5e7424698a269c0851d610fd305309
Irfan Sheriff [Sat, 29 Jan 2011 18:17:12 +0000 (10:17 -0800)]
am
6c15162b: am
abeff000: Change sleep policy strings
* commit '
6c15162b7dd22e43852b1af3a38102a07f721f1c':
Change sleep policy strings
Irfan Sheriff [Sat, 29 Jan 2011 18:14:45 +0000 (10:14 -0800)]
am
abeff000: Change sleep policy strings
* commit '
abeff000fdd0c421ee514effb83c202174209b9d':
Change sleep policy strings
Eric Fischer [Sat, 29 Jan 2011 17:18:11 +0000 (09:18 -0800)]
am
8c152471: (-s ours) am
abdfaed8: (-s ours) am
5a2bb8c0: Import revised translations. DO NOT MERGE
* commit '
8c152471853613730429fa9104ad9ff61efa91ec':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 29 Jan 2011 17:12:45 +0000 (09:12 -0800)]
am
abdfaed8: (-s ours) am
5a2bb8c0: Import revised translations. DO NOT MERGE
* commit '
abdfaed8f4791a5f1776a005dd58c33e595842e8':
Import revised translations. DO NOT MERGE
Irfan Sheriff [Sat, 29 Jan 2011 16:58:23 +0000 (08:58 -0800)]
Change sleep policy strings
Bug:
3404049
Change-Id: I8ad3eae778c1695fc98aaca01ef26677fa8106f1
Eric Fischer [Sat, 29 Jan 2011 16:35:39 +0000 (08:35 -0800)]
am
f3ee2680: (-s ours) am
0cd5e21a: (-s ours) am
95112e5b: Import revised translations. DO NOT MERGE
* commit '
f3ee2680bc6a8dfd8b1cf09e2306fdc74476bd21':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 29 Jan 2011 16:02:39 +0000 (08:02 -0800)]
am
0cd5e21a: (-s ours) am
95112e5b: Import revised translations. DO NOT MERGE
* commit '
0cd5e21a40fce62738792a45608a9b9391f62d2b':
Import revised translations. DO NOT MERGE
Hung-ying Tyan [Sat, 29 Jan 2011 10:33:57 +0000 (02:33 -0800)]
am
2188a5e7: am
27682b0a: Merge "Clear mDialogFragment when it\'s detached" into honeycomb
* commit '
2188a5e7e5e8c070e0cc6913e0ded0d35288fbb8':
Clear mDialogFragment when it's detached
Hung-ying Tyan [Sat, 29 Jan 2011 10:31:34 +0000 (02:31 -0800)]
am
27682b0a: Merge "Clear mDialogFragment when it\'s detached" into honeycomb
* commit '
27682b0aff076e9d4ef6c4651effc9ce47ff6fb6':
Clear mDialogFragment when it's detached
Hung-ying Tyan [Sat, 29 Jan 2011 10:29:15 +0000 (02:29 -0800)]
Merge "Clear mDialogFragment when it's detached" into honeycomb
Vasu Nori [Sat, 29 Jan 2011 02:45:12 +0000 (18:45 -0800)]
am
1acf3d16: am
a0098bd3: Merge "bug:
3402846 fix settings->storage" into honeycomb
* commit '
1acf3d16298ac6a9c807db71d1a0f8908b9bed3d':
bug:
3402846 fix settings->storage
Vasu Nori [Sat, 29 Jan 2011 02:42:50 +0000 (18:42 -0800)]
am
a0098bd3: Merge "bug:
3402846 fix settings->storage" into honeycomb
* commit '
a0098bd34602acdf129ded0152ffeb07bb64d28d':
bug:
3402846 fix settings->storage
Vasu Nori [Sat, 29 Jan 2011 02:39:38 +0000 (18:39 -0800)]
Merge "bug:
3402846 fix settings->storage" into honeycomb
Irfan Sheriff [Sat, 29 Jan 2011 01:32:45 +0000 (17:32 -0800)]
am
c3bc1104: am
7bdf0e73: Move sleep policy to main settings page
* commit '
c3bc1104666ca4b54b849a5642ce7bc963a8e065':
Move sleep policy to main settings page
Irfan Sheriff [Sat, 29 Jan 2011 01:30:59 +0000 (17:30 -0800)]
am
7bdf0e73: Move sleep policy to main settings page
* commit '
7bdf0e73d051f176fbc20451761eb50177d69f91':
Move sleep policy to main settings page
Vasu Nori [Fri, 28 Jan 2011 22:32:45 +0000 (14:32 -0800)]
bug:
3402846 fix settings->storage
Change-Id: Icb9e33cb0336f87f43797330f56e9c8fcbe2dfd0
Irfan Sheriff [Sat, 29 Jan 2011 00:42:33 +0000 (16:42 -0800)]
Move sleep policy to main settings page
Bug:
3404049
Change-Id: I091abd737894a4adb9ebfc08b8e63bc3224b971c
Daisuke Miyakawa [Sat, 29 Jan 2011 00:28:57 +0000 (16:28 -0800)]
am
e4df0b3e: am
46f4b754: Merge "Enlarge texts and fit the other elements" into honeycomb
* commit '
e4df0b3ec87ddcb6d480ffff5c954d9eee7bef74':
Enlarge texts and fit the other elements
Daisuke Miyakawa [Sat, 29 Jan 2011 00:26:08 +0000 (16:26 -0800)]
am
46f4b754: Merge "Enlarge texts and fit the other elements" into honeycomb
* commit '
46f4b754e1173cfc7065df39311ab5c30f92ed60':
Enlarge texts and fit the other elements
Daisuke Miyakawa [Sat, 29 Jan 2011 00:23:45 +0000 (16:23 -0800)]
Merge "Enlarge texts and fit the other elements" into honeycomb
Eric Fischer [Fri, 28 Jan 2011 23:18:20 +0000 (15:18 -0800)]
am
72badf79: (-s ours) am
335387da: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
72badf79b4e86b6815e81d0e0dc2140799691fcf':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 28 Jan 2011 23:14:04 +0000 (15:14 -0800)]
am
335387da: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
335387dafe912d3487ef93aa3250ca3059bdfd48':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 28 Jan 2011 23:10:11 +0000 (15:10 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Eric Fischer [Fri, 28 Jan 2011 22:58:24 +0000 (14:58 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Ifb50963e88a2d7c48440f0be4b411ede41ec0998
Jake Hamby [Fri, 28 Jan 2011 22:25:37 +0000 (14:25 -0800)]
am
e3b22331: am
e1f883a3: Merge "Don\'t display extra A2DP profile icon for OPP." into honeycomb
* commit '
e3b223310787a3603dce40c776e55e4a911c6025':
Don't display extra A2DP profile icon for OPP.
Jake Hamby [Fri, 28 Jan 2011 22:23:13 +0000 (14:23 -0800)]
am
e1f883a3: Merge "Don\'t display extra A2DP profile icon for OPP." into honeycomb
* commit '
e1f883a38c13ebb8ac7a66172f30b3b01b4577c0':
Don't display extra A2DP profile icon for OPP.
Daisuke Miyakawa [Thu, 27 Jan 2011 02:37:10 +0000 (18:37 -0800)]
Enlarge texts and fit the other elements
Basically set text size to 18sp and change layouts
along with the new design.
- Add custom list item xml for Wi-Fi security field
rename existing "custom_list_item.xml" to appropriate
name so that we won't be confused with their naming.
- Use the custom xml just in SetupWizard.
Bug:
3364731
Change-Id: I014903277a03c359ea193dd0f0a37c84ade19fa1
Jake Hamby [Fri, 28 Jan 2011 22:21:19 +0000 (14:21 -0800)]
Merge "Don't display extra A2DP profile icon for OPP." into honeycomb
Eric Fischer [Fri, 28 Jan 2011 22:16:07 +0000 (14:16 -0800)]
am
5a2bb8c0: Import revised translations. DO NOT MERGE
* commit '
5a2bb8c0dc33837696f80d6690d51f031d7884c8':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 28 Jan 2011 21:21:54 +0000 (13:21 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Ic85518cac2e5c92d829bc71da778b68259524624
Daisuke Miyakawa [Fri, 28 Jan 2011 20:39:58 +0000 (12:39 -0800)]
am
b03c6276: am
a7155141: Merge "Disable "add network" button." into honeycomb
* commit '
b03c6276248475212d98e0ebae34dbf534f2c714':
Disable "add network" button.
Daisuke Miyakawa [Fri, 28 Jan 2011 20:38:27 +0000 (12:38 -0800)]
am
a7155141: Merge "Disable "add network" button." into honeycomb
* commit '
a71551418cfeeb6da335bbc83fca80de4a82fa07':
Disable "add network" button.
Daisuke Miyakawa [Fri, 28 Jan 2011 20:36:07 +0000 (12:36 -0800)]
Merge "Disable "add network" button." into honeycomb
Daisuke Miyakawa [Fri, 28 Jan 2011 17:53:52 +0000 (09:53 -0800)]
Disable "add network" button.
It has broken UI which possibly get users stuck.
Bug:
3400715
Change-Id: Ic618078bc70a7db35ec22e6382b9486e92630120
satok [Fri, 28 Jan 2011 17:50:59 +0000 (09:50 -0800)]
am
0f28e832: am
c9cd29dd: Remove invalid call of "clearFocus" in SetupWizard......
* commit '
0f28e83298a13328f7cd6147187a56c2a30b3e3f':
Remove invalid call of "clearFocus" in SetupWizard......
satok [Fri, 28 Jan 2011 17:49:34 +0000 (09:49 -0800)]
am
c9cd29dd: Remove invalid call of "clearFocus" in SetupWizard......
* commit '
c9cd29ddb832fd76d96fea080abe8325a8bb1bd2':
Remove invalid call of "clearFocus" in SetupWizard......
Hung-ying Tyan [Fri, 28 Jan 2011 08:17:27 +0000 (16:17 +0800)]
Clear mDialogFragment when it's detached
and re-associate it when it's re-created.
Before this CL, the association is gone when fragment goes through the pause-resume
cycle.
Similarly, restore onDismiss and onCancel listeners in VpnSettings.onCreateDialog(),
restore states in onCreate() instead of onActivityCreated() so that screen rotation
can be handled correctly.
Now that profiles are shared between Settings instances, always handle state change
in VpnSettings.changeState() so that state changed in one instance can be conveyed
to the other and preferences can be correctly enabled/disabled.
In additions, fix some trivial mistakes in VpnSettings.
Bug:
3396394
Change-Id: I242e1ed6c6d410b4dfefb373d8f98266fc9b46d0
satok [Fri, 28 Jan 2011 08:36:27 +0000 (17:36 +0900)]
Remove invalid call of "clearFocus" in SetupWizard......
Bug:
3398097
- Also disabled logging......
- Once you call "clearFocus", onFocusChanged will be called and
EditText will try to show the keyboard again. And while bringing up the keyboard,
the activity is changed and it will end up with the keyboard being shown in the next activity...
Change-Id: If4d3876d4950bb2583c5588f462a94d022d6a7cf
Dianne Hackborn [Fri, 28 Jan 2011 07:22:13 +0000 (23:22 -0800)]
am
9a406ea1: am
a5082305: Merge "Fix issue #
3400255 Dialog fragments crash on rotation in Settings app" into honeycomb
* commit '
9a406ea101401f6f883aadced93b21bdcfa45c0d':
Fix issue #
3400255 Dialog fragments crash on rotation in Settings app
Dianne Hackborn [Fri, 28 Jan 2011 07:20:37 +0000 (23:20 -0800)]
am
a5082305: Merge "Fix issue #
3400255 Dialog fragments crash on rotation in Settings app" into honeycomb
* commit '
a5082305e8c4f3107ec1802b9fd911aba1c288f3':
Fix issue #
3400255 Dialog fragments crash on rotation in Settings app
Dianne Hackborn [Fri, 28 Jan 2011 07:19:13 +0000 (23:19 -0800)]
Merge "Fix issue #
3400255 Dialog fragments crash on rotation in Settings app" into honeycomb
Dianne Hackborn [Fri, 28 Jan 2011 04:39:21 +0000 (20:39 -0800)]
Fix issue #
3400255 Dialog fragments crash on rotation in Settings app
Change-Id: I337c1fb41e3fbedd7982418df497487481bb35d2
Jake Hamby [Fri, 28 Jan 2011 04:32:21 +0000 (20:32 -0800)]
Don't display extra A2DP profile icon for OPP.
The getDrawableResource() method for OppProfileManager was returning
the resource ID for the A2DP icon. This was causing an extra headset
icon to be drawn for devices supporting OPP, when no icon should be
shown for this profile. Changed to return 0.
Bug:
3368197
Change-Id: Idcadaf59fe53301544cda215ca24f15608b2d727
Justin Ho [Fri, 28 Jan 2011 03:10:23 +0000 (19:10 -0800)]
am
f74f870b: am
3b3af8d3: Merge "Updating Delete and Refresh icons to Honeycomb style" into honeycomb
* commit '
f74f870ba135d8a5e8e7b99b0089c88f516881d1':
Updating Delete and Refresh icons to Honeycomb style
Justin Ho [Fri, 28 Jan 2011 03:08:25 +0000 (19:08 -0800)]
am
3b3af8d3: Merge "Updating Delete and Refresh icons to Honeycomb style" into honeycomb
* commit '
3b3af8d3b0e6f76c355ce5363ed4c582f620cc4e':
Updating Delete and Refresh icons to Honeycomb style
Justin Ho [Fri, 28 Jan 2011 03:06:24 +0000 (19:06 -0800)]
Merge "Updating Delete and Refresh icons to Honeycomb style" into honeycomb
Jake Hamby [Fri, 28 Jan 2011 02:40:51 +0000 (18:40 -0800)]
am
792fb594: am
3d1fd57e: Increase size of BT profile icons and decrease alpha for inactive profiles
* commit '
792fb594d58358eee869f69b4000b50c2a235033':
Increase size of BT profile icons and decrease alpha for inactive profiles
Jake Hamby [Fri, 28 Jan 2011 02:38:58 +0000 (18:38 -0800)]
am
3d1fd57e: Increase size of BT profile icons and decrease alpha for inactive profiles
* commit '
3d1fd57e3063d9501266dc46e13df63eb4ba685a':
Increase size of BT profile icons and decrease alpha for inactive profiles
Jake Hamby [Fri, 28 Jan 2011 02:15:51 +0000 (18:15 -0800)]
Increase size of BT profile icons and decrease alpha for inactive profiles
Increase the size of the Bluetooth profile icons from 20dp to 30dp.
Decrease the alpha for disabled profile icons to 50% of theme default.
Bug:
3400851
Change-Id: Ieb5ecb01ccbd7185d383828e0d9c9f78525ee0c4
Justin Ho [Fri, 28 Jan 2011 01:59:23 +0000 (17:59 -0800)]
Updating Delete and Refresh icons to Honeycomb style
Bug:
3362749
Change-Id: Ib4b61c9e7db05b0627c1f353d3747268455dab6c
Amith Yamasani [Thu, 27 Jan 2011 23:16:43 +0000 (15:16 -0800)]
am
6a66b5c8: am
a4035aef: Merge "Use the correct resource id for Battery use shortcut title." into honeycomb
* commit '
6a66b5c861bc3fcf8af2c8592c071d52809998d0':
Use the correct resource id for Battery use shortcut title.
Jake Hamby [Thu, 27 Jan 2011 23:11:13 +0000 (15:11 -0800)]
am
f2941db7: am
6d509d2f: Merge "Fix settings NPE crash on launch." into honeycomb
* commit '
f2941db77a82cff807e2318b4780dfd7e9c83823':
Fix settings NPE crash on launch.
Justin Ho [Thu, 27 Jan 2011 23:11:08 +0000 (15:11 -0800)]
am
8d263307: am
c5708925: Adding missing hdpi assets
* commit '
8d2633075f8b2459656beb5ade5235465a6ed9e3':
Adding missing hdpi assets
Amith Yamasani [Thu, 27 Jan 2011 23:11:04 +0000 (15:11 -0800)]
am
a4035aef: Merge "Use the correct resource id for Battery use shortcut title." into honeycomb
* commit '
a4035aef92132ec1e74e3af15f0adad9c1913ae4':
Use the correct resource id for Battery use shortcut title.
Amith Yamasani [Thu, 27 Jan 2011 23:08:34 +0000 (15:08 -0800)]
Merge "Use the correct resource id for Battery use shortcut title." into honeycomb
Eric Fischer [Thu, 27 Jan 2011 23:03:43 +0000 (15:03 -0800)]
am
95112e5b: Import revised translations. DO NOT MERGE
* commit '
95112e5b9810b6a70974ace6ee1c017b57e466af':
Import revised translations. DO NOT MERGE
Jake Hamby [Thu, 27 Jan 2011 23:03:40 +0000 (15:03 -0800)]
am
6d509d2f: Merge "Fix settings NPE crash on launch." into honeycomb
* commit '
6d509d2f35e39bcdc9c8fc01bf66b63d61c84192':
Fix settings NPE crash on launch.
Amith Yamasani [Thu, 27 Jan 2011 22:58:21 +0000 (14:58 -0800)]
Use the correct resource id for Battery use shortcut title.
Bug:
3399262
When displaying a list of shortcuts to settings screens, "Storage
settings" was used instead of "Battery use".
Change-Id: I4d445f188fc45d66623dc83e9eb2f9b045899561
Jake Hamby [Thu, 27 Jan 2011 22:05:44 +0000 (14:05 -0800)]
Merge "Fix settings NPE crash on launch." into honeycomb
Eric Fischer [Thu, 27 Jan 2011 22:04:11 +0000 (14:04 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I64435ed3b620c5e748b0f15017d548eadf7adbd5
Justin Ho [Thu, 27 Jan 2011 18:38:01 +0000 (10:38 -0800)]
am
c5708925: Adding missing hdpi assets
* commit '
c5708925c6355978f2752ed6e0a71abea2558072':
Adding missing hdpi assets
Jason parks [Thu, 27 Jan 2011 18:16:33 +0000 (10:16 -0800)]
am
cd25369c: am
b1ab46b8: Merge "Fix the build." into honeycomb
* commit '
cd25369c04612335e9c7d2e2bf48daa8cf99ef69':
Fix the build.
Justin Ho [Thu, 27 Jan 2011 18:14:54 +0000 (10:14 -0800)]
Adding missing hdpi assets
Change-Id: I791d331d7dbc93af6869d741eaa4282e7558a874
Jason parks [Thu, 27 Jan 2011 18:13:52 +0000 (10:13 -0800)]
am
b1ab46b8: Merge "Fix the build." into honeycomb
* commit '
b1ab46b8cb792a7f75fac03c13130474b4249ef5':
Fix the build.
Jason parks [Thu, 27 Jan 2011 18:11:00 +0000 (10:11 -0800)]
Merge "Fix the build." into honeycomb
Jason parks [Thu, 27 Jan 2011 18:08:44 +0000 (12:08 -0600)]
Fix the build.
I think I checked in the wrong file before.
Change-Id: Ie426bb5e865ea17f219ee07d3eb8cdd6f06e8cc7
Justin Ho [Thu, 27 Jan 2011 17:51:53 +0000 (09:51 -0800)]
am
cbc9fedf: am
565d0eb8: Merge "New tab assets for Honeycomb" into honeycomb
* commit '
cbc9fedf58e9247af901ede20508a68a6ea10d78':
New tab assets for Honeycomb
Justin Ho [Thu, 27 Jan 2011 17:49:37 +0000 (09:49 -0800)]
am
565d0eb8: Merge "New tab assets for Honeycomb" into honeycomb
* commit '
565d0eb8089beebb08f4ed2d6949246409131ea2':
New tab assets for Honeycomb
Justin Ho [Thu, 27 Jan 2011 17:48:18 +0000 (09:48 -0800)]
Merge "New tab assets for Honeycomb" into honeycomb
Justin Ho [Thu, 27 Jan 2011 17:47:35 +0000 (09:47 -0800)]
New tab assets for Honeycomb
Change-Id: Ia955180781142295991df179fa419690fd0ffeee
Jason parks [Thu, 27 Jan 2011 17:33:17 +0000 (09:33 -0800)]
am
ebabdd4d: am
f8217304: More work on the Crypt Keeper.
* commit '
ebabdd4d2491048d1c73b1858931cb4640a0d564':
More work on the Crypt Keeper.
Jason parks [Thu, 27 Jan 2011 17:31:21 +0000 (09:31 -0800)]
am
f8217304: More work on the Crypt Keeper.
* commit '
f8217304073b5cd13823a0602568394be93bf310':
More work on the Crypt Keeper.
Jason parks [Wed, 26 Jan 2011 19:11:42 +0000 (13:11 -0600)]
More work on the Crypt Keeper.
* Use the DPM to determine if we are encrypted.
* Fix misspelling (Comfirm -> Confirm).
* Animate to black when enabling encryption.
* Add holo droid background.
* Change the progress bar to indterminate.
* Display the percentage complete in the status line.
* Fixed bug
3388097. You will no longer have to unplug your device to start encryption. This line is intentionally long. I could make it shorter but I am proving a point: <magic>overflow: auto;</magic>.
* Actually hold onto the wakelock to prvent the device from sleeping.
* Implement onStop() as a orientation change can happen at boot. This will start the activity twice and there will be multiple handlers with messages.
Change-Id: Ia752d106c39e0d81431e856f8f500182e8ec1abd
Chung-yih Wang [Wed, 26 Jan 2011 09:25:11 +0000 (17:25 +0800)]
Fix the crash when home button is pressed.
When the fragment is going to be removed, we should ignore the events
left in the message queue.
bug:
3392087
Change-Id: Ie716c9cc6742e9990c08d1428f10a956a727d6ed
Roy West [Thu, 27 Jan 2011 04:49:25 +0000 (20:49 -0800)]
Merge "Roy West's fix is stuck in auto-merger"
Dianne Hackborn [Thu, 27 Jan 2011 03:11:01 +0000 (19:11 -0800)]
am
7cabc5bf: (-s ours) am
f955eda8: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
7cabc5bf75ec6b19d72ac9deb8a19e6903166268':
Import revised translations. DO NOT MERGE
Roy West [Thu, 27 Jan 2011 03:08:07 +0000 (19:08 -0800)]
am
fe5d8143: am
e2c557d4: Merge "Fix build; dumb syntax error." into honeycomb
* commit '
fe5d814311ea229b9141488bff70062cfd85e215':
Fix build; dumb syntax error.
Jim Miller [Thu, 27 Jan 2011 03:07:37 +0000 (19:07 -0800)]
am
7eb22a90: am
f484f23a: Merge "Fix
3395616: Show IME by default when seting/changing password" into honeycomb
* commit '
7eb22a907193590d485260982c9215e773c0f904':
Fix
3395616: Show IME by default when seting/changing password
Glenn Kasten [Thu, 27 Jan 2011 02:05:54 +0000 (18:05 -0800)]
Roy West's fix is stuck in auto-merger
Change-Id: I3290227e95911adc2c2cfc4f4a3b9eceb8066e35
Dianne Hackborn [Thu, 27 Jan 2011 02:02:40 +0000 (18:02 -0800)]
am
f955eda8: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
f955eda877a35241635714a8ba2dfe8fc8a8c5c0':
Import revised translations. DO NOT MERGE
Jake Hamby [Thu, 27 Jan 2011 01:49:20 +0000 (17:49 -0800)]
Fix settings NPE crash on launch.
Sometimes when the settings app is resumed, HeadsetProfileManager's
getConnectedDevices() method is called before the onServiceConnected()
callback gives us the proxy object, causing an NPE. Check that we
have the proxy object, and return an empty list otherwise. The
correct states will be shown in the UI because the
onServiceConnected() callback makes its own call to getConnectedDevices()
to set the correct headset profile state.
Bug:
3378431
Change-Id: I364ade0804fb2090378438c8721afef6cac2b0b8
Dianne Hackborn [Thu, 27 Jan 2011 01:35:59 +0000 (17:35 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Eric Fischer [Thu, 27 Jan 2011 00:39:47 +0000 (16:39 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I00d851d7635880d85a4880e5a9201cbcabc101c9
Roy West [Thu, 27 Jan 2011 00:36:12 +0000 (16:36 -0800)]
am
e2c557d4: Merge "Fix build; dumb syntax error." into honeycomb
* commit '
e2c557d4c0fb81496a0429fb32fe033b2e769611':
Fix build; dumb syntax error.
Roy West [Thu, 27 Jan 2011 00:34:40 +0000 (16:34 -0800)]
Merge "Fix build; dumb syntax error." into honeycomb
Roy West [Thu, 27 Jan 2011 00:31:21 +0000 (16:31 -0800)]
Fix build; dumb syntax error.
Change-Id: I1204650796df7a49c5221821f2d485fa7e312be6
Jim Miller [Thu, 27 Jan 2011 00:28:33 +0000 (16:28 -0800)]
am
f484f23a: Merge "Fix
3395616: Show IME by default when seting/changing password" into honeycomb
* commit '
f484f23a53840cca462264e4a1c607fe02a3f59f':
Fix
3395616: Show IME by default when seting/changing password
Jim Miller [Thu, 27 Jan 2011 00:25:32 +0000 (16:25 -0800)]
Merge "Fix
3395616: Show IME by default when seting/changing password" into honeycomb
Jim Miller [Thu, 27 Jan 2011 00:10:26 +0000 (16:10 -0800)]
Fix
3395616: Show IME by default when seting/changing password
Change-Id: I2c110042e58420bdc937582e840227edb93909a5
Roy West [Wed, 26 Jan 2011 23:46:12 +0000 (15:46 -0800)]
am
c29ec0b4: am
ae3e3188: Merge "Editing encryption strings." into honeycomb
* commit '
c29ec0b45ff38258b3190fdd5e586fee8039b828':
Editing encryption strings.
Roy West [Wed, 26 Jan 2011 23:43:13 +0000 (15:43 -0800)]
am
ae3e3188: Merge "Editing encryption strings." into honeycomb
* commit '
ae3e3188120eb89acc5dc0a06803ae8274aeb900':
Editing encryption strings.
Roy West [Wed, 26 Jan 2011 23:41:11 +0000 (15:41 -0800)]
Merge "Editing encryption strings." into honeycomb
Roy West [Wed, 26 Jan 2011 22:10:55 +0000 (14:10 -0800)]
Editing encryption strings.
Change-Id: Ia7c12ea353f1a2dfee3125d2c620980ddd825570
Jake Hamby [Wed, 26 Jan 2011 21:44:31 +0000 (13:44 -0800)]
am
03c92bef: am
1f5be05e: Merge "Implement "show received files" preference item." into honeycomb
* commit '
03c92beffe6e72cbe69771fb52fb5e1bb9271d95':
Implement "show received files" preference item.
Jake Hamby [Wed, 26 Jan 2011 21:42:49 +0000 (13:42 -0800)]
am
1f5be05e: Merge "Implement "show received files" preference item." into honeycomb
* commit '
1f5be05ee5ec5c4e84dc0ace9e88a5ef8f2e2b64':
Implement "show received files" preference item.
Jake Hamby [Wed, 26 Jan 2011 21:40:37 +0000 (13:40 -0800)]
Merge "Implement "show received files" preference item." into honeycomb
Amith Yamasani [Wed, 26 Jan 2011 21:20:00 +0000 (13:20 -0800)]
am
23bb90c1: am
ae71d89a: Merge "Update airplane mode checkbox when toggled from system bar." into honeycomb
* commit '
23bb90c1a73254400024566ec989de7d5047907c':
Update airplane mode checkbox when toggled from system bar.