Merge "Fix loading bug when switching filters."

This commit is contained in:
Tiffany Nguyen
2022-08-23 17:51:20 +00:00
committed by Android (Google) Code Review

View File

@@ -98,9 +98,9 @@ import com.android.settings.SettingsActivity;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.applications.AppInfoBase; import com.android.settings.applications.AppInfoBase;
import com.android.settings.applications.AppStateAlarmsAndRemindersBridge; import com.android.settings.applications.AppStateAlarmsAndRemindersBridge;
import com.android.settings.applications.AppStateAppBatteryUsageBridge;
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState; import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
import com.android.settings.applications.AppStateBaseBridge; import com.android.settings.applications.AppStateBaseBridge;
import com.android.settings.applications.AppStateAppBatteryUsageBridge;
import com.android.settings.applications.AppStateInstallAppsBridge; import com.android.settings.applications.AppStateInstallAppsBridge;
import com.android.settings.applications.AppStateLocaleBridge; import com.android.settings.applications.AppStateLocaleBridge;
import com.android.settings.applications.AppStateManageExternalStorageBridge; import com.android.settings.applications.AppStateManageExternalStorageBridge;
@@ -924,6 +924,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
*/ */
@@ -1198,11 +1199,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) {
@@ -1562,6 +1563,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) {