Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev (7dca460a) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/EncryptionInterstitial.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

+17 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}
		}