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/PowerUsageFeatureProviderImpl.java

@@ -21,7 +21,6 @@ import static com.android.settings.core.FeatureFlags.BATTERY_SETTINGS_V2;
 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 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
     }
 
     @Override
-    public long getEnhancedBatteryPrediction(Context context) {
-        return -1;
+    public Estimate getEnhancedBatteryPrediction(Context context) {
+        return null;
     }
 
     @Override
@@ -109,16 +108,6 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
         return false;
     }
 
-    @Override
-    public Uri getEnhancedBatteryPredictionUri() {
-        return null;
-    }
-
-    @Override
-    public long getTimeRemainingEstimate(Cursor cursor) {
-        return 0;
-    }
-
     @Override
     public String getEnhancedEstimateDebugString(String timeRemaining) {
         return null;