Merge "Force config update when twoline is toggled." into main (093cf62e) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/Launcher.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -412,6 +412,7 @@ public class Launcher extends StatefulActivity<LauncherState>

		private final List<BackPressHandler> mBackPressedHandlers = new ArrayList<>();
		private boolean mIsColdStartupAfterReboot;
		private boolean mForceConfigUpdate;

		private boolean mIsNaturalScrollingEnabled;

		@@ -756,7 +757,7 @@ public class Launcher extends StatefulActivity<LauncherState>
		protected void onHandleConfigurationChanged() {
		Trace.beginSection("Launcher#onHandleconfigurationChanged");
		try {
		if (!initDeviceProfile(mDeviceProfile.inv)) {
		if (!initDeviceProfile(mDeviceProfile.inv) && !mForceConfigUpdate) {
		return;
		}

		@@ -770,6 +771,7 @@ public class Launcher extends StatefulActivity<LauncherState>
		mModel.rebindCallbacks();
		updateDisallowBack();
		} finally {
		mForceConfigUpdate = false;
		Trace.endSection();
		}
		}
		@@ -3151,6 +3153,13 @@ public class Launcher extends StatefulActivity<LauncherState>
		return mAnimationCoordinator;
		}

		/**
		* Set to force config update when set to true next time onHandleConfigurationChanged is called.
		*/
		public void setForceConfigUpdate(boolean forceConfigUpdate) {
		mForceConfigUpdate = forceConfigUpdate;
		}

		@Override
		public View.OnLongClickListener getAllAppsItemLongClickListener() {
		return ItemLongClickListener.INSTANCE_ALL_APPS;