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

Apply dynamic color for Erase all data(factory reset screen

Browse Source 
Enable the dynamic color flag, and remove some unused theme in layout.

Test: Rebuilt apk and see the screen
Fix: 185557130
Change-Id: I7ed73c808be4942e5ffd461982e73a4ff7f7f2db
This commit is contained in:
Tsung-Mao Fang
2021-05-05 15:43:54 +08:00
parent da602e196e
commit d3cd751f02
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/main_clear.xml
View File

@@ -21,7 +21,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:theme="@style/GlifV3Theme.Footer"
android:icon="@drawable/ic_delete_accent" android:icon="@drawable/ic_delete_accent"
app:sucHeaderText="@string/main_clear_title"> app:sucHeaderText="@string/main_clear_title">

1
res/layout/main_clear_confirm.xml
View File

@@ -19,7 +19,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:theme="@style/SudThemeGlifV3.DayNight"
android:id="@+id/setup_wizard_layout" android:id="@+id/setup_wizard_layout"
android:icon="@drawable/ic_delete_accent" android:icon="@drawable/ic_delete_accent"
app:sucHeaderText="@string/main_clear_confirm_title"> app:sucHeaderText="@string/main_clear_confirm_title">

4
src/com/android/settings/Settings.java
View File

@@ -28,6 +28,8 @@ import com.android.settings.enterprise.EnterprisePrivacySettings;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settings.security.SecuritySettingsFeatureProvider; import com.android.settings.security.SecuritySettingsFeatureProvider;
import com.google.android.setupdesign.util.ThemeHelper;
/** /**
* Top-level Settings activity * Top-level Settings activity
*/ */
@@ -164,6 +166,7 @@ public class Settings extends SettingsActivity {
@Override @Override
protected void onCreate(Bundle savedState) { protected void onCreate(Bundle savedState) {
setTheme(SetupWizardUtils.getTheme(this, getIntent())); setTheme(SetupWizardUtils.getTheme(this, getIntent()));
ThemeHelper.trySetDynamicColor(this);
super.onCreate(savedState); super.onCreate(savedState);
} }
@@ -176,6 +179,7 @@ public class Settings extends SettingsActivity {
@Override @Override
protected void onCreate(Bundle savedState) { protected void onCreate(Bundle savedState) {
setTheme(SetupWizardUtils.getTheme(this, getIntent())); setTheme(SetupWizardUtils.getTheme(this, getIntent()));
ThemeHelper.trySetDynamicColor(this);
super.onCreate(savedState); super.onCreate(savedState);
} }