From b33d03b7418a1ab8a8aa8376d37035471e2d699b Mon Sep 17 00:00:00 2001 From: Tiffany Nguyen Date: Wed, 14 Apr 2021 09:58:26 +0000 Subject: [PATCH] Revert "Update BatterySettingsFeatureProvider to an activity-friendly interface." This reverts commit f2e33df51ceccd55f5b1b197317321746a89e5ad. Reason for revert: reverting to include multiple repos (learning something new every day!) Change-Id: I0909a17f82d18233b20200edcb6011d6fad81fa6 --- .../settings/fuelgauge/BatterySettingsFeatureProvider.java | 4 +--- .../fuelgauge/BatterySettingsFeatureProviderImpl.java | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java b/src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java index 64392226ff2..11f28b7895e 100644 --- a/src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java +++ b/src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java @@ -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); } diff --git a/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java index f55d7f32529..218d0969560 100644 --- a/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java +++ b/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java @@ -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; } }