OSDN Git Service
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
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
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: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: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:18:44 +0000 (13:18 -0800)]
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.
Amith Yamasani [Wed, 26 Jan 2011 21:16:30 +0000 (13:16 -0800)]
Merge "Update airplane mode checkbox when toggled from system bar." into honeycomb
Roy West [Wed, 26 Jan 2011 20:45:17 +0000 (12:45 -0800)]
Roy West [Wed, 26 Jan 2011 20:27:44 +0000 (12:27 -0800)]
Fix to bug
3389385.
Change-Id: Ibf0d0ec3272c3b59fb20b837a739aaa99b1986b5
Amith Yamasani [Wed, 26 Jan 2011 18:53:49 +0000 (10:53 -0800)]
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.
Amith Yamasani [Wed, 26 Jan 2011 18:51:36 +0000 (10:51 -0800)]
Merge "Hidden AddAccount activity doesn't need to deal with orientation changes." into honeycomb
Jake Hamby [Wed, 26 Jan 2011 03:56:58 +0000 (19:56 -0800)]
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
Amith Yamasani [Wed, 26 Jan 2011 18:37:17 +0000 (10:37 -0800)]
Hidden AddAccount activity doesn't need to deal with orientation changes.
Bug:
3300523
Change-Id: I53e02e390267b1a88a6ae424aca18df439501f6d
Amith Yamasani [Wed, 26 Jan 2011 17:56:44 +0000 (09:56 -0800)]
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
Chung-yih Wang [Wed, 26 Jan 2011 08:49:22 +0000 (00:49 -0800)]
am
09b77105: Make sure the profile list is consistent.
* commit '
09b77105fb6c58075bb5586ba8087b4de9e5860e':
Make sure the profile list is consistent.
Chung-yih Wang [Fri, 21 Jan 2011 09:22:29 +0000 (17:22 +0800)]
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
Hung-ying Tyan [Wed, 26 Jan 2011 08:09:18 +0000 (00:09 -0800)]
am
f6ac4296: Merge "Fix alert dialogs in VpnSettings." into honeycomb
* commit '
f6ac42968f1b21ab6300bdc211a050fc4cada1af':
Fix alert dialogs in VpnSettings.
Hung-ying Tyan [Wed, 26 Jan 2011 08:07:38 +0000 (00:07 -0800)]
Merge "Fix alert dialogs in VpnSettings." into honeycomb
Hung-ying Tyan [Mon, 24 Jan 2011 07:05:27 +0000 (15:05 +0800)]
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
Dianne Hackborn [Wed, 26 Jan 2011 06:39:26 +0000 (22:39 -0800)]
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...
Dianne Hackborn [Wed, 26 Jan 2011 06:37:42 +0000 (22:37 -0800)]
Merge "Fix issue #
3343297 Settings force close when try to..." into honeycomb
Dianne Hackborn [Wed, 26 Jan 2011 06:03:43 +0000 (22:03 -0800)]
Fix issue #
3343297 Settings force close when try to...
...end process in running service - IKXEVEREST-3023
Change-Id: I16403a260ccf06675d0e2e98573975d746bded91
Amith Yamasani [Wed, 26 Jan 2011 05:45:45 +0000 (21:45 -0800)]
am
735e0f00: Merge "Rearrange Applications settings items." into honeycomb
* commit '
735e0f0079572c0fc43ed8662adbaf1d1716cb98':
Rearrange Applications settings items.
Amith Yamasani [Wed, 26 Jan 2011 05:43:46 +0000 (21:43 -0800)]
am
1fa2ab82: Merge "Fix missing title for WiFi Advanced settings." into honeycomb
* commit '
1fa2ab82fb798854c500162d205c759d7cf6c24e':
Fix missing title for WiFi Advanced settings.
Amith Yamasani [Wed, 26 Jan 2011 05:43:19 +0000 (21:43 -0800)]
Merge "Rearrange Applications settings items." into honeycomb
Amith Yamasani [Wed, 26 Jan 2011 05:42:11 +0000 (21:42 -0800)]
Merge "Fix missing title for WiFi Advanced settings." into honeycomb
Justin Ho [Wed, 26 Jan 2011 02:36:06 +0000 (18:36 -0800)]
am
9e89462d: Merge "Use expander assets for bluetooth profile preference." into honeycomb
* commit '
9e89462d280f189420b49a8d609cf3f99e55d178':
Use expander assets for bluetooth profile preference.
Justin Ho [Wed, 26 Jan 2011 02:34:10 +0000 (18:34 -0800)]
Merge "Use expander assets for bluetooth profile preference." into honeycomb
Hung-ying Tyan [Wed, 26 Jan 2011 02:02:43 +0000 (18:02 -0800)]
am
3753def3: Merge "Allow OnCancelListener and OnDismissListener in Settings app" into honeycomb
* commit '
3753def39da8a4c63ffa787f2572defbc189d7c5':
Allow OnCancelListener and OnDismissListener in Settings app
Hung-ying Tyan [Wed, 26 Jan 2011 02:00:12 +0000 (18:00 -0800)]
Merge "Allow OnCancelListener and OnDismissListener in Settings app" into honeycomb
Amith Yamasani [Wed, 26 Jan 2011 01:20:43 +0000 (17:20 -0800)]
Use expander assets for bluetooth profile preference.
Also adjust some padding and set correct highlight background.
Bug:
3383060
Change-Id: I5a4abe98c49efd156523085418958b69df6c8d85
Amith Yamasani [Tue, 25 Jan 2011 22:56:44 +0000 (14:56 -0800)]
Rearrange Applications settings items.
Bug:
3337264
Change-Id: I955c15f7db791167b97b04beaeafc2953bdccd76
Jake Hamby [Tue, 25 Jan 2011 22:41:38 +0000 (14:41 -0800)]
am
51cd0d6d: Remove "Allow incoming file transfers" option from BT settings.
* commit '
51cd0d6d29c8f8f5320968f778b04b448984abc8':
Remove "Allow incoming file transfers" option from BT settings.
Jake Hamby [Tue, 25 Jan 2011 21:50:54 +0000 (13:50 -0800)]
Remove "Allow incoming file transfers" option from BT settings.
The user preference to allow automatic incoming file transfers for
specific devices isn't implemented yet. Remove the preference from
the settings UI.
Bug:
3385941
Change-Id: Ib8fee9a0d99063a8c05d52a960664364e4812ace
Amith Yamasani [Tue, 25 Jan 2011 20:56:53 +0000 (12:56 -0800)]
Fix missing title for WiFi Advanced settings.
Bug:
3360783
Change-Id: I8c22ce5a995eab26d300402471770c082f90a34a
Jim Miller [Tue, 25 Jan 2011 20:41:04 +0000 (12:41 -0800)]
am
a34279fb: Fix
3383575: use styled attribs and update layout
* commit '
a34279fb2a109d45e88504ce9bc292d7fc7cf2c2':
Fix
3383575: use styled attribs and update layout
Jim Miller [Tue, 25 Jan 2011 05:25:47 +0000 (21:25 -0800)]
Fix
3383575: use styled attribs and update layout
This updates the layout to make more room for the button
text in SecuritySettings. The code now uses styled attributes
to make it easier to tweak in the future.
Change-Id: I5fbdf2f6ae4c4c1f9614ab97891f9f2fe6cda628
Jason parks [Tue, 25 Jan 2011 17:56:00 +0000 (09:56 -0800)]
am
323fa9c6: Merge "Display the correct encryption settings." into honeycomb
* commit '
323fa9c669da74cf1dde982c982f7ea9c0c1b5a8':
Display the correct encryption settings.
Jason parks [Tue, 25 Jan 2011 17:53:00 +0000 (09:53 -0800)]
Merge "Display the correct encryption settings." into honeycomb
Jason parks [Tue, 25 Jan 2011 15:26:55 +0000 (09:26 -0600)]
Display the correct encryption settings.
* You can no longer try to encrypt the device when it is encrypted.
* Moved the encryption section below the lock screen section. It will be more common to change the lock screen settings.
* If the device doesn't support encryption don't display the encryption section.
Bug:
3384074
Change-Id: I172f5894a3cea57b1b8d03a84f1ecf0ee500c1f3
Jason parks [Tue, 25 Jan 2011 15:28:28 +0000 (07:28 -0800)]
am
af6d7cf2: Merge "More UI tweaks." into honeycomb
* commit '
af6d7cf23ca5ca86c39845711f431e76b877a31e':
More UI tweaks.
Jason parks [Tue, 25 Jan 2011 14:39:06 +0000 (06:39 -0800)]
Merge "More UI tweaks." into honeycomb
Jason parks [Mon, 24 Jan 2011 22:19:28 +0000 (16:19 -0600)]
More UI tweaks.
* Grab a full wakelock while encrypting.
* Fix a bug with failed attempts.
* Add a custom theme to animate the screen to black.
* Fix the keyboard to be displayed properly in landscape and portrait.
Change-Id: Icc2d813ce1780588eb3b16f5204c3c60cae5236f
Hung-ying Tyan [Tue, 25 Jan 2011 08:42:14 +0000 (16:42 +0800)]
Allow OnCancelListener and OnDismissListener in Settings app
for the framework-managed dialogs.
DialogFragment acts as both listeners so the application cannot set both
listeners in the embedded dialog. New hooks are added in SettingsDialogFragment
so that settings apps can do so for the framework-managed dialogs.
Bug:
3386670
Change-Id: I144e7c4ccf7f86c61f6079fa86d830c709335af1
Dianne Hackborn [Tue, 25 Jan 2011 06:12:31 +0000 (22:12 -0800)]
am
0385cf14: Fix issue #
3306021 NPE at android.app.AlertDialog.getDefaultDialogTheme(AlertDialog.java)
* commit '
0385cf14a1b02fafc3d1a094ccfee45de4e9b03a':
Fix issue #
3306021 NPE at android.app.AlertDialog.getDefaultDialogTheme(AlertDialog.java)
Amith Yamasani [Tue, 25 Jan 2011 06:12:22 +0000 (22:12 -0800)]
am
48e031c7: Merge "Tabletize Device administrator screen and fix the layout for DeviceAdminAdd." into honeycomb
* commit '
48e031c710acb812361d9689836b69b3ee5b5ac2':
Tabletize Device administrator screen and fix the layout for DeviceAdminAdd.
Dianne Hackborn [Tue, 25 Jan 2011 00:22:13 +0000 (16:22 -0800)]
Fix issue #
3306021 NPE at android.app.AlertDialog.getDefaultDialogTheme(AlertDialog.java)
It looks like the dialog fragment was not being removed along with
the containing fragment. The containing fragment now checks for
when it is being removed and removes its dialog fragment at that
point.
Also fix issue #
3340766 NPE at
com.android.settings.applications.RunningProcessesView.startServiceDetailsActivity
We need to check if the running processes view is still attached to its
owner, since we clear owner when it is paused.
In addition, fix a bug where ManageApplications was not persisting
its "show background processes" state, and remove the icons from
its menu items to make them more understandable in the action bar.
Change-Id: I4498ef92023eb60f90758ff18d8eed7b41af79b0
Amith Yamasani [Tue, 25 Jan 2011 04:43:05 +0000 (20:43 -0800)]
Merge "Tabletize Device administrator screen and fix the layout for DeviceAdminAdd." into honeycomb
Amith Yamasani [Tue, 25 Jan 2011 00:02:11 +0000 (16:02 -0800)]
Tabletize Device administrator screen and fix the layout for DeviceAdminAdd.
Bug:
3376986
Convert the DeviceAdminSettings screen to a fragment, remove fat titlebar.
Convert the DeviceAdminAdd screen to layout nicely in the new holo DialogWhenLarge
style.
Change-Id: I20a9d16aed135a2178969dfff807075b0b79237c
Daisuke Miyakawa [Mon, 24 Jan 2011 22:03:29 +0000 (14:03 -0800)]
am
3f5e524d: Merge "Fix wifi flow" into honeycomb
* commit '
3f5e524d5d69fe23df66a54ea26ff57612a1548c':
Fix wifi flow
Daisuke Miyakawa [Mon, 24 Jan 2011 22:00:07 +0000 (14:00 -0800)]
Merge "Fix wifi flow" into honeycomb
Eric Fischer [Mon, 24 Jan 2011 21:57:26 +0000 (13:57 -0800)]
am
ffc848ef: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
ffc848eff25106dcc647349e45f901d44fe3b8dd':
Import revised translations. DO NOT MERGE
Amith Yamasani [Mon, 24 Jan 2011 21:57:24 +0000 (13:57 -0800)]
am
26bb586c: Merge "NPE check in VpnSettings." into honeycomb
* commit '
26bb586c9c5af4d369cd6691ed608c7150c04547':
NPE check in VpnSettings.
Eric Fischer [Mon, 24 Jan 2011 21:57:22 +0000 (13:57 -0800)]
am
cfcdcb84: Merge "Restore deleted string still referenced from a layout." into honeycomb
* commit '
cfcdcb84ccbc941ecfb8733c1a848812ba0e0d66':
Restore deleted string still referenced from a layout.
Eric Fischer [Mon, 24 Jan 2011 21:49:39 +0000 (13:49 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Amith Yamasani [Mon, 24 Jan 2011 21:48:40 +0000 (13:48 -0800)]
Merge "NPE check in VpnSettings." into honeycomb
Eric Fischer [Mon, 24 Jan 2011 21:47:26 +0000 (13:47 -0800)]
Merge "Restore deleted string still referenced from a layout." into honeycomb
Eric Fischer [Mon, 24 Jan 2011 21:31:35 +0000 (13:31 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I82e0e6690e55a8dc676ff707565c964628d848a4
Eric Fischer [Mon, 24 Jan 2011 20:48:06 +0000 (12:48 -0800)]
Restore deleted string still referenced from a layout.
Change-Id: Ief261e16780ad04e53ebac1202d94146cf14e51c
Amith Yamasani [Mon, 24 Jan 2011 20:10:25 +0000 (12:10 -0800)]
am
7b8dff50: Merge "Bring back the MDN (phone number) status even if there\'s no voice." into honeycomb
* commit '
7b8dff506fa319ab809ee3b6506b79642f9867cd':
Bring back the MDN (phone number) status even if there's no voice.
Justin Ho [Mon, 24 Jan 2011 20:10:23 +0000 (12:10 -0800)]
am
4aee9f88: Merge "Updated Bluetooth assets to fix sizing problems" into honeycomb
* commit '
4aee9f889498a7883e60f0cfe05faad403e95569':
Updated Bluetooth assets to fix sizing problems
Justin Ho [Mon, 24 Jan 2011 20:10:19 +0000 (12:10 -0800)]
am
146249ad: Updating Bluetooth preference page to use different configuration icon
* commit '
146249ad9382d8d243a287bf3c65f49b286d9fb7':
Updating Bluetooth preference page to use different configuration icon
Amith Yamasani [Mon, 24 Jan 2011 20:07:52 +0000 (12:07 -0800)]
Merge "Bring back the MDN (phone number) status even if there's no voice." into honeycomb
Amith Yamasani [Mon, 24 Jan 2011 16:56:07 +0000 (08:56 -0800)]
Bring back the MDN (phone number) status even if there's no voice.
Needed for carrier customer support purposes.
Bug:
3351493
Change "My phone number" string to "MDN".
Change-Id: Icee0f97348034a9fb7f79a3c48868d5f74edabb1
Justin Ho [Mon, 24 Jan 2011 17:47:21 +0000 (09:47 -0800)]
Merge "Updated Bluetooth assets to fix sizing problems" into honeycomb
Justin Ho [Mon, 24 Jan 2011 17:41:57 +0000 (09:41 -0800)]
Updating Bluetooth preference page to use different configuration icon
Change-Id: Ie5bf105e5522fb2a876c51c9407f02f2a3974631
Jim Miller [Mon, 24 Jan 2011 07:36:31 +0000 (23:36 -0800)]
am
22c060eb: Merge "Fix
3315488: Wrap OwnerInfo layout in a ScrollView" into honeycomb
* commit '
22c060ebd14bd92c67bd97f53d67bb06f0a215de':
Fix
3315488: Wrap OwnerInfo layout in a ScrollView
Jim Miller [Mon, 24 Jan 2011 02:25:21 +0000 (18:25 -0800)]
Merge "Fix
3315488: Wrap OwnerInfo layout in a ScrollView" into honeycomb
Jim Miller [Mon, 24 Jan 2011 02:14:13 +0000 (18:14 -0800)]
Fix
3315488: Wrap OwnerInfo layout in a ScrollView
Change-Id: I5fc5a66c1a09ff4e45137469fee1b6de6b45c7a0
Adam Powell [Mon, 24 Jan 2011 01:52:23 +0000 (17:52 -0800)]
am
a31be80e: Fix bug
3381583 - Settings action bar not refreshing menu content
* commit '
a31be80ef056add00e0d239414f80f932978277f':
Fix bug
3381583 - Settings action bar not refreshing menu content
Adam Powell [Mon, 24 Jan 2011 01:35:41 +0000 (17:35 -0800)]
Fix bug
3381583 - Settings action bar not refreshing menu content
Change-Id: I71416dbf691a6dacfb58c6ac3cc0df8233db8f44
Justin Ho [Mon, 24 Jan 2011 00:44:54 +0000 (16:44 -0800)]
Updated Bluetooth assets to fix sizing problems
Change-Id: Ib9cbd0945c89e511b98c1153b55a22daf9c94fd7
Andy Stadler [Sun, 23 Jan 2011 22:48:53 +0000 (14:48 -0800)]
am
6370c87a: Maintain password quality while encrypted
* commit '
6370c87a6b98abfc6badb31070a60f84b3f528b3':
Maintain password quality while encrypted
Andy Stadler [Sat, 22 Jan 2011 00:25:22 +0000 (16:25 -0800)]
Maintain password quality while encrypted
Bug:
3378277
Change-Id: I68aae06c518eb514c1be38214d8c9918b0398f95
Daisuke Miyakawa [Fri, 21 Jan 2011 22:29:50 +0000 (14:29 -0800)]
Fix wifi flow
- show progress bar correctly
- stop inappropriately showing padding views
- expand the screen when successful.
Bug:
3378348
Bug:
3378341
Change-Id: I89ff31d24c050755c90fbf07cd4f56d8f0ddeac9
Justin Ho [Fri, 21 Jan 2011 22:55:47 +0000 (14:55 -0800)]
am
ac94d685: Merge "New Settings assets" into honeycomb
* commit '
ac94d6852850889ca58480d1af91bc91541f2fce':
New Settings assets
Justin Ho [Fri, 21 Jan 2011 22:52:57 +0000 (14:52 -0800)]
Merge "New Settings assets" into honeycomb
Justin Ho [Fri, 21 Jan 2011 22:25:22 +0000 (14:25 -0800)]
New Settings assets
Change-Id: I1d3309d4e5f9ebb95c2907440ffae69bf8167ce3
Jason parks [Fri, 21 Jan 2011 22:20:41 +0000 (14:20 -0800)]
am
f5f4c687: Merge "Accquire a wakelock while encrypting." into honeycomb
* commit '
f5f4c687870ff09ef2fe02677a810af22b57ff99':
Accquire a wakelock while encrypting.
Jason parks [Fri, 21 Jan 2011 22:18:52 +0000 (14:18 -0800)]
Merge "Accquire a wakelock while encrypting." into honeycomb
Andy Stadler [Fri, 21 Jan 2011 22:05:17 +0000 (14:05 -0800)]
am
3da38a07: Add start-encryption intent filter to settings
* commit '
3da38a0771022615ecb568861e489761fe53a05a':
Add start-encryption intent filter to settings
Jason parks [Fri, 21 Jan 2011 21:48:20 +0000 (15:48 -0600)]
Accquire a wakelock while encrypting.
Bug:
3375491
Change-Id: Ief7dbb450800104f4977ab31f93a1e1a994b25ad
Andy Stadler [Fri, 21 Jan 2011 21:38:45 +0000 (13:38 -0800)]
Add start-encryption intent filter to settings
* Add intent-filter for "android.app.action.START_ENCRYPTION"
* Add pseudo-activity to host intent-filter
* Add code to settings page that exits quickly when encryption
is not available or is already started.
This can be tested using ApiDemos -> App -> Device Admin
Bug:
3346770
Change-Id: Ie97459cf9e2a7b09b690bf085e64ef905466e77a
Jason parks [Fri, 21 Jan 2011 20:36:12 +0000 (12:36 -0800)]
am
666800a2: Remove unused code.
* commit '
666800a237066457c5703fc7c746a5d477249d59':
Remove unused code.
Jason parks [Fri, 21 Jan 2011 20:36:10 +0000 (12:36 -0800)]
am
39f1e040: More UI tweaks and fixes.
* commit '
39f1e04079976d3d10fdd8e5dd36c833bab8a371':
More UI tweaks and fixes.
Jason parks [Fri, 21 Jan 2011 20:36:08 +0000 (12:36 -0800)]
am
dbf4322a: Change how we check to see if we should display the progress bar.
* commit '
dbf4322ab1cf39d123334a7778c7ccc8942ada74':
Change how we check to see if we should display the progress bar.
Jason parks [Fri, 21 Jan 2011 00:48:55 +0000 (18:48 -0600)]
Remove unused code.
Change-Id: If9fd0f0229721ec1cdce583e6d3180d691213f23
Jason parks [Fri, 21 Jan 2011 05:29:28 +0000 (23:29 -0600)]
More UI tweaks and fixes.
* Actually post the correct message every 5 second for the progress bar.
* Update the text for the settings to a more finalish version.
* Check the battery status before allowing encryption to proceed.
* Display a place holder message if no password is set for the device.
Change-Id: I2734300c9a81467dbd0401427d8b656922ab4819
Jason parks [Fri, 21 Jan 2011 00:49:58 +0000 (18:49 -0600)]
Change how we check to see if we should display the progress bar.
Change-Id: I779e229f82a11d570e832f3e8cc5b275939249e8