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

Merge "Adjust the insets frame providing method per API change" into tm-dev am: d9939d8174

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

Change-Id: I8616ee972a683e61168d821f2e01efbf0fe620c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-13 02:29:35 +00:00
committed by Automerger Merge Worker
parent 9b46ad45e6 d9939d8174
commit 0500a5479c
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
+13 -2
View File
@@ -29,6 +29,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_N
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED;
import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTTOM_TAPPABLE_ELEMENT; import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTTOM_TAPPABLE_ELEMENT;
import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_EXTRA_NAVIGATION_BAR; import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_EXTRA_NAVIGATION_BAR;
import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_SIZE;
import android.animation.AnimatorSet; import android.animation.AnimatorSet;
import android.app.ActivityOptions; import android.app.ActivityOptions;
@@ -214,8 +215,12 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
); );
// Adjust the frame by the rounded corners (ie. leaving just the bar as the inset) when // Adjust the frame by the rounded corners (ie. leaving just the bar as the inset) when
// the IME is showing // the IME is showing
mWindowLayoutParams.providedInternalImeInsets = Insets.of(0, mWindowLayoutParams.providedInternalImeInsets = new Insets[ITYPE_SIZE];
final Insets reducingSize = Insets.of(0,
getDefaultTaskbarWindowHeight() - mTaskbarHeightForIme, 0, 0); getDefaultTaskbarWindowHeight() - mTaskbarHeightForIme, 0, 0);
mWindowLayoutParams.providedInternalImeInsets[ITYPE_EXTRA_NAVIGATION_BAR] = reducingSize;
mWindowLayoutParams.providedInternalImeInsets[ITYPE_BOTTOM_TAPPABLE_ELEMENT] =
reducingSize;
mWindowLayoutParams.insetsRoundedCornerFrame = true; mWindowLayoutParams.insetsRoundedCornerFrame = true;
@@ -563,8 +568,14 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
} }
} }
mWindowLayoutParams.height = height; mWindowLayoutParams.height = height;
mWindowLayoutParams.providedInternalImeInsets = final Insets reducingSize =
Insets.of(0, height - mTaskbarHeightForIme, 0, 0); Insets.of(0, height - mTaskbarHeightForIme, 0, 0);
if (mWindowLayoutParams.providedInternalImeInsets == null) {
mWindowLayoutParams.providedInternalImeInsets = new Insets[ITYPE_SIZE];
}
mWindowLayoutParams.providedInternalImeInsets[ITYPE_EXTRA_NAVIGATION_BAR] = reducingSize;
mWindowLayoutParams.providedInternalImeInsets[ITYPE_BOTTOM_TAPPABLE_ELEMENT] =
reducingSize;
mWindowManager.updateViewLayout(mDragLayer, mWindowLayoutParams); mWindowManager.updateViewLayout(mDragLayer, mWindowLayoutParams);
} }