From 0973c31db164e09cb5be275cf0f991dd208ee0fa Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Fri, 5 Dec 2014 12:19:05 -0800 Subject: [PATCH] [FRP] Use Lock type as header instead of "Encryption" Bug: 18631620 Change-Id: I41799642cd019d7b33f754dc7b7305ea8a6cdac1 --- src/com/android/settings/EncryptionInterstitial.java | 2 +- .../android/settings/SetupEncryptionInterstitial.java | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java index 554f848240..dfbed77a7f 100644 --- a/src/com/android/settings/EncryptionInterstitial.java +++ b/src/com/android/settings/EncryptionInterstitial.java @@ -41,7 +41,7 @@ import android.widget.TextView; public class EncryptionInterstitial extends SettingsActivity { - private static final String EXTRA_PASSWORD_QUALITY = "extra_password_quality"; + protected static final String EXTRA_PASSWORD_QUALITY = "extra_password_quality"; public static final String EXTRA_REQUIRE_PASSWORD = "extra_require_password"; @Override diff --git a/src/com/android/settings/SetupEncryptionInterstitial.java b/src/com/android/settings/SetupEncryptionInterstitial.java index 1e9a463109..41782dab34 100644 --- a/src/com/android/settings/SetupEncryptionInterstitial.java +++ b/src/com/android/settings/SetupEncryptionInterstitial.java @@ -18,6 +18,7 @@ package com.android.settings; import com.android.setupwizard.navigationbar.SetupWizardNavBar; +import android.app.admin.DevicePolicyManager; import android.content.Context; import android.content.Intent; import android.content.res.Resources; @@ -93,12 +94,27 @@ public class SetupEncryptionInterstitial extends EncryptionInterstitial return view; } + 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 onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); SetupWizardUtils.setIllustration(getActivity(), R.drawable.setup_illustration_lock_screen); - SetupWizardUtils.setHeaderText(getActivity(), R.string.encryption_interstitial_header); + final int title = getHeaderTextResource(); + getActivity().setTitle(title); + SetupWizardUtils.setHeaderText(getActivity(), title); } } } -- 2.11.0