Merge "Revert "Update BatterySettingsFeatureProvider to an activity-friendly interface."" into sc-dev

This commit is contained in:
Tiffany Nguyen
2021-04-14 09:59:41 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 5 deletions

View File

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

View File

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