Jason parks
fe6aae82a2
am 4b2a602e
: am 323fa9c6
: Merge "Display the correct encryption settings." into honeycomb
...
* commit '4b2a602eaac76ab117e96271ac4474a0de15795e':
Display the correct encryption settings.
2011-01-25 09:59:07 -08:00
Jason parks
4b2a602eaa
am 323fa9c6
: Merge "Display the correct encryption settings." into honeycomb
...
* commit '323fa9c669da74cf1dde982c982f7ea9c0c1b5a8':
Display the correct encryption settings.
2011-01-25 09:56:00 -08:00
Jason parks
323fa9c669
Merge "Display the correct encryption settings." into honeycomb
2011-01-25 09:53:00 -08:00
Jason parks
4112199ed6
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
2011-01-25 10:29:50 -06:00
Jason parks
f9ea5f9f78
am d065fffc
: am af6d7cf2
: Merge "More UI tweaks." into honeycomb
...
* commit 'd065fffcf5e13af5638d232d7a7ca38cd0aa9e46':
More UI tweaks.
2011-01-25 07:36:57 -08:00
Jason parks
d065fffcf5
am af6d7cf2
: Merge "More UI tweaks." into honeycomb
...
* commit 'af6d7cf23ca5ca86c39845711f431e76b877a31e':
More UI tweaks.
2011-01-25 07:28:28 -08:00
Jason parks
af6d7cf23c
Merge "More UI tweaks." into honeycomb
2011-01-25 06:39:06 -08:00
Jason parks
f1dbf55819
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
2011-01-25 08:38:17 -06:00
Hung-ying Tyan
0ee51e04fb
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
2011-01-25 17:31:26 +08:00
Dianne Hackborn
0447d38db3
am 89b04d70
: am 0385cf14
: Fix issue #3306021 NPE at android.app.AlertDialog.getDefaultDialogTheme(AlertDialog.java)
...
* commit '89b04d70f227b0a191ec7be23f26adbd7685f8f1':
Fix issue #3306021 NPE at android.app.AlertDialog.getDefaultDialogTheme(AlertDialog.java)
2011-01-24 22:31:19 -08:00
Amith Yamasani
29dd8eb796
am 0cd3fd6a
: am 48e031c7
: Merge "Tabletize Device administrator screen and fix the layout for DeviceAdminAdd." into honeycomb
...
* commit '0cd3fd6a20b9bfe2b6102b9565c97fa0942400df':
Tabletize Device administrator screen and fix the layout for DeviceAdminAdd.
2011-01-24 22:31:11 -08:00
Dianne Hackborn
89b04d70f2
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)
2011-01-24 22:12:31 -08:00
Amith Yamasani
0cd3fd6a20
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.
2011-01-24 22:12:22 -08:00
Dianne Hackborn
0385cf14a1
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
2011-01-24 21:18:41 -08:00
Amith Yamasani
48e031c710
Merge "Tabletize Device administrator screen and fix the layout for DeviceAdminAdd." into honeycomb
2011-01-24 20:43:05 -08:00
Amith Yamasani
a1d0184166
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
2011-01-24 16:24:55 -08:00
Daisuke Miyakawa
3625ae6a69
am ae9504b6
: am 3f5e524d
: Merge "Fix wifi flow" into honeycomb
...
* commit 'ae9504b6c4d6e365cf41b42f811a459627cdc398':
Fix wifi flow
2011-01-24 14:06:36 -08:00
Daisuke Miyakawa
ae9504b6c4
am 3f5e524d
: Merge "Fix wifi flow" into honeycomb
...
* commit '3f5e524d5d69fe23df66a54ea26ff57612a1548c':
Fix wifi flow
2011-01-24 14:03:29 -08:00
Eric Fischer
57ddb190d7
am 6d83de80
: (-s ours) am ffc848ef
: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '6d83de804884b0d0e97a2d5fd5ddab88213d5d66':
Import revised translations. DO NOT MERGE
2011-01-24 14:01:14 -08:00
Amith Yamasani
953748eb66
am 9e366bcf
: am 26bb586c
: Merge "NPE check in VpnSettings." into honeycomb
...
* commit '9e366bcf03a07c0064379c7054c3a0dee7909606':
NPE check in VpnSettings.
2011-01-24 14:01:08 -08:00
Eric Fischer
7e87e8f2a0
am c344ba3a
: am cfcdcb84
: Merge "Restore deleted string still referenced from a layout." into honeycomb
...
* commit 'c344ba3aee67c07e6a6740409fc2d3f3615f40bb':
Restore deleted string still referenced from a layout.
2011-01-24 14:01:06 -08:00
Daisuke Miyakawa
3f5e524d5d
Merge "Fix wifi flow" into honeycomb
2011-01-24 14:00:07 -08:00
Eric Fischer
6d83de8048
am ffc848ef
: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'ffc848eff25106dcc647349e45f901d44fe3b8dd':
Import revised translations. DO NOT MERGE
2011-01-24 13:57:26 -08:00
Amith Yamasani
9e366bcf03
am 26bb586c
: Merge "NPE check in VpnSettings." into honeycomb
...
* commit '26bb586c9c5af4d369cd6691ed608c7150c04547':
NPE check in VpnSettings.
2011-01-24 13:57:24 -08:00
Eric Fischer
c344ba3aee
am cfcdcb84
: Merge "Restore deleted string still referenced from a layout." into honeycomb
...
* commit 'cfcdcb84ccbc941ecfb8733c1a848812ba0e0d66':
Restore deleted string still referenced from a layout.
2011-01-24 13:57:22 -08:00
Eric Fischer
ffc848eff2
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-01-24 13:49:39 -08:00
Amith Yamasani
26bb586c9c
Merge "NPE check in VpnSettings." into honeycomb
2011-01-24 13:48:40 -08:00
Eric Fischer
cfcdcb84cc
Merge "Restore deleted string still referenced from a layout." into honeycomb
2011-01-24 13:47:26 -08:00
Amith Yamasani
b074b28064
am 1219b482
: am 7b8dff50
: Merge "Bring back the MDN (phone number) status even if there\'s no voice." into honeycomb
...
* commit '1219b482e05042226cbe452957a6f024b9cd1723':
Bring back the MDN (phone number) status even if there's no voice.
2011-01-24 13:32:31 -08:00
Justin Ho
ea806dad00
am 3792e92d
: am 4aee9f88
: Merge "Updated Bluetooth assets to fix sizing problems" into honeycomb
...
* commit '3792e92d68b3d34e5a9aa92b98ea85a98bf93b3c':
Updated Bluetooth assets to fix sizing problems
2011-01-24 13:32:24 -08:00
Justin Ho
fda953679e
am cd3115b8
: am 146249ad
: Updating Bluetooth preference page to use different configuration icon
...
* commit 'cd3115b880f8e14792abf9d75c45414cc3facc32':
Updating Bluetooth preference page to use different configuration icon
2011-01-24 13:32:21 -08:00
Eric Fischer
618b0f513a
Import revised translations. DO NOT MERGE
...
Change-Id: I82e0e6690e55a8dc676ff707565c964628d848a4
2011-01-24 13:31:35 -08:00
Eric Fischer
13baf3c6a0
Restore deleted string still referenced from a layout.
...
Change-Id: Ief261e16780ad04e53ebac1202d94146cf14e51c
2011-01-24 12:48:06 -08:00
Amith Yamasani
1219b482e0
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.
2011-01-24 12:10:25 -08:00
Justin Ho
3792e92d68
am 4aee9f88
: Merge "Updated Bluetooth assets to fix sizing problems" into honeycomb
...
* commit '4aee9f889498a7883e60f0cfe05faad403e95569':
Updated Bluetooth assets to fix sizing problems
2011-01-24 12:10:23 -08:00
Justin Ho
cd3115b880
am 146249ad
: Updating Bluetooth preference page to use different configuration icon
...
* commit '146249ad9382d8d243a287bf3c65f49b286d9fb7':
Updating Bluetooth preference page to use different configuration icon
2011-01-24 12:10:19 -08:00
Amith Yamasani
7b8dff506f
Merge "Bring back the MDN (phone number) status even if there's no voice." into honeycomb
2011-01-24 12:07:52 -08:00
Amith Yamasani
b409b904d6
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
2011-01-24 11:40:31 -08:00
Justin Ho
4aee9f8894
Merge "Updated Bluetooth assets to fix sizing problems" into honeycomb
2011-01-24 09:47:21 -08:00
Justin Ho
146249ad93
Updating Bluetooth preference page to use different configuration icon
...
Change-Id: Ie5bf105e5522fb2a876c51c9407f02f2a3974631
2011-01-24 09:41:57 -08:00
Jim Miller
d9ddebb60f
am a634d843
: am 22c060eb
: Merge "Fix 3315488: Wrap OwnerInfo layout in a ScrollView" into honeycomb
...
* commit 'a634d843b5fc82febc13230ea0506f7423581a62':
Fix 3315488: Wrap OwnerInfo layout in a ScrollView
2011-01-23 23:44:16 -08:00
Jim Miller
a634d843b5
am 22c060eb
: Merge "Fix 3315488: Wrap OwnerInfo layout in a ScrollView" into honeycomb
...
* commit '22c060ebd14bd92c67bd97f53d67bb06f0a215de':
Fix 3315488: Wrap OwnerInfo layout in a ScrollView
2011-01-23 23:36:31 -08:00
Jim Miller
22c060ebd1
Merge "Fix 3315488: Wrap OwnerInfo layout in a ScrollView" into honeycomb
2011-01-23 18:25:21 -08:00
Jim Miller
3752ef7847
Fix 3315488: Wrap OwnerInfo layout in a ScrollView
...
Change-Id: I5fc5a66c1a09ff4e45137469fee1b6de6b45c7a0
2011-01-23 18:14:13 -08:00
Adam Powell
cf5f404ed2
am cb671560
: am a31be80e
: Fix bug 3381583 - Settings action bar not refreshing menu content
...
* commit 'cb671560ef3ac30b205fe339766e6ec464daefab':
Fix bug 3381583 - Settings action bar not refreshing menu content
2011-01-23 17:54:21 -08:00
Adam Powell
cb671560ef
am a31be80e
: Fix bug 3381583 - Settings action bar not refreshing menu content
...
* commit 'a31be80ef056add00e0d239414f80f932978277f':
Fix bug 3381583 - Settings action bar not refreshing menu content
2011-01-23 17:52:23 -08:00
Adam Powell
a31be80ef0
Fix bug 3381583 - Settings action bar not refreshing menu content
...
Change-Id: I71416dbf691a6dacfb58c6ac3cc0df8233db8f44
2011-01-23 17:35:41 -08:00
Andy Stadler
f0f9907bd0
am d06ff87d
: am 6370c87a
: Maintain password quality while encrypted
...
* commit 'd06ff87d5e29b811f64c39e99b829f4fb3fe0aa8':
Maintain password quality while encrypted
2011-01-23 16:59:56 -08:00
Justin Ho
2d31d1cdd8
Updated Bluetooth assets to fix sizing problems
...
Change-Id: Ib9cbd0945c89e511b98c1153b55a22daf9c94fd7
2011-01-23 16:44:54 -08:00
Andy Stadler
d06ff87d5e
am 6370c87a
: Maintain password quality while encrypted
...
* commit '6370c87a6b98abfc6badb31070a60f84b3f528b3':
Maintain password quality while encrypted
2011-01-23 14:48:53 -08:00