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

Read theme for lock screen flows

Browse Source 
Move the applyThemeResource calls up from the setup wizard specific
subclasses up to the settings classes so that it will get GLIF v2
theme on devices that request it.

Test: Manual
Bug: 62906814
Change-Id: I6ff4ff8d9ed3e6090b35b4ae7197e5d01f5a61f8
This commit is contained in:
Maurice Lam
2017-06-28 15:06:09 -07:00
parent a6b24388fc
commit 9990f39722
13 changed files with 39 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,7 @@ import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
@@ -56,6 +57,12 @@ public class EncryptionInterstitial extends SettingsActivity {
return modIntent;
}
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
resid = SetupWizardUtils.getTheme(getIntent());
super.onApplyThemeResource(theme, resid, first);
}
@Override
protected boolean isValidFragment(String fragmentName) {
return EncryptionInterstitialFragment.class.getName().equals(fragmentName);

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

@@ -18,7 +18,6 @@ package com.android.settings;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
import android.widget.LinearLayout;
@@ -54,12 +53,6 @@ public class SetupEncryptionInterstitial extends EncryptionInterstitial {
return SetupEncryptionInterstitialFragment.class.getName().equals(fragmentName);
}
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
resid = SetupWizardUtils.getTheme(getIntent());
super.onApplyThemeResource(theme, resid, first);
}
@Override
protected void onCreate(Bundle savedInstance) {
super.onCreate(savedInstance);

6
src/com/android/settings/SetupRedactionInterstitial.java
View File

@@ -60,12 +60,6 @@ public class SetupRedactionInterstitial extends RedactionInterstitial {
return SetupRedactionInterstitialFragment.class.getName().equals(fragmentName);
}
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
resid = SetupWizardUtils.getTheme(getIntent());
super.onApplyThemeResource(theme, resid, first);
}
public static class SetupRedactionInterstitialFragment extends RedactionInterstitialFragment {
// Setup wizard specific UI customizations can be done here

8
src/com/android/settings/fingerprint/FingerprintEnrollBase.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.fingerprint;
import android.annotation.Nullable;
import android.content.Intent;
import android.content.res.Resources;
import android.graphics.Color;
import android.os.Bundle;
import android.os.UserHandle;
@@ -27,6 +28,7 @@ import android.widget.Button;
import android.widget.TextView;
import com.android.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.core.InstrumentedActivity;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.setupwizardlib.GlifLayout;
@@ -56,6 +58,12 @@ public abstract class FingerprintEnrollBase extends InstrumentedActivity
mUserId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
}
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
resid = SetupWizardUtils.getTheme(getIntent());
super.onApplyThemeResource(theme, resid, first);
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

