OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f1dbf55) | patch
Display the correct encryption settings.
authorJason parks <jparks@google.com>
Tue, 25 Jan 2011 15:26:55 +0000 (09:26 -0600)
committerJason parks <jparks@google.com>
Tue, 25 Jan 2011 16:29:50 +0000 (10:29 -0600)
commit4112199ed654f8bd1cea2c9a29a24be3c148b2ed
tree219b672dd6e48bd2d62a4e26b3f71e43d3e8b236tree | snapshot
parentf1dbf55819e01f6cf1a99d38a292b15de1262a29commit | diff
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
res/values/strings.xml diff | blob | history
res/xml/security_settings_encrypted.xml [new file with mode: 0644] blob
res/xml/security_settings_unencrypted.xml [moved from res/xml/security_settings_encryption.xml with 100% similarity] blob | history
src/com/android/settings/SecuritySettings.java diff | blob | history
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help