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

Merge changes from topic "app_battery_usage" into tm-qpr-dev am: 0bad72889e

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

Change-Id: Ie2f3751d89e77aecc9a5e799127ea8c8d1478430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
YK Hung
2022-09-05 04:04:22 +00:00
committed by Automerger Merge Worker
parent d36c2f7cba 0bad72889e
commit 1a7168a114
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -920,6 +920,7 @@ public class ManageApplications extends InstrumentedFragment
/** /**
* Returns a resource ID of title based on what type of app list is * Returns a resource ID of title based on what type of app list is
*
* @param intent the intent of the activity that might include a specified title * @param intent the intent of the activity that might include a specified title
* @param args the args that includes a class name of app list * @param args the args that includes a class name of app list
*/ */
@@ -1194,11 +1195,11 @@ public class ManageApplications extends InstrumentedFragment
} else { } else {
rebuild(R.id.sort_order_alpha, true); rebuild(R.id.sort_order_alpha, true);
} }
return;
} else if (mManageApplications.mListType == LIST_TYPE_BATTERY_OPTIMIZATION) { } else if (mManageApplications.mListType == LIST_TYPE_BATTERY_OPTIMIZATION) {
logAppBatteryUsage(filterType); logAppBatteryUsage(filterType);
} else {
rebuild();
} }
rebuild();
} }
public void resume(int sort) { public void resume(int sort) {
@@ -1333,7 +1334,7 @@ public class ManageApplications extends InstrumentedFragment
} }
private void logAppBatteryUsage(int filterType) { private void logAppBatteryUsage(int filterType) {
switch(filterType) { switch (filterType) {
case FILTER_APPS_BATTERY_UNRESTRICTED: case FILTER_APPS_BATTERY_UNRESTRICTED:
logAction(SettingsEnums.ACTION_BATTERY_OPTIMIZED_APPS_FILTER_UNRESTRICTED); logAction(SettingsEnums.ACTION_BATTERY_OPTIMIZED_APPS_FILTER_UNRESTRICTED);
break; break;
@@ -1558,6 +1559,7 @@ public class ManageApplications extends InstrumentedFragment
/** /**
* Check item in the list shall enable or disable. * Check item in the list shall enable or disable.
*
* @param position The item position in the list * @param position The item position in the list
*/ */
public boolean isEnabled(int position) { public boolean isEnabled(int position) {