PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tiffany Nguyen
2021-04-14 09:59:41 +00:00
committed by Android (Google) Code Review
parent ceb78586ee b33d03b741
commit f9acbaf425
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java
View File

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

3
src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java
View File

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