From d90ad5224c909c199617af8abbf24495a1942c53 Mon Sep 17 00:00:00 2001 From: jackqdyulei Date: Tue, 16 Jan 2018 10:16:05 -0800 Subject: [PATCH] Disable lowBatteryTip and ReducedBatteryTip Change-Id: Ibc2e9f01396d6584764bb3deb8e2ebabdb2c1ffb Fixes: 71921003 Test: RunSettingsRoboTests --- src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java | 4 ++-- .../android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java | 4 ++-- .../fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java index ac5072d2b2..6af859b456 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java @@ -144,9 +144,9 @@ public class BatteryTipPolicy { highUsageEnabled = mParser.getBoolean(KEY_HIGH_USAGE_ENABLED, true); highUsageAppCount = mParser.getInt(KEY_HIGH_USAGE_APP_COUNT, 3); appRestrictionEnabled = mParser.getBoolean(KEY_APP_RESTRICTION_ENABLED, true); - reducedBatteryEnabled = mParser.getBoolean(KEY_REDUCED_BATTERY_ENABLED, true); + reducedBatteryEnabled = mParser.getBoolean(KEY_REDUCED_BATTERY_ENABLED, false); reducedBatteryPercent = mParser.getInt(KEY_REDUCED_BATTERY_PERCENT, 50); - lowBatteryEnabled = mParser.getBoolean(KEY_LOW_BATTERY_ENABLED, true); + lowBatteryEnabled = mParser.getBoolean(KEY_LOW_BATTERY_ENABLED, false); lowBatteryHour = mParser.getInt(KEY_LOW_BATTERY_HOUR, 16); } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java index 1198b270cf..bb9a37bd50 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java @@ -86,9 +86,9 @@ public class BatteryTipPolicyTest { assertThat(batteryTipPolicy.highUsageEnabled).isTrue(); assertThat(batteryTipPolicy.highUsageAppCount).isEqualTo(3); assertThat(batteryTipPolicy.appRestrictionEnabled).isTrue(); - assertThat(batteryTipPolicy.reducedBatteryEnabled).isTrue(); + assertThat(batteryTipPolicy.reducedBatteryEnabled).isFalse(); assertThat(batteryTipPolicy.reducedBatteryPercent).isEqualTo(50); - assertThat(batteryTipPolicy.lowBatteryEnabled).isTrue(); + assertThat(batteryTipPolicy.lowBatteryEnabled).isFalse(); assertThat(batteryTipPolicy.lowBatteryHour).isEqualTo(16); } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java index 4866a6a734..d953b7c8b0 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java @@ -52,6 +52,8 @@ public class LowBatteryDetectorTest { mContext = RuntimeEnvironment.application; mPolicy = spy(new BatteryTipPolicy(mContext)); + ReflectionHelpers.setField(mPolicy, "lowBatteryEnabled", true); + mLowBatteryDetector = new LowBatteryDetector(mPolicy, mBatteryInfo); } -- 2.11.0