Merge "Rebind recycler views if launcher activity restarted" into sc-dev (77c532d7) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/allapps/AllAppsContainerView.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -184,16 +184,19 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
		} catch (Exception e) {
		Log.e("AllAppsContainerView", "restoreInstanceState viewId = 0", e);
		}

		Bundle state = (Bundle) sparseArray.get(R.id.work_tab_state_id, null);
		if (state != null) {
		int currentPage = state.getInt(BUNDLE_KEY_CURRENT_PAGE, 0);
		if (currentPage != 0) {
		rebindAdapters(true);
		mViewPager.setCurrentPage(currentPage);
		}
		rebindAdapters(true);
		} else {
		mSearchUiManager.resetSearch();
		}
		}

		}

		@Override
		protected void dispatchSaveInstanceState(SparseArray<Parcelable> container) {

+2 −1

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ import com.android.launcher3.BaseRecyclerView;
		import com.android.launcher3.DeviceProfile;
		import com.android.launcher3.LauncherAppState;
		import com.android.launcher3.R;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.logging.StatsLogManager;
		import com.android.launcher3.views.ActivityContext;
		import com.android.launcher3.views.RecyclerViewFastScroller;
		@@ -166,7 +167,7 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
		// Always scroll the view to the top so the user can see the changed results
		scrollToTop();

		if (mApps.hasNoFilteredResults()) {
		if (mApps.hasNoFilteredResults() && !FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
		if (mEmptySearchBackground == null) {
		mEmptySearchBackground = new AllAppsBackgroundDrawable(getContext());
		mEmptySearchBackground.setAlpha(0);