From fefc66853ba35357eb6231fdcf66563a69d2787f Mon Sep 17 00:00:00 2001 From: pastychang Date: Thu, 21 Mar 2019 19:42:39 +0800 Subject: [PATCH] Set attribute sucUsePartnerResource Add the attribute for all pages apply gliflayout of setupdesign library. In addition, set the value false to remove stencil theme customization for outside setupwizard flow. Test: atest Bug: 128961334 Bug: 128364683 Change-Id: If55e9bf97970a5cd08d8d426747c483d80565559 --- res/layout/encryption_interstitial.xml | 1 - res/layout/face_enroll_enrolling.xml | 1 - res/layout/face_enroll_finish.xml | 1 - res/layout/fingerprint_enroll_enrolling_base.xml | 1 - res/layout/fingerprint_enroll_find_sensor_base.xml | 1 - res/layout/fingerprint_enroll_finish_base.xml | 1 - res/layout/fingerprint_enroll_introduction.xml | 1 - res/layout/storage_wizard_generic.xml | 1 - res/layout/storage_wizard_init.xml | 1 - res/layout/storage_wizard_progress.xml | 1 - res/values/styles.xml | 5 +++++ src/com/android/settings/SettingsActivity.java | 7 +++++++ .../android/settings/biometrics/BiometricEnrollBase.java | 2 ++ src/com/android/settings/deviceinfo/StorageWizardBase.java | 7 +++++++ 14 files changed, 21 insertions(+), 10 deletions(-) diff --git a/res/layout/encryption_interstitial.xml b/res/layout/encryption_interstitial.xml index 3e227cb1d6f..a2305f875f0 100644 --- a/res/layout/encryption_interstitial.xml +++ b/res/layout/encryption_interstitial.xml @@ -17,7 +17,6 @@ diff --git a/res/layout/face_enroll_enrolling.xml b/res/layout/face_enroll_enrolling.xml index e7af493a42e..7e1863b8b6a 100644 --- a/res/layout/face_enroll_enrolling.xml +++ b/res/layout/face_enroll_enrolling.xml @@ -17,7 +17,6 @@ diff --git a/res/layout/storage_wizard_init.xml b/res/layout/storage_wizard_init.xml index d02e871d09f..8d9870f1cec 100644 --- a/res/layout/storage_wizard_init.xml +++ b/res/layout/storage_wizard_init.xml @@ -16,7 +16,6 @@ diff --git a/res/layout/storage_wizard_progress.xml b/res/layout/storage_wizard_progress.xml index cf5bc437ac1..577ec3cbfc8 100644 --- a/res/layout/storage_wizard_progress.xml +++ b/res/layout/storage_wizard_progress.xml @@ -16,7 +16,6 @@ diff --git a/res/values/styles.xml b/res/values/styles.xml index 8fde9a05310..02db995d39b 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -533,4 +533,9 @@ 8dp + + diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 001e65be8be..92a0f73baf5 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -27,6 +27,7 @@ import android.content.SharedPreferences; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; +import android.content.res.Resources.Theme; import android.os.AsyncTask; import android.os.Bundle; import android.os.UserHandle; @@ -333,6 +334,12 @@ public class SettingsActivity extends SettingsBaseActivity } } + @Override + protected void onApplyThemeResource(Theme theme, int resid, boolean first) { + theme.applyStyle(R.style.SetupWizardPartnerResource, true); + super.onApplyThemeResource(theme, resid, first); + } + @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); diff --git a/src/com/android/settings/biometrics/BiometricEnrollBase.java b/src/com/android/settings/biometrics/BiometricEnrollBase.java index 9c9f4fad030..a9619212988 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollBase.java +++ b/src/com/android/settings/biometrics/BiometricEnrollBase.java @@ -21,6 +21,7 @@ import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME; import android.annotation.Nullable; import android.content.Intent; import android.content.res.Resources; +import android.content.res.Resources.Theme; import android.graphics.Color; import android.os.Bundle; import android.os.UserHandle; @@ -97,6 +98,7 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity { @Override protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) { resid = SetupWizardUtils.getTheme(getIntent()); + theme.applyStyle(R.style.SetupWizardPartnerResource, true); super.onApplyThemeResource(theme, resid, first); } diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java index 48cdeebcabd..38733891901 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardBase.java +++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java @@ -24,6 +24,7 @@ import static com.android.settings.deviceinfo.StorageSettings.TAG; import android.annotation.LayoutRes; import android.annotation.NonNull; import android.content.Intent; +import android.content.res.Resources.Theme; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.SystemClock; @@ -123,6 +124,12 @@ public abstract class StorageWizardBase extends FragmentActivity { super.onDestroy(); } + @Override + protected void onApplyThemeResource(Theme theme, int resid, boolean first) { + theme.applyStyle(R.style.SetupWizardPartnerResource, true); + super.onApplyThemeResource(theme, resid, first); + } + protected FooterButton getBackButton() { return mBack; }