Improve messaging for enhanced notifications

The message displayed in battery settings will now more accurately
reflect when an estimate is enhanced based on our updated
definition of what that means.

Test: robotests
Bug: 64833846
Change-Id: Id635d78d8f56d10253e22df2705af93f2693db70

src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java

@@ -18,8 +18,6 @@ package com.android.settings.fuelgauge;
 
 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 @@ import com.android.internal.os.BatterySipper;
  * Feature Provider used in power usage
  */
 public interface PowerUsageFeatureProvider {
+
     /**
      * Check whether location setting is enabled
      */
@@ -66,7 +65,7 @@ public interface PowerUsageFeatureProvider {
     /**
      * 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.
@@ -79,16 +78,6 @@ public interface PowerUsageFeatureProvider {
      */
     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