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

Retain the selected filter even after the device orientation change.

Browse Source 
The selected filter should be retained displaying the list even after the device orientation change.
Bug: 36380176
Test: atest packages/apps/Settings/tests/uitests/src/com/android/settings/ui/AppsSettingsRetainFilterTests.java

Change-Id: I7830b525343ce597929771ad4db55a803f893432
This commit is contained in:
Yvan Hsueh
2018-03-27 17:37:15 +08:00
committed by Allen Su
parent d3c75d8e37
commit 2f81209d0f
2 changed files with 137 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,6 +155,7 @@ public class ManageApplications extends InstrumentedFragment
private static final String EXTRA_SHOW_SYSTEM = "showSystem";
private static final String EXTRA_HAS_ENTRIES = "hasEntries";
private static final String EXTRA_HAS_BRIDGE = "hasBridge";
private static final String EXTRA_FILTER_TYPE = "filterType";
// attributes used as keys when passing values to AppInfoDashboardFragment activity
public static final String APP_CHG = "chg";
@@ -231,6 +232,7 @@ public class ManageApplications extends InstrumentedFragment
private boolean mIsWorkOnly;
private int mWorkUserId;
private View mEmptyView;
private int mFilterType;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -311,6 +313,8 @@ public class ManageApplications extends InstrumentedFragment
if (savedInstanceState != null) {
mSortOrder = savedInstanceState.getInt(EXTRA_SORT_ORDER, mSortOrder);
mShowSystem = savedInstanceState.getBoolean(EXTRA_SHOW_SYSTEM, mShowSystem);
mFilterType =
savedInstanceState.getInt(EXTRA_FILTER_TYPE, AppFilterRegistry.FILTER_APPS_ALL);
}
mInvalidSizeStr = activity.getText(R.string.invalid_size_value);
@@ -493,6 +497,7 @@ public class ManageApplications extends InstrumentedFragment
outState.putBoolean(EXTRA_SHOW_SYSTEM, mShowSystem);
outState.putBoolean(EXTRA_HAS_ENTRIES, mApplications.mHasReceivedLoadEntries);
outState.putBoolean(EXTRA_HAS_BRIDGE, mApplications.mHasReceivedBridgeCallback);
outState.putInt(EXTRA_FILTER_TYPE, mFilter.getFilterType());
if (mApplications != null) {
mApplications.onSaveInstanceState(outState);
}
@@ -789,6 +794,16 @@ public class ManageApplications extends InstrumentedFragment
mManageApplications.mFilterSpinner.setSelection(0);
mManageApplications.onItemSelected(null, null, 0, 0);
}
if (mFilterOptions.size() > 1) {
if (filterType == mManageApplications.mFilterType) {
int index = mFilterOptions.indexOf(filter);
if (index != -1) {
mManageApplications.mFilterSpinner.setSelection(index);
mManageApplications.onItemSelected(null, null, index, 0);
mManageApplications.mFilterType = AppFilterRegistry.FILTER_APPS_ALL;
}
}
}
}
public void disableFilter(@AppFilterRegistry.FilterType int filterType) {