commit 15546c0b9ddde0bb76636a02a70c225015e3db97
author Maurice Lam <yukl@google.com> Mon Jul 20 15:03:37 2015 -0700
committer Maurice Lam <yukl@google.com> Mon Jul 20 15:23:41 2015 -0700
tree b89ef5360fbf42d8ca95926700d011a71d2a902c
parent ddaa142a094a404d7c5e6d7eea93920f8ed16696

[ScreenLock] Change title of encryption interstitial

Change the title of EncryptionInterstitial to "Secure start-up".

Bug: 22587892
Change-Id: I30b9625bb2da666cd5e229445ad369fe72faad51

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5c57f83..6077053 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6367,8 +6367,8 @@
     <!-- Title for IMEI preference [CHAR LIMIT=30] -->
     <string name="imei_information_title">IMEI information</string>
 
-    <!-- Encryption interstitial title [CHAR LIMIT=30] -->
-    <string name="encryption_interstitial_header">Encryption</string>
+    <!-- Encryption interstitial title. This screen asks the user whether the device will ask for a PIN / pattern / password before the device starts up. [CHAR LIMIT=30] -->
+    <string name="encryption_interstitial_header">Secure start-up</string>
 
     <!-- Encryption interstitial button to continue with the shown setting.  Appears on screen that asks the user to opt in/out of encrypting device with a pin/pattern/password. [CHAR LIMIT=NONE] -->
     <string name="encryption_continue_button">Continue</string>

src/com/android/settings/SetupEncryptionInterstitial.java

diff --git a/src/com/android/settings/SetupEncryptionInterstitial.java b/src/com/android/settings/SetupEncryptionInterstitial.java
index 61ff81c..4605ca1 100644
--- a/src/com/android/settings/SetupEncryptionInterstitial.java
+++ b/src/com/android/settings/SetupEncryptionInterstitial.java
@@ -20,7 +20,6 @@
 import com.android.setupwizardlib.view.NavigationBar;
 
 import android.app.Activity;
-import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -77,8 +76,7 @@
             layout.setIllustration(R.drawable.setup_illustration_lock_screen,
                     R.drawable.setup_illustration_horizontal_tile);
             layout.setBackgroundTile(R.drawable.setup_illustration_tile);
-            final int headerTextResource = getHeaderTextResource();
-            layout.setHeaderText(headerTextResource);
+            layout.setHeaderText(R.string.encryption_interstitial_header);
 
             View content = super.onCreateView(inflater, layout, savedInstanceState);
             layout.addView(content);
@@ -86,25 +84,12 @@
 
             Activity activity = getActivity();
             if (activity != null) {
-                activity.setTitle(headerTextResource);
+                activity.setTitle(R.string.encryption_interstitial_header);
                 SetupWizardUtils.setImmersiveMode(activity);
             }
             return layout;
         }
 
-        private int getHeaderTextResource() {
-            final int quality = getActivity().getIntent().getIntExtra(EXTRA_PASSWORD_QUALITY, 0);
-            switch (quality) {
-                case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
-                    return R.string.unlock_set_unlock_pattern_title;
-                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
-                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
-                    return R.string.unlock_set_unlock_pin_title;
-                default:
-                    return R.string.unlock_set_unlock_password_title;
-            }
-        }
-
         @Override
         public void onNavigateBack() {
             final Activity activity = getActivity();