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

Merge "Set the color primary variant for material design"

Browse Source
This commit is contained in:
Fan Zhang
2018-12-04 17:15:32 +00:00
committed by Android (Google) Code Review
parent 32ee158e2a da01c0fc91
commit 9bb4e0075f
6 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/themes.xml
View File

@@ -185,6 +185,8 @@
<item name="batteryGoodColor">@color/battery_good_color_light</item> <item name="batteryGoodColor">@color/battery_good_color_light</item>
<item name="batteryMaybeColor">@color/battery_maybe_color_light</item> <item name="batteryMaybeColor">@color/battery_maybe_color_light</item>
<item name="batteryBadColor">@color/battery_bad_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>
<style name="Theme.Settings.Home" parent="Theme.Settings.HomeBase"> <style name="Theme.Settings.Home" parent="Theme.Settings.HomeBase">

2
tests/robotests/res/values/themes.xml
View File

@@ -15,6 +15,8 @@
<item name="colorAccent">#ffffff</item> <item name="colorAccent">#ffffff</item>
<item name="preferenceTheme">@style/PreferenceTheme</item> <item name="preferenceTheme">@style/PreferenceTheme</item>
<item name="android:windowLightStatusBar">true</item> <item name="android:windowLightStatusBar">true</item>
<!-- Define this color for material design -->
<item name="colorPrimaryVariant">@android:color/white</item>
</style> </style>
<style name="ThemeOverlay.SwitchBar.Settings" parent="@android:style/ThemeOverlay.Material.ActionBar"> <style name="ThemeOverlay.SwitchBar.Settings" parent="@android:style/ThemeOverlay.Material.ActionBar">

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

@@ -58,7 +58,7 @@ public class ConditionContextualCardRendererTest {
final ActivityController<Activity> activityController = Robolectric.buildActivity( final ActivityController<Activity> activityController = Robolectric.buildActivity(
Activity.class); Activity.class);
mActivity = activityController.get(); mActivity = activityController.get();
mActivity.setTheme(R.style.Theme_AppCompat); mActivity.setTheme(R.style.Theme_Settings_Home);
activityController.create(); activityController.create();
mRenderer = new ConditionContextualCardRenderer(mActivity, mControllerRendererPool); mRenderer = new ConditionContextualCardRenderer(mActivity, mControllerRendererPool);
} }

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

@@ -60,7 +60,7 @@ public class ConditionHeaderContextualCardRendererTest {
final ActivityController<Activity> activityController = Robolectric.buildActivity( final ActivityController<Activity> activityController = Robolectric.buildActivity(
Activity.class); Activity.class);
mActivity = activityController.get(); mActivity = activityController.get();
mActivity.setTheme(R.style.Theme_AppCompat); mActivity.setTheme(R.style.Theme_Settings_Home);
activityController.create(); activityController.create();
mRenderer = new ConditionHeaderContextualCardRenderer(mActivity, mControllerRendererPool); mRenderer = new ConditionHeaderContextualCardRenderer(mActivity, mControllerRendererPool);
} }

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

@@ -59,7 +59,7 @@ public class LegacySuggestionContextualCardRendererTest {
final ActivityController<Activity> activityController = Robolectric.buildActivity( final ActivityController<Activity> activityController = Robolectric.buildActivity(
Activity.class); Activity.class);
mActivity = activityController.get(); mActivity = activityController.get();
mActivity.setTheme(R.style.Theme_AppCompat); mActivity.setTheme(R.style.Theme_Settings_Home);
activityController.create(); activityController.create();
mRenderer = new LegacySuggestionContextualCardRenderer(mActivity, mControllerRendererPool); mRenderer = new LegacySuggestionContextualCardRenderer(mActivity, mControllerRendererPool);

2
tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java
View File

@@ -66,7 +66,7 @@ public class SliceContextualCardRendererTest {
final ActivityController<Activity> activityController = Robolectric.buildActivity( final ActivityController<Activity> activityController = Robolectric.buildActivity(
Activity.class); Activity.class);
mActivity = activityController.get(); mActivity = activityController.get();
mActivity.setTheme(R.style.Theme_AppCompat); mActivity.setTheme(R.style.Theme_Settings_Home);
activityController.create(); activityController.create();
mLifecycleOwner = new ContextualCardsFragment(); mLifecycleOwner = new ContextualCardsFragment();
mRenderer = new SliceContextualCardRenderer(mActivity, mLifecycleOwner, mRenderer = new SliceContextualCardRenderer(mActivity, mLifecycleOwner,