Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use nav frame height to differentiate quick switch vs edge gesture" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-10 19:58:32 +00:00
committed by Android (Google) Code Review
parent bac0795aff 682ad7ab55
commit 241c2e3097
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/res/values/internal.xml
View File

@@ -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>

7
packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java
View File

@@ -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);
}
/**