Merge "Read theme for lock screen flows" into oc-dr1-dev am: 864d5c96d7 (21bd3994) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/EncryptionInterstitial.java

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,7 @@ import android.app.admin.DevicePolicyManager;
	import android.content.Context;		import android.content.Context;
	import android.content.DialogInterface;		import android.content.DialogInterface;
	import android.content.Intent;		import android.content.Intent;
			import android.content.res.Resources;
	import android.os.Bundle;		import android.os.Bundle;
	import android.util.Log;		import android.util.Log;
	import android.view.LayoutInflater;		import android.view.LayoutInflater;
	@@ -56,6 +57,12 @@ public class EncryptionInterstitial extends SettingsActivity {
	return modIntent;		return modIntent;
	}		}

			@Override
			protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
			resid = SetupWizardUtils.getTheme(getIntent());
			super.onApplyThemeResource(theme, resid, first);
			}

	@Override		@Override
	protected boolean isValidFragment(String fragmentName) {		protected boolean isValidFragment(String fragmentName) {
	return EncryptionInterstitialFragment.class.getName().equals(fragmentName);		return EncryptionInterstitialFragment.class.getName().equals(fragmentName);

src/com/android/settings/SetupEncryptionInterstitial.java

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,6 @@ package com.android.settings;

	import android.content.Context;		import android.content.Context;
	import android.content.Intent;		import android.content.Intent;
	import android.content.res.Resources;
	import android.os.Bundle;		import android.os.Bundle;
	import android.widget.LinearLayout;		import android.widget.LinearLayout;

	@@ -54,12 +53,6 @@ public class SetupEncryptionInterstitial extends EncryptionInterstitial {
	return SetupEncryptionInterstitialFragment.class.getName().equals(fragmentName);		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		@Override
	protected void onCreate(Bundle savedInstance) {		protected void onCreate(Bundle savedInstance) {
	super.onCreate(savedInstance);		super.onCreate(savedInstance);

src/com/android/settings/SetupRedactionInterstitial.java

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -60,12 +60,6 @@ public class SetupRedactionInterstitial extends RedactionInterstitial {
	return SetupRedactionInterstitialFragment.class.getName().equals(fragmentName);		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 {		public static class SetupRedactionInterstitialFragment extends RedactionInterstitialFragment {

	// Setup wizard specific UI customizations can be done here		// Setup wizard specific UI customizations can be done here

src/com/android/settings/fingerprint/FingerprintEnrollBase.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@ package com.android.settings.fingerprint;

	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.content.Intent;		import android.content.Intent;
			import android.content.res.Resources;
	import android.graphics.Color;		import android.graphics.Color;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.UserHandle;		import android.os.UserHandle;
	@@ -27,6 +28,7 @@ import android.widget.Button;
	import android.widget.TextView;		import android.widget.TextView;

	import com.android.settings.R;		import com.android.settings.R;
			import com.android.settings.SetupWizardUtils;
	import com.android.settings.core.InstrumentedActivity;		import com.android.settings.core.InstrumentedActivity;
	import com.android.settings.password.ChooseLockSettingsHelper;		import com.android.settings.password.ChooseLockSettingsHelper;
	import com.android.setupwizardlib.GlifLayout;		import com.android.setupwizardlib.GlifLayout;
	@@ -56,6 +58,12 @@ public abstract class FingerprintEnrollBase extends InstrumentedActivity
	mUserId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());		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		@Override
	protected void onSaveInstanceState(Bundle outState) {		protected void onSaveInstanceState(Bundle outState) {
	super.onSaveInstanceState(outState);		super.onSaveInstanceState(outState);

src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,6 @@
	package com.android.settings.fingerprint;		package com.android.settings.fingerprint;

	import android.content.Intent;		import android.content.Intent;
	import android.content.res.Resources;

	import com.android.internal.logging.nano.MetricsProto.MetricsEvent;		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
	import com.android.settings.SetupWizardUtils;		import com.android.settings.SetupWizardUtils;
	@@ -31,12 +30,6 @@ public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling
	return intent;		return intent;
	}		}

	@Override
	protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
	resid = SetupWizardUtils.getTheme(getIntent());
	super.onApplyThemeResource(theme, resid, first);
	}

	@Override		@Override
	public int getMetricsCategory() {		public int getMetricsCategory() {
	return MetricsEvent.FINGERPRINT_ENROLLING_SETUP;		return MetricsEvent.FINGERPRINT_ENROLLING_SETUP;