Use nav frame height to differentiate quick switch vs edge gesture
Originally used shorter nav height in gestural mode. Fix by using the frame height to make back execute at a higher position compared to quick switch. Fixes: 130185782 Bug: 112934365 Test: manual and in landscape Change-Id: I1befdd4bd35a251926a7d361b4e1cb131e03ded3
This commit is contained in:
@@ -17,6 +17,7 @@
|
||||
<resources>
|
||||
<dimen name="status_bar_height">@*android:dimen/status_bar_height</dimen>
|
||||
<dimen name="navigation_bar_height">@*android:dimen/navigation_bar_height</dimen>
|
||||
<dimen name="navigation_bar_frame_height">@*android:dimen/navigation_bar_frame_height</dimen>
|
||||
<dimen name="navigation_bar_height_car_mode">@*android:dimen/navigation_bar_height_car_mode</dimen>
|
||||
</resources>
|
||||
|
||||
|
||||
@@ -17,6 +17,7 @@ package com.android.systemui.statusbar.phone;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.pm.ParceledListSlice;
|
||||
import android.content.res.Resources;
|
||||
import android.graphics.PixelFormat;
|
||||
import android.graphics.Point;
|
||||
import android.graphics.PointF;
|
||||
@@ -140,6 +141,7 @@ public class EdgeBackGestureHandler implements DisplayListener {
|
||||
private WindowManager.LayoutParams mEdgePanelLp;
|
||||
|
||||
public EdgeBackGestureHandler(Context context, OverviewProxyService overviewProxyService) {
|
||||
final Resources res = context.getResources();
|
||||
mContext = context;
|
||||
mDisplayId = context.getDisplayId();
|
||||
mMainExecutor = context.getMainExecutor();
|
||||
@@ -148,10 +150,9 @@ public class EdgeBackGestureHandler implements DisplayListener {
|
||||
|
||||
mEdgeWidth = QuickStepContract.getEdgeSensitivityWidth(context);
|
||||
mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
|
||||
mSwipeThreshold = context.getResources()
|
||||
.getDimension(R.dimen.navigation_edge_action_drag_threshold);
|
||||
mSwipeThreshold = res.getDimension(R.dimen.navigation_edge_action_drag_threshold);
|
||||
|
||||
mNavBarHeight = context.getResources().getDimensionPixelSize(R.dimen.navigation_bar_height);
|
||||
mNavBarHeight = res.getDimensionPixelSize(R.dimen.navigation_bar_frame_height);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user