Merge "Update BatterySettingsFeatureProvider to an activity-friendly interface." into sc-dev am: 560234a88a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14193839

Change-Id: Id51b7e30b1e1351749afe018df8740a035bc4a25

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

@@ -16,6 +16,8 @@
 
 package com.android.settings.fuelgauge;
 
+import android.content.ComponentName;
+
 /**
  * Feature provider for battery settings usage.
  */
@@ -24,6 +26,6 @@ public interface BatterySettingsFeatureProvider {
     /**
      * Get replacement activity for a given activity or fragment path.
      */
-    String getReplacingActivityName(String originalActivity);
+    ComponentName getReplacingActivity(ComponentName originalActivity);
 
 }

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

@@ -16,6 +16,7 @@
 
 package com.android.settings.fuelgauge;
 
+import android.content.ComponentName;
 import android.content.Context;
 
 /**
@@ -30,7 +31,7 @@ public class BatterySettingsFeatureProviderImpl implements BatterySettingsFeatur
     }
 
     @Override
-    public String getReplacingActivityName(String originalActivity) {
-        return null;
+    public ComponentName getReplacingActivity(ComponentName originalActivity) {
+        return originalActivity;
     }
 }