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

Merge "Use ComponentCallbacks to recreate on fold/unfold" into tm-dev am: 68d5dd82db

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17241303

Change-Id: Ibd8565ff8bef68f475ec746ecd772a3c3e7d6554
This commit is contained in:
Vinit Nayak
2022-03-21 22:47:07 +00:00
committed by Automerger Merge Worker
parent 1d04306d50 68d5dd82db
commit fd5c719082
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
+24 -9
View File
@@ -89,8 +89,13 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen
*/
private final TaskbarSharedState mSharedState = new TaskbarSharedState();
private static final int CHANGE_FLAGS = CHANGE_ACTIVE_SCREEN | CHANGE_DENSITY
| CHANGE_SUPPORTED_BOUNDS | CHANGE_NAVIGATION_MODE;
/**
* We use WindowManager's ComponentCallbacks() for most of the config changes, however for
* navigation mode, that callback gets called too soon, before it's internal navigation mode
* reflects the current one.
* DisplayController's callback is delayed enough to get the correct nav mode value
*/
private static final int CHANGE_FLAGS = CHANGE_NAVIGATION_MODE;
private boolean mUserUnlocked = false;
@@ -108,19 +113,29 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen
@Override
public void onConfigurationChanged(Configuration newConfig) {
DeviceProfile dp = mUserUnlocked
? LauncherAppState.getIDP(mContext).getDeviceProfile(mContext)
: null;
int configDiff = mOldConfig.diff(newConfig);
int configsRequiringRecreate = ActivityInfo.CONFIG_ASSETS_PATHS
| ActivityInfo.CONFIG_LAYOUT_DIRECTION | ActivityInfo.CONFIG_UI_MODE;
| ActivityInfo.CONFIG_LAYOUT_DIRECTION | ActivityInfo.CONFIG_UI_MODE
| ActivityInfo.CONFIG_DENSITY | ActivityInfo.CONFIG_SCREEN_SIZE;
if ((configDiff & configsRequiringRecreate) != 0) {
// Color has changed, recreate taskbar to reload background color & icons.
recreateTaskbar();
if ((configDiff & ActivityInfo.CONFIG_SCREEN_SIZE) != 0 &&
mTaskbarActivityContext != null && dp != null) {
DeviceProfile oldDp = mTaskbarActivityContext.getDeviceProfile();
// Additional check since this callback gets fired multiple times w/o
// screen size changing
if (dp.widthPx != oldDp.widthPx || dp.heightPx != oldDp.heightPx) {
recreateTaskbar();
}
} else {
// Color has changed, recreate taskbar to reload background color & icons.
recreateTaskbar();
}
} else {
// Config change might be handled without re-creating the taskbar
if (mTaskbarActivityContext != null) {
DeviceProfile dp = mUserUnlocked
? LauncherAppState.getIDP(mContext).getDeviceProfile(mContext)
: null;
if (dp != null && dp.isTaskbarPresent) {
mTaskbarActivityContext.updateDeviceProfile(dp.copy(mContext));
}