Commit Graph

6772 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
3752ef7847 Fix 3315488: Wrap OwnerInfo layout in a ScrollView
Change-Id: I5fc5a66c1a09ff4e45137469fee1b6de6b45c7a0
2011-01-23 18:14:13 -08:00
Justin Ho
2d31d1cdd8 Updated Bluetooth assets to fix sizing problems
Change-Id: Ib9cbd0945c89e511b98c1153b55a22daf9c94fd7
2011-01-23 16:44:54 -08:00
Justin Ho
e490344906 am 371e7ac2: am ac94d685: Merge "New Settings assets" into honeycomb
* commit '371e7ac26d6ac9128af35689ac1f1e20643ad024':
  New Settings assets
2011-01-21 15:33:17 -08:00
Justin Ho
371e7ac26d am ac94d685: Merge "New Settings assets" into honeycomb
* commit 'ac94d6852850889ca58480d1af91bc91541f2fce':
  New Settings assets
2011-01-21 14:55:47 -08:00
Justin Ho
ac94d68528 Merge "New Settings assets" into honeycomb 2011-01-21 14:52:57 -08:00
Justin Ho
25cc2775c4 New Settings assets
Change-Id: I1d3309d4e5f9ebb95c2907440ffae69bf8167ce3
2011-01-21 14:25:22 -08:00
Jason parks
ec9b33a77c am f8ee2f04: am 39f1e040: More UI tweaks and fixes.
* commit 'f8ee2f040751cde0f41468f3b7b22dac9e843f7b':
  More UI tweaks and fixes.
2011-01-21 12:39:40 -08:00
Jason parks
f8ee2f0407 am 39f1e040: More UI tweaks and fixes.
* commit '39f1e04079976d3d10fdd8e5dd36c833bab8a371':
  More UI tweaks and fixes.
2011-01-21 12:36:10 -08:00
Jason parks
39f1e04079 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
2011-01-21 13:53:41 -06:00
Daisuke Miyakawa
e19334e20d am e9c7421e: am 5dc460e4: Use correct wording for SteupWizard
* commit 'e9c7421e7fdc01eef324d4393621178a523c82bb':
  Use correct wording for SteupWizard
2011-01-21 11:02:07 -08:00
Daisuke Miyakawa
3cb9131ae7 am 30424e7f: am ca2870f3: Rename title for Date Time setup
* commit '30424e7f425e7f1238980c550afa7451858ac107':
  Rename title for Date Time setup
2011-01-21 10:46:32 -08:00
Daisuke Miyakawa
e9c7421e7f am 5dc460e4: Use correct wording for SteupWizard
* commit '5dc460e407b782fc8f2cbc5167bfe40eff50a74c':
  Use correct wording for SteupWizard
2011-01-21 09:04:27 -08:00
Daisuke Miyakawa
5dc460e407 Use correct wording for SteupWizard
Bug: 3375688
Change-Id: Id8cdfc5347092277429c0a791fb45d55a7236230
2011-01-20 23:35:46 -08:00
Jason parks
2caa3a578a am 739c9a1e: am 43775c7f: Merge "More work on the CryptKeeper." into honeycomb
* commit '739c9a1e7b0028534d2cb1bdb1a0df3255cccbb1':
  More work on the CryptKeeper.
2011-01-20 17:24:51 -08:00
Jason parks
0a62c3000a am f947ca51: am a13e9c87: Merge "Encrypt inplace settings." into honeycomb
* commit 'f947ca515771269b78726fc7609a8e791d5d562a':
  Encrypt inplace settings.
2011-01-20 17:24:49 -08:00
Daisuke Miyakawa
07097910a4 am 596c5e1a: am 39281d01: Merge "Use new backgrounds in wifi setup for xl" into honeycomb
* commit '596c5e1adccdc081a6982d1833cd2e93c8fe7ecd':
  Use new backgrounds in wifi setup for xl
2011-01-20 17:24:48 -08:00
Daisuke Miyakawa
30424e7f42 am ca2870f3: Rename title for Date Time setup
* commit 'ca2870f3734a086a8d9a1551af6ecbe8d4828b1f':
  Rename title for Date Time setup
2011-01-20 17:14:09 -08:00
Jason parks
739c9a1e7b am 43775c7f: Merge "More work on the CryptKeeper." into honeycomb
* commit '43775c7f9b8a5bc707c678743d8fc0139a426717':
  More work on the CryptKeeper.
2011-01-20 17:07:43 -08:00
Jason parks
f947ca5157 am a13e9c87: Merge "Encrypt inplace settings." into honeycomb
* commit 'a13e9c877ce4928df0095f47b6117cc4b5403fb2':
  Encrypt inplace settings.
2011-01-20 17:07:36 -08:00
Daisuke Miyakawa
596c5e1adc am 39281d01: Merge "Use new backgrounds in wifi setup for xl" into honeycomb
* commit '39281d0163aa410391a128d1d2c8194c88e732fb':
  Use new backgrounds in wifi setup for xl
2011-01-20 17:07:03 -08:00