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

Commit e660d6f1 authored by Winson Chung's avatar Winson Chung Committed by Android Git Automerger
Browse files

am 4ad2c5ba: Merge "Increasing the min swipe thresholds for the nav bar... 

am 4ad2c5ba: Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)" into lmp-dev

* commit '4ad2c5ba':
  Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)
parents 6aaa61fd 4ad2c5ba

packages/SystemUI/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ 


    <!-- thickness (height) of the navigation bar on phones that require it -->

    <dimen name="navigation_bar_size">@*android:dimen/navigation_bar_height</dimen>

    <!-- Minimum swipe distance to catch the swipe gestures to invoke assist or switch tasks. -->

    <dimen name="navigation_bar_min_swipe_distance">48dp</dimen>



    <!-- thickness (height) of the dead zone at the top of the navigation bar,

         reducing false presses on navbar buttons; approx 2mm -->

packages/SystemUI/src/com/android/systemui/statusbar/DelegateViewHelper.java

+4 −3
Original line number Diff line number Diff line
@@ -17,10 +17,11 @@ 
package com.android.systemui.statusbar;



import android.app.StatusBarManager;

import android.content.res.Resources;

import android.graphics.RectF;

import android.view.MotionEvent;

import android.view.View;

import android.view.ViewConfiguration;

import com.android.systemui.R;



public class DelegateViewHelper {

    private View mDelegateView;
@@ -106,8 +107,8 @@ public class DelegateViewHelper { 
    public void setSourceView(View view) {

        mSourceView = view;

        if (mSourceView != null) {

            mTriggerThreshhold =

                    ViewConfiguration.get(mSourceView.getContext()).getScaledPagingTouchSlop();

            Resources r = mSourceView.getContext().getResources();

            mTriggerThreshhold = r.getDimensionPixelSize(R.dimen.navigation_bar_min_swipe_distance);

        }

    }

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

+4 −1
Original line number Diff line number Diff line
@@ -17,9 +17,11 @@ 
package com.android.systemui.statusbar.phone;



import android.content.Context;

import android.content.res.Resources;

import android.view.GestureDetector;

import android.view.MotionEvent;

import android.view.ViewConfiguration;

import com.android.systemui.R;

import com.android.systemui.statusbar.BaseStatusBar;



public class NavigationBarViewTaskSwitchHelper extends GestureDetector.SimpleOnGestureListener {
@@ -36,7 +38,8 @@ public class NavigationBarViewTaskSwitchHelper extends GestureDetector.SimpleOnG 


    public NavigationBarViewTaskSwitchHelper(Context context) {

        ViewConfiguration configuration = ViewConfiguration.get(context);

        mScrollTouchSlop = 4 * configuration.getScaledTouchSlop();

        Resources r = context.getResources();

        mScrollTouchSlop = r.getDimensionPixelSize(R.dimen.navigation_bar_min_swipe_distance);

        mMinFlingVelocity = configuration.getScaledMinimumFlingVelocity();

        mTaskSwitcherDetector = new GestureDetector(context, this);

    }