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

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

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

Change-Id: Id51b7e30b1e1351749afe018df8740a035bc4a25
This commit is contained in:
Tiffany Nguyen
2021-04-20 05:14:09 +00:00
committed by Automerger Merge Worker
parent a56a887c79 560234a88a
commit aeb03a3246
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,8 @@
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.
*/ */
@@ -24,6 +26,6 @@ public interface BatterySettingsFeatureProvider {
/** /**
* Get replacement activity for a given activity or fragment path. * Get replacement activity for a given activity or fragment path.
*/ */
String getReplacingActivityName(String originalActivity); ComponentName getReplacingActivity(ComponentName originalActivity);
} }

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

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