Commit Graph

3462 Commits

Author SHA1 Message Date
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
Andy Stadler
6370c87a6b Maintain password quality while encrypted
Bug: 3378277
Change-Id: I68aae06c518eb514c1be38214d8c9918b0398f95
2011-01-21 16:25:22 -08:00
Daisuke Miyakawa
350b724d09 Fix wifi flow
- show progress bar correctly
- stop inappropriately showing padding views
- expand the screen when successful.

Bug: 3378348
Bug: 3378341
Change-Id: I89ff31d24c050755c90fbf07cd4f56d8f0ddeac9
2011-01-21 15:55:48 -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
9dd9e4766b am 15972229: am f5f4c687: Merge "Accquire a wakelock while encrypting." into honeycomb
* commit '159722294722b602251055ca18e59255ea5e076d':
  Accquire a wakelock while encrypting.
2011-01-21 14:23:16 -08:00
Jason parks
1597222947 am f5f4c687: Merge "Accquire a wakelock while encrypting." into honeycomb
* commit 'f5f4c687870ff09ef2fe02677a810af22b57ff99':
  Accquire a wakelock while encrypting.
2011-01-21 14:20:41 -08:00
Jason parks
f5f4c68787 Merge "Accquire a wakelock while encrypting." into honeycomb 2011-01-21 14:18:52 -08:00
Andy Stadler
1aea6c2df2 am 504ef070: am 3da38a07: Add start-encryption intent filter to settings
* commit '504ef070067ec4aaeea78b5e73aea6f536307323':
  Add start-encryption intent filter to settings
2011-01-21 14:07:24 -08:00
Andy Stadler
504ef07006 am 3da38a07: Add start-encryption intent filter to settings
* commit '3da38a0771022615ecb568861e489761fe53a05a':
  Add start-encryption intent filter to settings
2011-01-21 14:05:17 -08:00
Jason parks
35933812b1 Accquire a wakelock while encrypting.
Bug: 3375491
Change-Id: Ief7dbb450800104f4977ab31f93a1e1a994b25ad
2011-01-21 15:51:15 -06:00
Andy Stadler
3da38a0771 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
2011-01-21 13:38:45 -08:00
Jason parks
29a61baa7b am 0113aa35: am 666800a2: Remove unused code.
* commit '0113aa354a188b93f652d9d56bb24a649936c92b':
  Remove unused code.
2011-01-21 12:39:42 -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
e3b93ee593 am a4e011ea: am dbf4322a: Change how we check to see if we should display the progress bar.
* commit 'a4e011ea037c971546dbf00b83661ef4e882c1f5':
  Change how we check to see if we should display the progress bar.
2011-01-21 12:39:38 -08:00
Jason parks
0113aa354a am 666800a2: Remove unused code.
* commit '666800a237066457c5703fc7c746a5d477249d59':
  Remove unused code.
2011-01-21 12:36:12 -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
a4e011ea03 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.
2011-01-21 12:36:08 -08:00
Jason parks
666800a237 Remove unused code.
Change-Id: If9fd0f0229721ec1cdce583e6d3180d691213f23
2011-01-21 13:55:57 -06: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
Jason parks
dbf4322ab1 Change how we check to see if we should display the progress bar.
Change-Id: I779e229f82a11d570e832f3e8cc5b275939249e8
2011-01-21 13:52:18 -06:00
Amith Yamasani
476d795667 NPE check in VpnSettings.
Bug: 3368545

Also fix a couple of bugs in TetherSettings:

Bug: 3090156 - view was being reused without removing from old dialog
Bug: 3368493 - preference being removed a second time

Change-Id: I8fe513d41e1f3af6994783be5ead69b6bd205711
2011-01-21 11:27:29 -08: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
satok
20779a0d4e am af7b6cab: am f2d812a5: Merge "Disable the checkbox even if there is a hard keyboard" into honeycomb
* commit 'af7b6cab5ae91ad5fdd8985fda34c622d3118e6d':
  Disable the checkbox even if there is a hard keyboard
2011-01-21 10:56:26 -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
satok
af7b6cab5a am f2d812a5: Merge "Disable the checkbox even if there is a hard keyboard" into honeycomb
* commit 'f2d812a5d49af75ff796377a23048900f9eef11f':
  Disable the checkbox even if there is a hard keyboard
2011-01-20 18:28:15 -08:00
satok
f2d812a5d4 Merge "Disable the checkbox even if there is a hard keyboard" into honeycomb 2011-01-20 18:25:15 -08:00