From b92e9d423974b3654d843df170a91058a3ad347e Mon Sep 17 00:00:00 2001 From: Raff Tsai Date: Tue, 13 Nov 2018 04:02:07 +0800 Subject: [PATCH] Add BatteryFix Slice Change-Id: I504df1e9caadced71cc37f8be9207ab9fd26f9ab Fixes: 114807643 Test: manual --- color-check-baseline.xml | 94 +++++--- res/values/themes.xml | 5 + .../fuelgauge/BatteryBroadcastReceiver.java | 3 +- .../SettingsContextualCardProvider.java | 8 + .../slices/BatteryFixSlice.java | 224 ++++++++++++++++++ .../settings/slices/CustomSliceManager.java | 10 +- .../accounts/AvatarViewMixinTest.java | 7 +- .../BatteryBroadcastReceiverTest.java | 22 ++ .../slices/BatteryFixSliceTest.java | 130 ++++++++++ 9 files changed, 468 insertions(+), 35 deletions(-) create mode 100644 src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java create mode 100644 tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java diff --git a/color-check-baseline.xml b/color-check-baseline.xml index cbfae2e6ac2..0ae001d4852 100644 --- a/color-check-baseline.xml +++ b/color-check-baseline.xml @@ -1,18 +1,6 @@ - - - - @@ -2569,7 +2557,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -2585,7 +2573,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -2601,7 +2589,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -2617,7 +2605,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -2633,7 +2621,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -2665,7 +2653,7 @@ errorLine2=" ^"> @@ -2681,7 +2669,7 @@ errorLine2=" ^"> @@ -2697,7 +2685,7 @@ errorLine2=" ^"> @@ -2761,7 +2749,7 @@ errorLine2=" ^"> @@ -2777,7 +2765,7 @@ errorLine2=" ^"> @@ -2793,7 +2781,7 @@ errorLine2=" ^"> @@ -2809,7 +2797,7 @@ errorLine2=" ^"> @@ -2825,7 +2813,7 @@ errorLine2=" ^"> @@ -2841,7 +2829,7 @@ errorLine2=" ^"> @@ -2857,7 +2845,7 @@ errorLine2=" ^"> @@ -2873,10 +2861,58 @@ errorLine2=" ^"> + + + + + + + + + + + + @*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent + + + @color/battery_good_color_light + @color/battery_maybe_color_light + @color/battery_bad_color_light