Merge changes from topic "app_battery_usage" into tm-qpr-dev am: 0bad72889e
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:
@@ -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) {
|
||||||
@@ -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) {
|
||||||
|
Reference in New Issue
Block a user