Merge "Always refresh device profile when multi window mode changed" into sc-v2-dev (12515823) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/Launcher.java

+11 −5

Original line number	Diff line number	Diff line
		@@ -554,6 +554,14 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
		AbstractFloatingView.closeOpenViews(this, false, TYPE_ICON_SURFACE);
		}

		@Override
		public void onMultiWindowModeChanged(boolean isInMultiWindowMode, Configuration newConfig) {
		super.onMultiWindowModeChanged(isInMultiWindowMode, newConfig);
		// Always update device profile when multi window mode changed.
		initDeviceProfile(mDeviceProfile.inv);
		dispatchDeviceProfileChanged();
		}

		@Override
		public void onConfigurationChanged(Configuration newConfig) {
		int diff = newConfig.diff(mOldConfig);
		@@ -592,11 +600,9 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche

		private void initDeviceProfile(InvariantDeviceProfile idp) {
		// Load configuration-specific DeviceProfile
		mDeviceProfile = idp.getDeviceProfile(this);
		if (isInMultiWindowMode()) {
		mDeviceProfile = mDeviceProfile.getMultiWindowProfile(
		this, getMultiWindowDisplaySize());
		}
		mDeviceProfile = isInMultiWindowMode()
		? mDeviceProfile.getMultiWindowProfile(this, getMultiWindowDisplaySize())
		: idp.getDeviceProfile(this);

		onDeviceProfileInitiated();
		mModelWriter = mModel.getWriter(getDeviceProfile().isVerticalBarLayout(), true, this);