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 am: f9acbaf425

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

Change-Id: I20cda250c6b5b44b6901c93a04a65607bfc05ca3
This commit is contained in:
Tiffany Nguyen
2021-04-14 10:13:28 +00:00
committed by Automerger Merge Worker
parent 828ca94277 f9acbaf425
commit 54f957aad2
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;
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);
}

3
src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java
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;
}
}