PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing decryption messaging

Browse Source 
Messaging currently implies encryption only works with PIN or password
(K functionality). Now that in L we support encryption with PIN, pattern,
password or swipe/none, we need to update the strings accordingly.

@bug 14257692
@bug 13674657

Change-Id: I055db1289c2c2750d217b50b653a7f36ff304aca
This commit is contained in:
Paul Lawrence
2014-05-15 09:37:56 -07:00
parent 667848b8cb
commit 04425f1617
3 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/CryptKeeper.java
View File

@@ -388,9 +388,11 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
public void onPostExecute(java.lang.Void v) {
if(type == StorageManager.CRYPT_TYPE_PIN) {
setContentView(R.layout.crypt_keeper_pin_entry);
((TextView)findViewById(R.id.status)).setText(R.string.enter_pin);
} else if (type == StorageManager.CRYPT_TYPE_PATTERN) {
setContentView(R.layout.crypt_keeper_pattern_entry);
setBackFunctionality(false);
((TextView)findViewById(R.id.status)).setText(R.string.enter_pattern);
} else {
setContentView(R.layout.crypt_keeper_password_entry);
}