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

Commit 342d0853 authored by Maurice Lam's avatar Maurice Lam Committed by Android (Google) Code Review
Browse files

Merge "Add support for material_blue theme"

parents 82210af7 598be1ea

src/com/android/settings/SetupChooseLockGeneric.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric 


    @Override

    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {

        resid = SetupWizardUtils.getTheme(getIntent(), resid);

        resid = SetupWizardUtils.getTheme(getIntent());

        super.onApplyThemeResource(theme, resid, first);

    }

src/com/android/settings/SetupChooseLockPassword.java

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public class SetupChooseLockPassword extends ChooseLockPassword 


    @Override

    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {

        resid = SetupWizardUtils.getTheme(getIntent(), resid);

        resid = SetupWizardUtils.getTheme(getIntent());

        super.onApplyThemeResource(theme, resid, first);

    }

src/com/android/settings/SetupChooseLockPattern.java

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public class SetupChooseLockPattern extends ChooseLockPattern 


    @Override

    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {

        resid = SetupWizardUtils.getTheme(getIntent(), resid);

        resid = SetupWizardUtils.getTheme(getIntent());

        super.onApplyThemeResource(theme, resid, first);

    }

src/com/android/settings/SetupEncryptionInterstitial.java

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class SetupEncryptionInterstitial extends EncryptionInterstitial 


    @Override

    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {

        resid = SetupWizardUtils.getTheme(getIntent(), resid);

        resid = SetupWizardUtils.getTheme(getIntent());

        super.onApplyThemeResource(theme, resid, first);

    }

src/com/android/settings/SetupRedactionInterstitial.java

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public class SetupRedactionInterstitial extends RedactionInterstitial 


    @Override

    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {

        resid = SetupWizardUtils.getTheme(getIntent(), resid);

        resid = SetupWizardUtils.getTheme(getIntent());

        super.onApplyThemeResource(theme, resid, first);

    }