Jason parks
ebabdd4d24
am f8217304
: More work on the Crypt Keeper.
...
* commit 'f8217304073b5cd13823a0602568394be93bf310':
More work on the Crypt Keeper.
2011-01-27 09:31:21 -08:00
Jason parks
f821730407
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
2011-01-27 11:26:58 -06:00
Chung-yih Wang
5b9408898d
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
2011-01-27 15:38:00 +08:00
Roy West
0dcdcd76ef
Merge "Roy West's fix is stuck in auto-merger"
2011-01-26 20:49:25 -08:00
Dianne Hackborn
91f5593452
am 7cabc5bf
: (-s ours) am f955eda8
: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '7cabc5bf75ec6b19d72ac9deb8a19e6903166268':
Import revised translations. DO NOT MERGE
2011-01-26 19:11:01 -08:00
Roy West
a1f81a2a9e
am fe5d8143
: am e2c557d4
: Merge "Fix build; dumb syntax error." into honeycomb
...
* commit 'fe5d814311ea229b9141488bff70062cfd85e215':
Fix build; dumb syntax error.
2011-01-26 19:08:07 -08:00
Jim Miller
23cf3be9e6
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
2011-01-26 19:07:37 -08:00
Glenn Kasten
c73982cd81
Roy West's fix is stuck in auto-merger
...
Change-Id: I3290227e95911adc2c2cfc4f4a3b9eceb8066e35
2011-01-26 18:05:54 -08:00
Dianne Hackborn
7cabc5bf75
am f955eda8
: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'f955eda877a35241635714a8ba2dfe8fc8a8c5c0':
Import revised translations. DO NOT MERGE
2011-01-26 18:02:40 -08:00
Jake Hamby
632a10f470
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
2011-01-26 17:49:20 -08:00
Dianne Hackborn
f955eda877
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-01-26 17:35:59 -08:00
Eric Fischer
a1871544e8
Import revised translations. DO NOT MERGE
...
Change-Id: I00d851d7635880d85a4880e5a9201cbcabc101c9
2011-01-26 16:39:47 -08:00
Roy West
fe5d814311
am e2c557d4
: Merge "Fix build; dumb syntax error." into honeycomb
...
* commit 'e2c557d4c0fb81496a0429fb32fe033b2e769611':
Fix build; dumb syntax error.
2011-01-26 16:36:12 -08:00
Roy West
e2c557d4c0
Merge "Fix build; dumb syntax error." into honeycomb
2011-01-26 16:34:40 -08:00
Roy West
cbebe591d7
Fix build; dumb syntax error.
...
Change-Id: I1204650796df7a49c5221821f2d485fa7e312be6
2011-01-26 16:31:21 -08:00
Jim Miller
7eb22a9071
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
2011-01-26 16:28:33 -08:00
Jim Miller
f484f23a53
Merge "Fix 3395616: Show IME by default when seting/changing password" into honeycomb
2011-01-26 16:25:32 -08:00
Jim Miller
165bf2fbbf
Fix 3395616: Show IME by default when seting/changing password
...
Change-Id: I2c110042e58420bdc937582e840227edb93909a5
2011-01-26 16:10:26 -08:00
Roy West
0251821a49
am c29ec0b4
: am ae3e3188
: Merge "Editing encryption strings." into honeycomb
...
* commit 'c29ec0b45ff38258b3190fdd5e586fee8039b828':
Editing encryption strings.
2011-01-26 15:46:12 -08:00
Roy West
c29ec0b45f
am ae3e3188
: Merge "Editing encryption strings." into honeycomb
...
* commit 'ae3e3188120eb89acc5dc0a06803ae8274aeb900':
Editing encryption strings.
2011-01-26 15:43:13 -08:00
Roy West
ae3e318812
Merge "Editing encryption strings." into honeycomb
2011-01-26 15:41:11 -08:00
Roy West
302c14a241
Editing encryption strings.
...
Change-Id: Ia7c12ea353f1a2dfee3125d2c620980ddd825570
2011-01-26 15:38:38 -08:00
Jake Hamby
9def4c58ab
am 03c92bef
: am 1f5be05e
: Merge "Implement "show received files" preference item." into honeycomb
...
* commit '03c92beffe6e72cbe69771fb52fb5e1bb9271d95':
Implement "show received files" preference item.
2011-01-26 13:44:31 -08:00
Jake Hamby
03c92beffe
am 1f5be05e
: Merge "Implement "show received files" preference item." into honeycomb
...
* commit '1f5be05ee5ec5c4e84dc0ace9e88a5ef8f2e2b64':
Implement "show received files" preference item.
2011-01-26 13:42:49 -08:00
Jake Hamby
1f5be05ee5
Merge "Implement "show received files" preference item." into honeycomb
2011-01-26 13:40:37 -08:00
Amith Yamasani
295a365c18
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.
2011-01-26 13:20:00 -08:00
Amith Yamasani
23bb90c1a7
am ae71d89a
: Merge "Update airplane mode checkbox when toggled from system bar." into honeycomb
...
* commit 'ae71d89a6bc7ebd352c624297481081475907802':
Update airplane mode checkbox when toggled from system bar.
2011-01-26 13:18:44 -08:00
Amith Yamasani
ae71d89a6b
Merge "Update airplane mode checkbox when toggled from system bar." into honeycomb
2011-01-26 13:16:30 -08:00
Roy West
5f1900ce54
am 192b71ac
: am 5f765f7c
: Fix to bug 3389385.
...
* commit '192b71ac792932939d7d23cee1f04e30105cf75d':
Fix to bug 3389385.
2011-01-26 12:47:57 -08:00
Roy West
192b71ac79
am 5f765f7c
: Fix to bug 3389385.
...
* commit '5f765f7ca02543094eb6a89af7fcd4e43787a8f4':
Fix to bug 3389385.
2011-01-26 12:45:17 -08:00
Roy West
5f765f7ca0
Fix to bug 3389385.
...
Change-Id: Ibf0d0ec3272c3b59fb20b837a739aaa99b1986b5
2011-01-26 12:27:44 -08:00
Amith Yamasani
b13e56b8dd
am 6f3bca71
: am fa782f5e
: Merge "Hidden AddAccount activity doesn\'t need to deal with orientation changes." into honeycomb
...
* commit '6f3bca7157044d32a1e2bb24cd1053d9f59ea8e1':
Hidden AddAccount activity doesn't need to deal with orientation changes.
2011-01-26 10:56:13 -08:00
Amith Yamasani
6f3bca7157
am fa782f5e
: Merge "Hidden AddAccount activity doesn\'t need to deal with orientation changes." into honeycomb
...
* commit 'fa782f5ee3b925fb242c1786852e93c932d97cb5':
Hidden AddAccount activity doesn't need to deal with orientation changes.
2011-01-26 10:53:49 -08:00
Amith Yamasani
fa782f5ee3
Merge "Hidden AddAccount activity doesn't need to deal with orientation changes." into honeycomb
2011-01-26 10:51:36 -08:00
Jake Hamby
4ee12032a3
Implement "show received files" preference item.
...
Add handler to send an intent to the Bluetooth OPP app to show the
list of received files to the user.
Bug: 3167219
Change-Id: I59e18559a0c35add7f1be56a5f040dae4dccc7f1
2011-01-26 10:51:32 -08:00
Amith Yamasani
585eda6191
Hidden AddAccount activity doesn't need to deal with orientation changes.
...
Bug: 3300523
Change-Id: I53e02e390267b1a88a6ae424aca18df439501f6d
2011-01-26 10:37:17 -08:00
Amith Yamasani
b98c00e710
Update airplane mode checkbox when toggled from system bar.
...
Bug: 3148095
Also fix an NPE crash I saw when exiting Settings immediately after toggling
the airplane mode.
Change-Id: I83eb2d90e203fd56b09269cf9fa8f74a4354834f
2011-01-26 09:56:44 -08:00
Chung-yih Wang
2b117d69ea
am f003841c
: am 09b77105
: Make sure the profile list is consistent.
...
* commit 'f003841c5285452597c2e48bac8efc6262978bb4':
Make sure the profile list is consistent.
2011-01-26 00:51:46 -08:00
Chung-yih Wang
f003841c52
am 09b77105
: Make sure the profile list is consistent.
...
* commit '09b77105fb6c58075bb5586ba8087b4de9e5860e':
Make sure the profile list is consistent.
2011-01-26 00:49:22 -08:00
Chung-yih Wang
09b77105fb
Make sure the profile list is consistent.
...
Since we may have more than one instance of VpnSettings, we have to make
the VPN profile list consistent between instances.
bug:3381902
Change-Id: Ic3128646c7fc6ee2a8c0ea6ce339d76115d7c05b
2011-01-26 16:17:24 +08:00
Hung-ying Tyan
d455e59292
am 24ebc57b
: am f6ac4296
: Merge "Fix alert dialogs in VpnSettings." into honeycomb
...
* commit '24ebc57bb4f058295cbeb2ad7e1d8692ba81c460':
Fix alert dialogs in VpnSettings.
2011-01-26 00:10:43 -08:00
Hung-ying Tyan
24ebc57bb4
am f6ac4296
: Merge "Fix alert dialogs in VpnSettings." into honeycomb
...
* commit 'f6ac42968f1b21ab6300bdc211a050fc4cada1af':
Fix alert dialogs in VpnSettings.
2011-01-26 00:09:18 -08:00
Hung-ying Tyan
f6ac42968f
Merge "Fix alert dialogs in VpnSettings." into honeycomb
2011-01-26 00:07:38 -08:00
Hung-ying Tyan
adc83d8312
Fix alert dialogs in VpnSettings.
...
+ Don't check mDialogFragment.isVisible() in SettingsPreferenceFragment.removeDialog()
as mDialogFragment may not be visible in parent fragment's onResume().
+ Replace mConnectDialog with mConnectDialogShowing and remove
removeConnectDialog().
+ Dismiss alert dialogs in onPause() so that we don't need to maintain extra
states during pause-resume cycle.
In addition, fix a NPE when startVpnTypeSelection().
Bug: 3381434
Bug: 3289365
Change-Id: Ic4aa87c7a618d95e86e45d6617f2ad7dab35f019
2011-01-26 15:50:33 +08:00
Dianne Hackborn
9027ea5c3d
am 27fe9b4a
: am 579a7ddb
: Merge "Fix issue #3343297 Settings force close when try to..." into honeycomb
...
* commit '27fe9b4a9b364d48a0d500549ca811ea2b86cefa':
Fix issue #3343297 Settings force close when try to...
2011-01-25 22:40:43 -08:00
Dianne Hackborn
27fe9b4a9b
am 579a7ddb
: Merge "Fix issue #3343297 Settings force close when try to..." into honeycomb
...
* commit '579a7ddb225ea3e59ea5383e49b847ff627ec9aa':
Fix issue #3343297 Settings force close when try to...
2011-01-25 22:39:26 -08:00
Dianne Hackborn
579a7ddb22
Merge "Fix issue #3343297 Settings force close when try to..." into honeycomb
2011-01-25 22:37:42 -08:00
Dianne Hackborn
25bda17a57
Fix issue #3343297 Settings force close when try to...
...
...end process in running service - IKXEVEREST-3023
Change-Id: I16403a260ccf06675d0e2e98573975d746bded91
2011-01-25 22:03:43 -08:00
Amith Yamasani
3030a4407d
am 069b5123
: am 735e0f00
: Merge "Rearrange Applications settings items." into honeycomb
...
* commit '069b512347ce6f28ce5e1a882dd634968645199f':
Rearrange Applications settings items.
2011-01-25 21:47:24 -08:00
Amith Yamasani
069b512347
am 735e0f00
: Merge "Rearrange Applications settings items." into honeycomb
...
* commit '735e0f0079572c0fc43ed8662adbaf1d1716cb98':
Rearrange Applications settings items.
2011-01-25 21:45:45 -08:00