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
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
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
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
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
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
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
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
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
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
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
Daisuke Miyakawa
698e4c8dd0
am 392a06ed: Merge "Let WifiPickerActivity show AdvancedSettings correctly." into honeycomb
...
* commit '392a06ed1ee529105a46db2efcf08c3b037af9d8':
Let WifiPickerActivity show AdvancedSettings correctly.
2011-01-20 17:04:16 -08:00
Amith Yamasani
fc0968aca6
am 7099436c: Merge "Add back the refresh button and fix refresh when restarted." into honeycomb
...
* commit '7099436ca6e963adae9fe978b39700441446f45d':
Add back the refresh button and fix refresh when restarted.
2011-01-20 17:02:07 -08:00
Daisuke Miyakawa
ca2870f373
Rename title for Date Time setup
...
Bug: 3374552
Change-Id: I37a4ac3f7fb1a9f0cf9624aba2a69dd85e9743ac
2011-01-20 16:31:40 -08:00
Jason parks
43775c7f9b
Merge "More work on the CryptKeeper." into honeycomb
2011-01-20 15:58:02 -08:00
Jason parks
a13e9c877c
Merge "Encrypt inplace settings." into honeycomb
2011-01-20 15:50:55 -08:00
Daisuke Miyakawa
39281d0163
Merge "Use new backgrounds in wifi setup for xl" into honeycomb
2011-01-20 14:59:39 -08:00
Daisuke Miyakawa
392a06ed1e
Merge "Let WifiPickerActivity show AdvancedSettings correctly." into honeycomb
2011-01-20 12:39:27 -08:00
Daisuke Miyakawa
ece3bef58d
Let WifiPickerActivity show AdvancedSettings correctly.
...
- stop overwriting EXTRA_SHOW_FRAGMENT
- Show back/next button when WifiPickerActivity is requested
to show them.
Bug: 3362641
Change-Id: Ic06af4796acb1edb659fb99eb8c7d76c430c7798
2011-01-20 12:33:37 -08:00
Daisuke Miyakawa
8f533a6232
Use new backgrounds in wifi setup for xl
...
Bug: 3373467
Change-Id: Iccc9a4c36dc46a67e395c81a642646b8199be606
2011-01-20 12:28:47 -08:00
Amith Yamasani
7099436ca6
Merge "Add back the refresh button and fix refresh when restarted." into honeycomb
2011-01-20 12:08:41 -08:00
Amith Yamasani
1aae305fa0
Add back the refresh button and fix refresh when restarted.
...
Bug: 3364738
Fixes the case where after an orientation change, the battery stats
does not refresh.
Also added back the refresh menu button that was on the phone.
Change-Id: I06c69d17c9945ae976e4e7dc135e2e96242fe721
2011-01-20 11:25:43 -08:00
Roy West
02cfbe9db5
am e97bc56d: Tidy up Internal storage screen text.
...
* commit 'e97bc56db1b84b997467726ca9ecf78193eb03d4':
Tidy up Internal storage screen text.
2011-01-20 10:10:17 -08:00
Roy West
e97bc56db1
Tidy up Internal storage screen text.
...
Change-Id: Ia1b3b79a6df1756c2a4ff9440463771cfa308c13
2011-01-20 10:06:33 -08:00
satok
c080c0488e
Disable the checkbox even if there is a hard keyboard
...
Change-Id: I9ef8ce273fd72327089ada1133d923715645a141
2011-01-21 02:35:59 +09:00
Ken Wakasa
93a5d80bd9
am 5a813ba7: Refine InputMethodInfo API
...
* commit '5a813ba7f99f1c797ead4a58fdf05f91296158a4':
Refine InputMethodInfo API
2011-01-20 08:14:15 -08:00
Ken Wakasa
5a813ba7f9
Refine InputMethodInfo API
...
bug: 3370297
Change-Id: Ifaaad399586ee5b842f9b7762281d76e7969d24c
2011-01-21 00:46:26 +09:00