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

Merge "Fixing max-zoom-scale not taking into account the the fullScreen scale" into ub-launcher3-rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-05 02:01:00 +00:00
committed by Android (Google) Code Review
parent 8f3b7e3249 29e7a58f1a
commit 43e789ff9b
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+2
View File
@@ -17,6 +17,7 @@ package com.android.quickstep;
import static android.content.Intent.ACTION_USER_UNLOCKED;
import static com.android.launcher3.util.DefaultDisplay.CHANGE_ALL;
import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
import static com.android.quickstep.SysUINavigationMode.Mode.THREE_BUTTONS;
@@ -216,6 +217,7 @@ public class RecentsAnimationDeviceState implements
mDefaultDisplay.removeChangeListener(this);
if (newMode.hasGestures) {
mDefaultDisplay.addChangeListener(this);
onDisplayInfoChanged(mDefaultDisplay.getInfo(), CHANGE_ALL);
}
if (newMode == NO_BUTTON) {
quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+5 -1
View File
@@ -350,7 +350,11 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
} else {
outPivot.set(fullWidth, fullHeight);
}
final float scale = Math.min(outPivot.x / taskView.width(), outPivot.y / taskView.height());
float scale = Math.min(outPivot.x / taskView.width(), outPivot.y / taskView.height());
// We also scale the preview as part of fullScreenParams, so account for that as well.
if (fullWidth > 0) {
scale = scale * dp.widthPx / fullWidth;
}
if (scale == 1) {
outPivot.set(fullWidth / 2, fullHeight / 2);
src/com/android/launcher3/util/DefaultDisplay.java
+2
View File
@@ -47,6 +47,8 @@ public class DefaultDisplay implements DisplayListener {
public static final int CHANGE_ROTATION = 1 << 1;
public static final int CHANGE_FRAME_DELAY = 1 << 2;
public static final int CHANGE_ALL = CHANGE_SIZE | CHANGE_ROTATION | CHANGE_FRAME_DELAY;
private final Context mContext;
private final int mId;
private final ArrayList<DisplayInfoChangeListener> mListeners = new ArrayList<>();