openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Always refresh device profile when multi window mode changed" into sc-v2-dev

This commit is contained in:
Jerry Chang 2021-09-01 06:27:05 +00:00 committed by Android (Google) Code Review
parent 8a0e91b330 09b40241fc
commit 125158232e
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/launcher3/Launcher.java
View File

@ -554,6 +554,14 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
AbstractFloatingView.closeOpenViews(this, false, TYPE_ICON_SURFACE); 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 @Override
public void onConfigurationChanged(Configuration newConfig) { public void onConfigurationChanged(Configuration newConfig) {
int diff = newConfig.diff(mOldConfig); int diff = newConfig.diff(mOldConfig);
@ -592,11 +600,9 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
private void initDeviceProfile(InvariantDeviceProfile idp) { private void initDeviceProfile(InvariantDeviceProfile idp) {
// Load configuration-specific DeviceProfile // Load configuration-specific DeviceProfile
mDeviceProfile = idp.getDeviceProfile(this); mDeviceProfile = isInMultiWindowMode()
if (isInMultiWindowMode()) { ? mDeviceProfile.getMultiWindowProfile(this, getMultiWindowDisplaySize())
mDeviceProfile = mDeviceProfile.getMultiWindowProfile( : idp.getDeviceProfile(this);
this, getMultiWindowDisplaySize());
}
onDeviceProfileInitiated(); onDeviceProfileInitiated();
mModelWriter = mModel.getWriter(getDeviceProfile().isVerticalBarLayout(), true, this); mModelWriter = mModel.getWriter(getDeviceProfile().isVerticalBarLayout(), true, this);