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
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
860617df42
am 698e4c8d
: am 392a06ed
: Merge "Let WifiPickerActivity show AdvancedSettings correctly." into honeycomb
...
* commit '698e4c8dd023f4d4962b3caea2279886dd7f87de':
Let WifiPickerActivity show AdvancedSettings correctly.
2011-01-20 17:24:44 -08:00
Amith Yamasani
b9e6f6ec41
am fc0968ac
: am 7099436c
: Merge "Add back the refresh button and fix refresh when restarted." into honeycomb
...
* commit 'fc0968aca64aca57a87a65dec210f0ab5eb3fc73':
Add back the refresh button and fix refresh when restarted.
2011-01-20 17:24:41 -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