Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 241c2e30 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents bac0795a 682ad7ab

packages/SystemUI/res/values/internal.xml

+1 −0
Original line number Diff line number Diff line
@@ -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>

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

+4 −3
Original line number Diff line number Diff line
@@ -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);

    }



    /**