Commit Graph

1288 Commits

Author SHA1 Message Date
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
302c14a241 Editing encryption strings.
Change-Id: Ia7c12ea353f1a2dfee3125d2c620980ddd825570
2011-01-26 15:38:38 -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
Amith Yamasani
735e0f0079 Merge "Rearrange Applications settings items." into honeycomb 2011-01-25 21:43:19 -08:00
Justin Ho
1ed6b13aeb am e6df7871: am 9e89462d: Merge "Use expander assets for bluetooth profile preference." into honeycomb
* commit 'e6df78714dcdd4bfa535fee8dd1153fcbdc3456b':
  Use expander assets for bluetooth profile preference.
2011-01-25 18:38:44 -08:00
Justin Ho
e6df78714d am 9e89462d: Merge "Use expander assets for bluetooth profile preference." into honeycomb
* commit '9e89462d280f189420b49a8d609cf3f99e55d178':
  Use expander assets for bluetooth profile preference.
2011-01-25 18:36:06 -08:00
Amith Yamasani
03b58dff82 Use expander assets for bluetooth profile preference.
Also adjust some padding and set correct highlight background.

Bug: 3383060
Change-Id: I5a4abe98c49efd156523085418958b69df6c8d85
2011-01-25 17:20:43 -08:00
Amith Yamasani
a27573522e Rearrange Applications settings items.
Bug: 3337264
Change-Id: I955c15f7db791167b97b04beaeafc2953bdccd76
2011-01-25 14:56:44 -08:00
Jake Hamby
422b2b2c42 am 7bfb8601: am 51cd0d6d: Remove "Allow incoming file transfers" option from BT settings.
* commit '7bfb8601c80c915d2eafd22cdb73079168f58c6f':
  Remove "Allow incoming file transfers" option from BT settings.
2011-01-25 14:44:10 -08:00
Jake Hamby
7bfb8601c8 am 51cd0d6d: Remove "Allow incoming file transfers" option from BT settings.
* commit '51cd0d6d29c8f8f5320968f778b04b448984abc8':
  Remove "Allow incoming file transfers" option from BT settings.
2011-01-25 14:41:38 -08:00
Jake Hamby
51cd0d6d29 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
2011-01-25 13:57:30 -08:00
Jim Miller
786f62159f am de9b70f4: am a34279fb: Fix 3383575: use styled attribs and update layout
* commit 'de9b70f4df471a5548b9ee6779fcb1509d4e9f03':
  Fix 3383575: use styled attribs and update layout
2011-01-25 12:43:44 -08:00
Jim Miller
de9b70f4df am a34279fb: Fix 3383575: use styled attribs and update layout
* commit 'a34279fb2a109d45e88504ce9bc292d7fc7cf2c2':
  Fix 3383575: use styled attribs and update layout
2011-01-25 12:41:04 -08:00
Jim Miller
a34279fb2a 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
2011-01-25 12:29:35 -08:00
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
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