aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 17:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add a flag to not disable back gesture in launcher" into tm-qpr-dev am: 1b499bfde8

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

Change-Id: Ie099256976e07c6ac8fe51f4c7b8fd2b0d16d782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ats Jenk
2022-12-02 06:30:49 +00:00
committed by Automerger Merge Worker
parent 0092cfbccd 1b499bfde8
commit 0c72daa6b8
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -313,6 +313,12 @@ public class Launcher extends StatefulActivity<LauncherState>
private static final FloatProperty<Hotseat> HOTSEAT_WIDGET_SCALE =
HOTSEAT_SCALE_PROPERTY_FACTORY.get(SCALE_INDEX_WIDGET_TRANSITION);
private static final boolean DESKTOP_MODE_1_SUPPORTED =
"1".equals(Utilities.getSystemProperty("persist.wm.debug.desktop_mode", "0"));
private static final boolean DESKTOP_MODE_2_SUPPORTED =
"1".equals(Utilities.getSystemProperty("persist.wm.debug.desktop_mode_2", "0"));
@Thunk
Workspace<?> mWorkspace;
@Thunk
@@ -3154,6 +3160,10 @@ public class Launcher extends StatefulActivity<LauncherState>
}
private void updateDisallowBack() {
if (DESKTOP_MODE_1_SUPPORTED || DESKTOP_MODE_2_SUPPORTED) {
// Do not disable back in launcher when prototype behavior is enabled
return;
}
LauncherRootView rv = getRootView();
if (rv != null) {
boolean disableBack = getStateManager().getState() == NORMAL