7
src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.fingerprint;
import android.content.Intent;
import android.content.res.Resources;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.SetupWizardUtils;
@@ -31,12 +30,6 @@ public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling
return intent;
}
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
resid = SetupWizardUtils.getTheme(getIntent());
super.onApplyThemeResource(theme, resid, first);
}
@Override
public int getMetricsCategory() {
return MetricsEvent.FINGERPRINT_ENROLLING_SETUP;

7
src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.fingerprint;
import android.content.Intent;
import android.content.res.Resources;
import android.os.UserHandle;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -43,12 +42,6 @@ public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSenso
return intent;
}
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
resid = SetupWizardUtils.getTheme(getIntent());
super.onApplyThemeResource(theme, resid, first);
}
@Override
public int getMetricsCategory() {
return MetricsEvent.FINGERPRINT_FIND_SENSOR_SETUP;

7
src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.fingerprint;
import android.content.Intent;
import android.content.res.Resources;
import android.os.UserHandle;
import android.widget.Button;
@@ -39,12 +38,6 @@ public class SetupFingerprintEnrollFinish extends FingerprintEnrollFinish {
return intent;
}
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
resid = SetupWizardUtils.getTheme(getIntent());
super.onApplyThemeResource(theme, resid, first);
}
@Override
protected void initViews() {
super.initViews();

7
src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.fingerprint;
import android.app.KeyguardManager;
import android.app.admin.DevicePolicyManager;
import android.content.Intent;
import android.content.res.Resources;
import android.os.UserHandle;
import android.widget.Button;
import android.widget.TextView;
@@ -52,12 +51,6 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu
return intent;
}
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
resid = SetupWizardUtils.getTheme(getIntent());
super.onApplyThemeResource(theme, resid, first);
}
@Override
protected void initViews() {
super.initViews();

8
src/com/android/settings/notification/RedactionInterstitial.java
View File

@@ -23,6 +23,7 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
import android.os.UserManager;
import android.provider.Settings;
@@ -41,6 +42,7 @@ import com.android.settings.RestrictedRadioButton;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.SetupRedactionInterstitial;
import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;
@@ -53,6 +55,12 @@ public class RedactionInterstitial extends SettingsActivity {
return modIntent;
}
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
resid = SetupWizardUtils.getTheme(getIntent());
super.onApplyThemeResource(theme, resid, first);
}
@Override
protected boolean isValidFragment(String fragmentName) {
return RedactionInterstitialFragment.class.getName().equals(fragmentName);

8
src/com/android/settings/password/ChooseLockPassword.java
View File

@@ -28,6 +28,7 @@ import android.app.admin.DevicePolicyManager;
import android.app.admin.PasswordMetrics;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources.Theme;
import android.graphics.Insets;
import android.os.Bundle;
import android.os.Handler;
@@ -61,6 +62,7 @@ import com.android.internal.widget.TextViewInputDisabler;
import com.android.settings.EncryptionInterstitial;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.notification.RedactionInterstitial;
@@ -88,6 +90,12 @@ public class ChooseLockPassword extends SettingsActivity {
return modIntent;
}
@Override
protected void onApplyThemeResource(Theme theme, int resid, boolean first) {
resid = SetupWizardUtils.getTheme(getIntent());
super.onApplyThemeResource(theme, resid, first);
}
public static class IntentBuilder {
private final Intent mIntent;

8
src/com/android/settings/password/ChooseLockPattern.java
View File

@@ -20,6 +20,7 @@ import android.app.Activity;
import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources.Theme;
import android.os.Bundle;
import android.util.Log;
import android.view.KeyEvent;
@@ -40,6 +41,7 @@ import com.android.internal.widget.LockPatternView.DisplayMode;
import com.android.settings.EncryptionInterstitial;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.notification.RedactionInterstitial;
@@ -80,6 +82,12 @@ public class ChooseLockPattern extends SettingsActivity {
return modIntent;
}
@Override
protected void onApplyThemeResource(Theme theme, int resid, boolean first) {
resid = SetupWizardUtils.getTheme(getIntent());
super.onApplyThemeResource(theme, resid, first);
}
public static class IntentBuilder {
private final Intent mIntent;

8
src/com/android/settings/password/SetupChooseLockPassword.java
View File

@@ -20,7 +20,6 @@ import android.app.Activity;
import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
@@ -30,7 +29,6 @@ import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.SetupRedactionInterstitial;
import com.android.settings.SetupWizardUtils;
import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
import com.android.settings.password.ChooseLockTypeDialogFragment.OnLockTypeSelectedListener;
import com.android.setupwizardlib.util.WizardManagerHelper;
@@ -69,12 +67,6 @@ public class SetupChooseLockPassword extends ChooseLockPassword {
layout.setFitsSystemWindows(false);
}
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
resid = SetupWizardUtils.getTheme(getIntent());
super.onApplyThemeResource(theme, resid, first);
}
public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment
implements OnLockTypeSelectedListener {

8
src/com/android/settings/password/SetupChooseLockPattern.java
View File

@@ -19,10 +19,8 @@ package com.android.settings.password;
import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
import com.android.settings.SetupRedactionInterstitial;
import com.android.settings.SetupWizardUtils;
/**
* Setup Wizard's version of ChooseLockPattern screen. It inherits the logic and basic structure
@@ -48,12 +46,6 @@ public class SetupChooseLockPattern extends ChooseLockPattern {
return SetupChooseLockPatternFragment.class;
}
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
resid = SetupWizardUtils.getTheme(getIntent());
super.onApplyThemeResource(theme, resid, first);
}
public static class SetupChooseLockPatternFragment extends ChooseLockPatternFragment {
@Override