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

Merge "Update App battery usage page and add tests." into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-09-16 07:52:30 +00:00
committed by Android (Google) Code Review
parent f9886847e8 99d3b54a70
commit 50c7cb834e
3 changed files with 100 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/applications/AppStateAppBatteryUsageBridge.java
View File

@@ -22,6 +22,7 @@ import android.content.Context;
import android.os.Build;
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.AppFilter;
@@ -37,14 +38,21 @@ public class AppStateAppBatteryUsageBridge extends AppStateBaseBridge {
private static final String TAG = AppStateAppBatteryUsageBridge.class.getSimpleName();
static final boolean DEBUG = Build.IS_DEBUGGABLE;
private final Context mContext;
private final AppOpsManager mAppOpsManager;
private final PowerAllowlistBackend mPowerAllowlistBackend;
@VisibleForTesting
Context mContext;
@VisibleForTesting
AppOpsManager mAppOpsManager;
@VisibleForTesting
PowerAllowlistBackend mPowerAllowlistBackend;
private static final int MODE_UNKNOWN = 0;
private static final int MODE_UNRESTRICTED = 1;
private static final int MODE_OPTIMIZED = 2;
private static final int MODE_RESTRICTED = 3;
@VisibleForTesting
static final int MODE_UNKNOWN = 0;
@VisibleForTesting
static final int MODE_UNRESTRICTED = 1;
@VisibleForTesting
static final int MODE_OPTIMIZED = 2;
@VisibleForTesting
static final int MODE_RESTRICTED = 3;
@IntDef(
prefix = {"MODE_"},
@@ -110,8 +118,9 @@ public class AppStateAppBatteryUsageBridge extends AppStateBaseBridge {
return new AppBatteryUsageDetails(mode);
}
@VisibleForTesting
@OptimizationMode
private static int getAppBatteryUsageDetailsMode(AppEntry entry) {
static int getAppBatteryUsageDetailsMode(AppEntry entry) {
if (entry == null || entry.extraInfo == null) {
return MODE_UNKNOWN;
}

7
src/com/android/settings/applications/manageapplications/ManageApplications.java
View File

@@ -1196,9 +1196,12 @@ public class ManageApplications extends InstrumentedFragment
rebuild(R.id.sort_order_alpha, true);
}
return;
} else if (mManageApplications.mListType == LIST_TYPE_BATTERY_OPTIMIZATION) {
}
if (mManageApplications.mListType == LIST_TYPE_BATTERY_OPTIMIZATION) {
logAppBatteryUsage(filterType);
}
rebuild();
}
@@ -1673,7 +1676,7 @@ public class ManageApplications extends InstrumentedFragment
holder.setSummary(AppLocaleDetails.getSummary(mContext, entry));
break;
case LIST_TYPE_BATTERY_OPTIMIZATION:
holder.setSummary(R.string.app_battery_usage_summary);
holder.setSummary(null);
break;
default:
holder.updateSizeText(entry, mManageApplications.mInvalidSizeStr, mWhichSize);