Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a7168a1 authored by YK Hung's avatar YK Hung Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ie2f3751d89e77aecc9a5e799127ea8c8d1478430
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d36c2f7c 0bad7288

src/com/android/settings/applications/manageapplications/ManageApplications.java

+9 −7
Original line number Diff line number Diff line
@@ -920,6 +920,7 @@ public class ManageApplications extends InstrumentedFragment 


    /**

     * 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 args   the args that includes a class name of app list

     */
@@ -1194,11 +1195,11 @@ public class ManageApplications extends InstrumentedFragment 
                } else {

                    rebuild(R.id.sort_order_alpha, true);

                }

                return;

            } else if (mManageApplications.mListType == LIST_TYPE_BATTERY_OPTIMIZATION) {

                logAppBatteryUsage(filterType);

            } else {

                rebuild();

            }

            rebuild();

        }



        public void resume(int sort) {
@@ -1558,6 +1559,7 @@ public class ManageApplications extends InstrumentedFragment 


        /**

         * Check item in the list shall enable or disable.

         *

         * @param position The item position in the list

         */

        public boolean isEnabled(int position) {