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

Merge original AOSP chart into battery usage with runtime switchable am: 33115020ba

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

Change-Id: I2f8b577b5ace58923ae1acbb697cb1b51b0c874c
This commit is contained in:
ykhung
2021-04-18 16:22:04 +00:00
committed by Automerger Merge Worker
parent f7c618d07e 33115020ba
commit b3c7bb02c4
4 changed files with 227 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
View File

@@ -21,6 +21,7 @@ import android.os.BatteryUsageStats;
import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
@@ -29,6 +30,7 @@ import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.UsageView;
/**
* Custom preference for displaying the battery level as chart graph.
@@ -36,24 +38,45 @@ import com.android.settings.overlay.FeatureFactory;
public class BatteryHistoryPreference extends Preference {
private static final String TAG = "BatteryHistoryPreference";
@VisibleForTesting
BatteryInfo mBatteryInfo;
@VisibleForTesting boolean mHideSummary;
@VisibleForTesting BatteryInfo mBatteryInfo;
private boolean mIsChartGraphEnabled;
private TextView mSummaryView;
private CharSequence mSummaryContent;
private BatteryChartView mBatteryChartView;
private BatteryChartPreferenceController mChartPreferenceController;
public BatteryHistoryPreference(Context context, AttributeSet attrs) {
super(context, attrs);
final boolean isChartGraphEnabled =
mIsChartGraphEnabled =
FeatureFactory.getFactory(context).getPowerUsageFeatureProvider(context)
.isChartGraphEnabled(context);
Log.i(TAG, "isChartGraphEnabled: " + isChartGraphEnabled);
if (isChartGraphEnabled) {
setLayoutResource(R.layout.battery_chart_graph);
}
Log.i(TAG, "isChartGraphEnabled: " + mIsChartGraphEnabled);
setLayoutResource(
mIsChartGraphEnabled
? R.layout.battery_chart_graph
: R.layout.battery_usage_graph);
setSelectable(false);
}
public void setBottomSummary(CharSequence text) {
mSummaryContent = text;
if (mSummaryView != null) {
mSummaryView.setVisibility(View.VISIBLE);
mSummaryView.setText(mSummaryContent);
}
mHideSummary = false;
}
public void hideBottomSummary() {
if (mSummaryView != null) {
mSummaryView.setVisibility(View.GONE);
}
mHideSummary = true;
}
void setBatteryUsageStats(@NonNull BatteryUsageStats batteryUsageStats) {
BatteryInfo.getBatteryInfo(getContext(), info -> {
mBatteryInfo = info;
@@ -75,9 +98,24 @@ public class BatteryHistoryPreference extends Preference {
if (mBatteryInfo == null) {
return;
}
mBatteryChartView = (BatteryChartView) view.findViewById(R.id.battery_chart);
if (mChartPreferenceController != null) {
mChartPreferenceController.setBatteryChartView(mBatteryChartView);
if (mIsChartGraphEnabled) {
mBatteryChartView = (BatteryChartView) view.findViewById(R.id.battery_chart);
if (mChartPreferenceController != null) {
mChartPreferenceController.setBatteryChartView(mBatteryChartView);
}
} else {
final TextView chargeView = (TextView) view.findViewById(R.id.charge);
chargeView.setText(mBatteryInfo.batteryPercentString);
mSummaryView = (TextView) view.findViewById(R.id.bottom_summary);
if (mSummaryContent != null) {
mSummaryView.setText(mSummaryContent);
}
if (mHideSummary) {
mSummaryView.setVisibility(View.GONE);
}
final UsageView usageView = (UsageView) view.findViewById(R.id.battery_usage);
usageView.findViewById(R.id.label_group).setAlpha(.7f);
mBatteryInfo.bindHistory(usageView);
}
BatteryUtils.logRuntime(TAG, "onBindViewHolder", startTime);
}

26
src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
View File

@@ -17,6 +17,8 @@ import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpd
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.BatteryManager;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
@@ -63,13 +65,14 @@ public class PowerUsageAdvanced extends PowerUsageBase {
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
refreshFeatureFlag(getContext());
final Context context = getContext();
refreshFeatureFlag(context);
mHistPref = (BatteryHistoryPreference) findPreference(KEY_BATTERY_GRAPH);
// Removes chart graph preference if the chart design is disabled.
if (!mIsChartGraphEnabled) {
removePreference(KEY_BATTERY_GRAPH);
if (mIsChartGraphEnabled) {
setBatteryChartPreferenceController();
} else {
updateHistPrefSummary(context);
}
setBatteryChartPreferenceController();
}
@Override
@@ -128,6 +131,7 @@ public class PowerUsageAdvanced extends PowerUsageBase {
}
updatePreference(mHistPref);
if (mBatteryAppListPreferenceController != null && mBatteryUsageStats != null) {
updateHistPrefSummary(context);
mBatteryAppListPreferenceController.refreshAppListGroup(
mBatteryUsageStats, /* showAllApps */true);
}
@@ -149,6 +153,18 @@ public class PowerUsageAdvanced extends PowerUsageBase {
}
}
private void updateHistPrefSummary(Context context) {
final Intent batteryIntent =
context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
final boolean plugged = batteryIntent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) != 0;
if (mPowerUsageFeatureProvider.isEnhancedBatteryPredictionEnabled(context) && !plugged) {
mHistPref.setBottomSummary(
mPowerUsageFeatureProvider.getAdvancedUsageScreenInfoString());
} else {
mHistPref.hideBottomSummary();
}
}
private void refreshFeatureFlag(Context context) {
if (mPowerUsageFeatureProvider == null) {
mPowerUsageFeatureProvider = FeatureFactory.getFactory(context)