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

Merge "Fix bridged app list saved scroll state" into nyc-dev

Browse Source 
am: a9537a5

* commit 'a9537a57d59a1b79b999655494af713048f051e9':
  Fix bridged app list saved scroll state

Change-Id: Ia28306bc196abd0764bde0e40c4dd928a5d2aafa
This commit is contained in:
Jason Monk
2016-03-30 17:44:07 +00:00
committed by android-build-merger
parent b69a359f49 a9537a57d5
commit df22fc52a2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,6 +106,7 @@ public class ManageApplications extends InstrumentedFragment
private static final String EXTRA_SORT_ORDER = "sortOrder"; private static final String EXTRA_SORT_ORDER = "sortOrder";
private static final String EXTRA_SHOW_SYSTEM = "showSystem"; private static final String EXTRA_SHOW_SYSTEM = "showSystem";
private static final String EXTRA_HAS_ENTRIES = "hasEntries"; private static final String EXTRA_HAS_ENTRIES = "hasEntries";
private static final String EXTRA_HAS_BRIDGE = "hasBridge";
// attributes used as keys when passing values to InstalledAppDetails activity // attributes used as keys when passing values to InstalledAppDetails activity
public static final String APP_CHG = "chg"; public static final String APP_CHG = "chg";
@@ -314,6 +315,8 @@ public class ManageApplications extends InstrumentedFragment
if (savedInstanceState != null) { if (savedInstanceState != null) {
mApplications.mHasReceivedLoadEntries = mApplications.mHasReceivedLoadEntries =
savedInstanceState.getBoolean(EXTRA_HAS_ENTRIES, false); savedInstanceState.getBoolean(EXTRA_HAS_ENTRIES, false);
mApplications.mHasReceivedBridgeCallback =
savedInstanceState.getBoolean(EXTRA_HAS_BRIDGE, false);
} }
mListView.setAdapter(mApplications); mListView.setAdapter(mApplications);
mListView.setRecyclerListener(mApplications); mListView.setRecyclerListener(mApplications);
@@ -447,6 +450,7 @@ public class ManageApplications extends InstrumentedFragment
outState.putInt(EXTRA_SORT_ORDER, mSortOrder); outState.putInt(EXTRA_SORT_ORDER, mSortOrder);
outState.putBoolean(EXTRA_SHOW_SYSTEM, mShowSystem); outState.putBoolean(EXTRA_SHOW_SYSTEM, mShowSystem);
outState.putBoolean(EXTRA_HAS_ENTRIES, mApplications.mHasReceivedLoadEntries); outState.putBoolean(EXTRA_HAS_ENTRIES, mApplications.mHasReceivedLoadEntries);
outState.putBoolean(EXTRA_HAS_BRIDGE, mApplications.mHasReceivedBridgeCallback);
} }
@Override @Override
@@ -822,7 +826,7 @@ public class ManageApplications extends InstrumentedFragment
if (mExtraInfoBridge != null) { if (mExtraInfoBridge != null) {
mExtraInfoBridge.resume(); mExtraInfoBridge.resume();
} }
rebuild(true); rebuild(false);
} else { } else {
rebuild(sort); rebuild(sort);
} }
@@ -855,7 +859,7 @@ public class ManageApplications extends InstrumentedFragment
public void rebuild(boolean eraseold) { public void rebuild(boolean eraseold) {
if (!mHasReceivedLoadEntries if (!mHasReceivedLoadEntries
&& (mExtraInfoBridge == null || mHasReceivedBridgeCallback)) { || (mExtraInfoBridge != null && !mHasReceivedBridgeCallback)) {
// Don't rebuild the list until all the app entries are loaded. // Don't rebuild the list until all the app entries are loaded.
return; return;
} }