Merge "Redirect battery-level settings preference clicks if needed" into sc-dev am: df8537269f

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

Change-Id: I2ef953d6b3bb696105109e0ba38003f9c739540f
This commit is contained in:
Tiffany Nguyen
2021-05-14 02:38:48 +00:00
committed by Automerger Merge Worker
2 changed files with 161 additions and 2 deletions

View File

@@ -16,7 +16,9 @@
package com.android.settings.fuelgauge;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
@@ -29,6 +31,8 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
import java.util.HashMap;
public class TopLevelBatteryPreferenceController extends BasePreferenceController implements
LifecycleObserver, OnStart, OnStop, BatteryPreferenceController {
@@ -37,9 +41,13 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle
private final BatteryBroadcastReceiver mBatteryBroadcastReceiver;
private Preference mPreference;
private BatteryInfo mBatteryInfo;
private BatterySettingsFeatureProvider mBatterySettingsFeatureProvider;
private BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
private String mBatteryStatusLabel;
@VisibleForTesting
protected static HashMap<String, ComponentName> sReplacingActivityMap = new HashMap<>();
public TopLevelBatteryPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
mBatteryBroadcastReceiver = new BatteryBroadcastReceiver(mContext);
@@ -53,6 +61,8 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle
}, true /* shortString */);
});
mBatterySettingsFeatureProvider = FeatureFactory.getFactory(context)
.getBatterySettingsFeatureProvider(context);
mBatteryStatusFeatureProvider = FeatureFactory.getFactory(context)
.getBatteryStatusFeatureProvider(context);
}
@@ -69,6 +79,37 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle
mPreference = screen.findPreference(getPreferenceKey());
}
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
String prefFrag = preference.getFragment();
if (prefFrag == null || prefFrag.isEmpty()) {
// Not a redirect, so use the default.
return super.handlePreferenceTreeClick(preference);
}
ComponentName currentFragmentName = convertClassPathToComponentName(prefFrag);
if (currentFragmentName == null) {
return super.handlePreferenceTreeClick(preference);
}
ComponentName replacingActivity;
if (sReplacingActivityMap.containsKey(prefFrag)) {
replacingActivity = sReplacingActivityMap.get(prefFrag);
} else {
replacingActivity = mBatterySettingsFeatureProvider.getReplacingActivity(
currentFragmentName);
sReplacingActivityMap.put(prefFrag, replacingActivity);
}
if (replacingActivity == null || currentFragmentName.compareTo(replacingActivity) == 0) {
return super.handlePreferenceTreeClick(preference);
}
Intent intent = new Intent();
intent.setComponent(currentFragmentName);
mContext.startActivity(intent);
return true;
}
@Override
public void onStart() {
mBatteryBroadcastReceiver.register();
@@ -133,4 +174,19 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle
}
}
}
@VisibleForTesting
protected static ComponentName convertClassPathToComponentName(String classPath) {
if (classPath == null || classPath.isEmpty()) {
return null;
}
String[] split = classPath.split("\\.");
int classNameIndex = split.length - 1;
if (classNameIndex < 0) {
return null;
}
int lastPkgIndex = classPath.length() - split[classNameIndex].length() - 1;
String pkgName = lastPkgIndex > 0 ? classPath.substring(0, lastPkgIndex) : "";
return new ComponentName(pkgName, split[classNameIndex]);
}
}