Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea1d3228 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Apply dynamic color for Erase all data(factory reset screen" into sc-dev

parents 66034187 d3cd751f

res/layout/main_clear.xml

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:theme="@style/GlifV3Theme.Footer"

    android:icon="@drawable/ic_delete_accent"

    app:sucHeaderText="@string/main_clear_title">

res/layout/main_clear_confirm.xml

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:theme="@style/SudThemeGlifV3.DayNight"

    android:id="@+id/setup_wizard_layout"

    android:icon="@drawable/ic_delete_accent"

    app:sucHeaderText="@string/main_clear_confirm_title">

src/com/android/settings/Settings.java

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ import com.android.settings.enterprise.EnterprisePrivacySettings; 
import com.android.settings.overlay.FeatureFactory;

import com.android.settings.security.SecuritySettingsFeatureProvider;



import com.google.android.setupdesign.util.ThemeHelper;



/**

 * Top-level Settings activity

 */
@@ -164,6 +166,7 @@ public class Settings extends SettingsActivity { 
        @Override

        protected void onCreate(Bundle savedState) {

            setTheme(SetupWizardUtils.getTheme(this, getIntent()));

            ThemeHelper.trySetDynamicColor(this);

            super.onCreate(savedState);

        }
@@ -176,6 +179,7 @@ public class Settings extends SettingsActivity { 
        @Override

        protected void onCreate(Bundle savedState) {

            setTheme(SetupWizardUtils.getTheme(this, getIntent()));

            ThemeHelper.trySetDynamicColor(this);

            super.onCreate(savedState);

        }