Merge "Add smart battery page for battery settings"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bf241d3..8c1ab56 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -90,6 +90,7 @@
<uses-permission android:name="android.permission.READ_PRINT_SERVICES" />
<uses-permission android:name="android.permission.NETWORK_SETTINGS" />
<uses-permission android:name="android.permission.TEST_BLACKLISTED_PASSWORD" />
+ <uses-permission android:name="android.permission.USE_RESERVED_DISK" />
<application android:label="@string/settings_label"
android:icon="@drawable/ic_launcher_settings"
diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java
index 7a0cd27..acd8144 100644
--- a/src/com/android/settings/fuelgauge/BatteryInfo.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -170,11 +170,12 @@
if (discharging && provider != null
&& provider.isEnhancedBatteryPredictionEnabled(context)) {
- final long prediction = provider.getEnhancedBatteryPrediction(context);
+ Estimate estimate = provider.getEnhancedBatteryPrediction(context);
BatteryUtils.logRuntime(LOG_TAG, "time for enhanced BatteryInfo", startTime);
return BatteryInfo.getBatteryInfo(context, batteryBroadcast, stats,
- elapsedRealtimeUs, shortString, BatteryUtils.convertMsToUs(prediction),
- true);
+ elapsedRealtimeUs, shortString,
+ BatteryUtils.convertMsToUs(estimate.estimateMillis),
+ estimate.isBasedOnUsage);
} else {
long prediction = discharging
? stats.computeBatteryTimeRemaining(elapsedRealtimeUs) : 0;
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index c623396..68677fa 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -21,8 +21,6 @@
import android.content.IntentFilter;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.net.Uri;
import android.os.BatteryManager;
import android.os.BatteryStats;
import android.os.Bundle;
@@ -410,19 +408,19 @@
final boolean discharging = batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1)
== 0;
// Get enhanced prediction if available and discharging, otherwise use the old code
- Cursor cursor = null;
+ Estimate estimate = null;
if (discharging && mPowerUsageFeatureProvider != null &&
mPowerUsageFeatureProvider.isEnhancedBatteryPredictionEnabled(mContext)) {
- final Uri queryUri = mPowerUsageFeatureProvider.getEnhancedBatteryPredictionUri();
- cursor = mContext.getContentResolver().query(queryUri, null, null, null, null);
+ estimate = mPowerUsageFeatureProvider.getEnhancedBatteryPrediction(mContext);
}
final BatteryStats stats = statsHelper.getStats();
BatteryUtils.logRuntime(tag, "BatteryInfoLoader post query", startTime);
- if (cursor != null && cursor.moveToFirst()) {
- long enhancedEstimate = mPowerUsageFeatureProvider.getTimeRemainingEstimate(cursor);
+
+ if (estimate != null) {
batteryInfo = BatteryInfo.getBatteryInfo(mContext, batteryBroadcast, stats,
elapsedRealtimeUs, false /* shortString */,
- BatteryUtils.convertMsToUs(enhancedEstimate), true /* basedOnUsage */);
+ BatteryUtils.convertMsToUs(estimate.estimateMillis),
+ estimate.isBasedOnUsage);
} else {
batteryInfo = BatteryInfo.getBatteryInfo(mContext, batteryBroadcast, stats,
elapsedRealtimeUs, false /* shortString */,
diff --git a/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java b/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java
index 19aa639..a080e2b 100644
--- a/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java
+++ b/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java
@@ -54,14 +54,15 @@
BatteryInfo oldinfo = BatteryInfo.getBatteryInfoOld(getContext(), batteryBroadcast,
stats, elapsedRealtimeUs, false);
- final long timeRemainingEnhanced = BatteryUtils.convertMsToUs(
- powerUsageFeatureProvider.getEnhancedBatteryPrediction(getContext()));
- BatteryInfo newinfo = BatteryInfo.getBatteryInfo(getContext(), batteryBroadcast, stats,
- elapsedRealtimeUs, false, timeRemainingEnhanced, true);
+ Estimate estimate = powerUsageFeatureProvider.getEnhancedBatteryPrediction(context);
+ BatteryInfo newInfo = BatteryInfo.getBatteryInfo(getContext(), batteryBroadcast, stats,
+ elapsedRealtimeUs, false,
+ BatteryUtils.convertMsToUs(estimate.estimateMillis),
+ estimate.isBasedOnUsage);
List<BatteryInfo> infos = new ArrayList<>();
infos.add(oldinfo);
- infos.add(newinfo);
+ infos.add(newInfo);
return infos;
}
}
diff --git a/src/com/android/settings/fuelgauge/Estimate.java b/src/com/android/settings/fuelgauge/Estimate.java
new file mode 100644
index 0000000..541678c
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/Estimate.java
@@ -0,0 +1,12 @@
+package com.android.settings.fuelgauge;
+
+public class Estimate {
+
+ public final long estimateMillis;
+ public final boolean isBasedOnUsage;
+
+ public Estimate(long estimateMillis, boolean isBasedOnUsage) {
+ this.estimateMillis = estimateMillis;
+ this.isBasedOnUsage = isBasedOnUsage;
+ }
+}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
index 1fb02c4..67bdada 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
@@ -18,8 +18,6 @@
import android.content.Context;
import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
import android.util.SparseIntArray;
import com.android.internal.os.BatterySipper;
@@ -28,6 +26,7 @@
* Feature Provider used in power usage
*/
public interface PowerUsageFeatureProvider {
+
/**
* Check whether location setting is enabled
*/
@@ -66,7 +65,7 @@
/**
* Returns an improved prediction for battery time remaining.
*/
- long getEnhancedBatteryPrediction(Context context);
+ Estimate getEnhancedBatteryPrediction(Context context);
/**
* Returns an improved projection curve for future battery level.
@@ -80,16 +79,6 @@
boolean isEnhancedBatteryPredictionEnabled(Context context);
/**
- * Returns the Uri used to query for an enhanced battery prediction from a cursor loader.
- */
- Uri getEnhancedBatteryPredictionUri();
-
- /**
- * Returns the the estimate in the cursor as a long or -1 if the cursor is null
- */
- long getTimeRemainingEstimate(Cursor cursor);
-
- /**
* Checks whether debugging should be enabled for battery estimates.
* @return
*/
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
index cda4d3d..3d99386 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
@@ -21,7 +21,6 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
-import android.database.Cursor;
import android.net.Uri;
import android.os.Process;
import android.util.FeatureFlagUtils;
@@ -95,8 +94,8 @@
}
@Override
- public long getEnhancedBatteryPrediction(Context context) {
- return -1;
+ public Estimate getEnhancedBatteryPrediction(Context context) {
+ return null;
}
@Override
@@ -110,16 +109,6 @@
}
@Override
- public Uri getEnhancedBatteryPredictionUri() {
- return null;
- }
-
- @Override
- public long getTimeRemainingEstimate(Cursor cursor) {
- return 0;
- }
-
- @Override
public String getEnhancedEstimateDebugString(String timeRemaining) {
return null;
}
diff --git a/src/com/android/settings/notification/AbstractZenModePreferenceController.java b/src/com/android/settings/notification/AbstractZenModePreferenceController.java
index 33c027c..81ceca1 100644
--- a/src/com/android/settings/notification/AbstractZenModePreferenceController.java
+++ b/src/com/android/settings/notification/AbstractZenModePreferenceController.java
@@ -31,7 +31,6 @@
import android.service.notification.ZenModeConfig;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import android.util.Slog;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.core.PreferenceControllerMixin;
@@ -54,6 +53,7 @@
final private NotificationManager mNotificationManager;
protected static ZenModeConfigWrapper mZenModeConfigWrapper;
protected MetricsFeatureProvider mMetricsFeatureProvider;
+ protected final ZenModeBackend mBackend;
public AbstractZenModePreferenceController(Context context, String key,
Lifecycle lifecycle) {
@@ -68,6 +68,7 @@
final FeatureFactory featureFactory = FeatureFactory.getFactory(mContext);
mMetricsFeatureProvider = featureFactory.getMetricsFeatureProvider();
+ mBackend = ZenModeBackend.getInstance(context);
}
@Override
@@ -90,6 +91,14 @@
}
}
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+
+ mBackend.updatePolicy();
+ mBackend.updateZenMode();
+ }
+
protected NotificationManager.Policy getPolicy() {
return mNotificationManager.getNotificationPolicy();
}
@@ -99,8 +108,8 @@
}
protected int getZenMode() {
- return Settings.Global.getInt(mContext.getContentResolver(),
- Settings.Global.ZEN_MODE, 0);
+ return Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.ZEN_MODE,
+ mBackend.mZenMode);
}
class SettingObserver extends ContentObserver {
@@ -188,7 +197,6 @@
}
}
-
return endTimeMs;
}
diff --git a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java b/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java
index a15f7fc..af59107 100644
--- a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java
@@ -30,11 +30,9 @@
AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener {
protected static final String KEY = "zen_mode_alarms";
- private final ZenModeBackend mBackend;
public ZenModeAlarmsPreferenceController(Context context, Lifecycle lifecycle) {
super(context, KEY, lifecycle);
- mBackend = ZenModeBackend.getInstance(context);
}
@Override
diff --git a/src/com/android/settings/notification/ZenModeBackend.java b/src/com/android/settings/notification/ZenModeBackend.java
index 945da0b..6cee28e 100644
--- a/src/com/android/settings/notification/ZenModeBackend.java
+++ b/src/com/android/settings/notification/ZenModeBackend.java
@@ -82,7 +82,6 @@
mZenMode = zenMode;
}
- /** gets last zen mode set by setZenMode or updateZenMode **/
protected int getZenMode() {
mZenMode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.ZEN_MODE, mZenMode);
diff --git a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java b/src/com/android/settings/notification/ZenModeButtonPreferenceController.java
index 1886dab..f5169f0 100644
--- a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeButtonPreferenceController.java
@@ -34,11 +34,9 @@
protected static final String KEY = "zen_mode_settings_button_container";
private Button mZenButtonOn;
private Button mZenButtonOff;
- private ZenModeBackend mBackend;
public ZenModeButtonPreferenceController(Context context, Lifecycle lifecycle) {
super(context, KEY, lifecycle);
- mBackend = ZenModeBackend.getInstance(context);
}
@Override
diff --git a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java
index d952c11..3e2f802 100644
--- a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java
@@ -26,11 +26,9 @@
public class ZenModeCallsPreferenceController extends AbstractZenModePreferenceController {
protected static final String KEY = "zen_mode_calls";
- private final ZenModeBackend mBackend;
public ZenModeCallsPreferenceController(Context context, Lifecycle lifecycle) {
super(context, KEY, lifecycle);
- mBackend = ZenModeBackend.getInstance(context);
}
@Override
diff --git a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java
index be5e6d6..4423494 100644
--- a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java
@@ -31,11 +31,9 @@
implements Preference.OnPreferenceChangeListener {
protected static final String KEY = "zen_mode_events";
- private final ZenModeBackend mBackend;
public ZenModeEventsPreferenceController(Context context, Lifecycle lifecycle) {
super(context, KEY, lifecycle);
- mBackend = ZenModeBackend.getInstance(context);
}
@Override
diff --git a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java
index dad6cf1..0ffc44d 100644
--- a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java
@@ -10,11 +10,9 @@
public class ZenModeMessagesPreferenceController extends AbstractZenModePreferenceController {
protected static final String KEY = "zen_mode_messages";
- private final ZenModeBackend mBackend;
public ZenModeMessagesPreferenceController(Context context, Lifecycle lifecycle) {
super(context, KEY, lifecycle);
- mBackend = ZenModeBackend.getInstance(context);
}
@Override
diff --git a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java
index 99a4f0d7..b6c2922 100644
--- a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java
@@ -30,11 +30,9 @@
implements Preference.OnPreferenceChangeListener {
protected static final String KEY = "zen_mode_reminders";
- private final ZenModeBackend mBackend;
public ZenModeRemindersPreferenceController(Context context, Lifecycle lifecycle) {
super(context, KEY, lifecycle);
- mBackend = ZenModeBackend.getInstance(context);
}
@Override
diff --git a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java
index 82fe865..d5c0a00 100644
--- a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java
@@ -30,11 +30,9 @@
implements Preference.OnPreferenceChangeListener {
protected static final String KEY = "zen_mode_repeat_callers";
- private final ZenModeBackend mBackend;
public ZenModeRepeatCallersPreferenceController(Context context, Lifecycle lifecycle) {
super(context, KEY, lifecycle);
- mBackend = ZenModeBackend.getInstance(context);
}
@Override
diff --git a/src/com/android/settings/notification/ZenModeScreenOffPreferenceController.java b/src/com/android/settings/notification/ZenModeScreenOffPreferenceController.java
index 0ba24c0..81c9b0d 100644
--- a/src/com/android/settings/notification/ZenModeScreenOffPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeScreenOffPreferenceController.java
@@ -29,11 +29,9 @@
AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener {
protected static final String KEY = "zen_mode_screen_off";
- private final ZenModeBackend mBackend;
public ZenModeScreenOffPreferenceController(Context context, Lifecycle lifecycle) {
super(context, KEY, lifecycle);
- mBackend = ZenModeBackend.getInstance(context);
}
@Override
diff --git a/src/com/android/settings/notification/ZenModeScreenOnPreferenceController.java b/src/com/android/settings/notification/ZenModeScreenOnPreferenceController.java
index bcb1af8..bab4dd1 100644
--- a/src/com/android/settings/notification/ZenModeScreenOnPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeScreenOnPreferenceController.java
@@ -29,11 +29,9 @@
AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener {
protected static final String KEY = "zen_mode_screen_on";
- private final ZenModeBackend mBackend;
public ZenModeScreenOnPreferenceController(Context context, Lifecycle lifecycle) {
super(context, KEY, lifecycle);
- mBackend = ZenModeBackend.getInstance(context);
}
@Override