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

[FRP] Use Lock type as header instead of "Encryption"

Browse Source 
Bug: 18631620
Change-Id: I41799642cd019d7b33f754dc7b7305ea8a6cdac1
This commit is contained in:
Maurice Lam
2014-12-05 12:19:05 -08:00
parent 2c0c983755
commit 0973c31db1
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ import android.widget.TextView;
public class EncryptionInterstitial extends SettingsActivity { 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"; public static final String EXTRA_REQUIRE_PASSWORD = "extra_require_password";
@Override @Override

18
src/com/android/settings/SetupEncryptionInterstitial.java
View File

@@ -18,6 +18,7 @@ package com.android.settings;
import com.android.setupwizard.navigationbar.SetupWizardNavBar; import com.android.setupwizard.navigationbar.SetupWizardNavBar;
import android.app.admin.DevicePolicyManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
@@ -93,12 +94,27 @@ public class SetupEncryptionInterstitial extends EncryptionInterstitial
return view; 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 @Override
public void onViewCreated(View view, Bundle savedInstanceState) { public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
SetupWizardUtils.setIllustration(getActivity(), SetupWizardUtils.setIllustration(getActivity(),
R.drawable.setup_illustration_lock_screen); 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);
} }
} }
} }