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

Commit 9bb4e007 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Set the color primary variant for material design"

parents 32ee158e da01c0fc

res/values/themes.xml

+2 −0
Original line number Diff line number Diff line
@@ -185,6 +185,8 @@ 
        <item name="batteryGoodColor">@color/battery_good_color_light</item>

        <item name="batteryMaybeColor">@color/battery_maybe_color_light</item>

        <item name="batteryBadColor">@color/battery_bad_color_light</item>

        <!-- Define this color for material design -->

        <item name="colorPrimaryVariant">@android:color/white</item>

    </style>



    <style name="Theme.Settings.Home" parent="Theme.Settings.HomeBase">

tests/robotests/res/values/themes.xml

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
        <item name="colorAccent">#ffffff</item>

        <item name="preferenceTheme">@style/PreferenceTheme</item>

        <item name="android:windowLightStatusBar">true</item>

        <!-- Define this color for material design -->

        <item name="colorPrimaryVariant">@android:color/white</item>

    </style>



    <style name="ThemeOverlay.SwitchBar.Settings" parent="@android:style/ThemeOverlay.Material.ActionBar">

tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRendererTest.java

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class ConditionContextualCardRendererTest { 
        final ActivityController<Activity> activityController = Robolectric.buildActivity(

                Activity.class);

        mActivity = activityController.get();

        mActivity.setTheme(R.style.Theme_AppCompat);

        mActivity.setTheme(R.style.Theme_Settings_Home);

        activityController.create();

        mRenderer = new ConditionContextualCardRenderer(mActivity, mControllerRendererPool);

    }

tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRendererTest.java

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public class ConditionHeaderContextualCardRendererTest { 
        final ActivityController<Activity> activityController = Robolectric.buildActivity(

                Activity.class);

        mActivity = activityController.get();

        mActivity.setTheme(R.style.Theme_AppCompat);

        mActivity.setTheme(R.style.Theme_Settings_Home);

        activityController.create();

        mRenderer = new ConditionHeaderContextualCardRenderer(mActivity, mControllerRendererPool);

    }

tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRendererTest.java

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class LegacySuggestionContextualCardRendererTest { 
        final ActivityController<Activity> activityController = Robolectric.buildActivity(

                Activity.class);

        mActivity = activityController.get();

        mActivity.setTheme(R.style.Theme_AppCompat);

        mActivity.setTheme(R.style.Theme_Settings_Home);

        activityController.create();



        mRenderer = new LegacySuggestionContextualCardRenderer(mActivity, mControllerRendererPool);