OSDN Git Service

Change encryption preference's summary accordingly
authorAlex Cruz <du.alexcruz@gmail.com>
Fri, 20 Oct 2017 23:26:58 +0000 (19:26 -0400)
committerFan Zhang <zhfan@google.com>
Tue, 6 Mar 2018 19:40:49 +0000 (11:40 -0800)
commitd2a8b1ff021bd9bdee0ab49a7d1610302e640dc5
tree7f9634ee0eeca8beae38bcd620a382f24a232ad6
parente8acc0c4bd14880542a0801db00b6f7fbe2d0a13
Change encryption preference's summary accordingly

With this change a summary to the encryption preference was added.

https://android.googlesource.com/platform/packages/apps/Settings/+/415ce9a77d44732966fbab641d1ecaa8e8688381

The problem is that even if you're not encrypted, it says that your phone is.
Is very misleading to the user that don't bother to enter the actual preference
and want to see if they are. This fixes that.

This is cherry-picked from
https://android-review.googlesource.com/#/c/platform/packages/apps/Settings/+/517875/

Test: Go into Settings/Security & Location
Fixes: 68691666
Fixes: 68542516
Change-Id: Iaeaffd340f2e248748f244a947aa71eb8ad4ab94
res/values/strings.xml
src/com/android/settings/security/EncryptionStatusPreferenceController.java
tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java