diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-05-23 17:53:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-23 17:53:24 +0000 |
| commit | 1b9afd4f73830d0669ed5363f6b237096f2267ee (patch) | |
| tree | 83173756c36aad1485dc326431401b5fe4e4a147 /quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java | |
| parent | 789fe60dc4f0f7607c8004bf1f44d4e26ff6062c (diff) | |
| parent | f5d02b069a28e759dd3484ef2e807f32fe53516f (diff) | |
| download | android_packages_apps_Trebuchet-1b9afd4f73830d0669ed5363f6b237096f2267ee.tar.gz android_packages_apps_Trebuchet-1b9afd4f73830d0669ed5363f6b237096f2267ee.tar.bz2 android_packages_apps_Trebuchet-1b9afd4f73830d0669ed5363f6b237096f2267ee.zip | |
Merge "Reading navigation_bar_gesture_height for bottom swipe region" into ub-launcher3-qt-dev
Diffstat (limited to 'quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java')
| -rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java index 0c997dd59..6ba1bf5c5 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java @@ -331,16 +331,8 @@ public class TouchInteractionService extends Service implements defaultDisplay.getRealSize(realSize); mSwipeTouchRegion.set(0, 0, realSize.x, realSize.y); if (mMode == Mode.NO_BUTTON) { - switch (defaultDisplay.getRotation()) { - case Surface.ROTATION_90: - case Surface.ROTATION_270: - mSwipeTouchRegion.top = mSwipeTouchRegion.bottom - getNavbarSize( - ResourceUtils.NAVBAR_LANDSCAPE_BOTTOM_SIZE); - break; - default: - mSwipeTouchRegion.top = mSwipeTouchRegion.bottom - getNavbarSize( - ResourceUtils.NAVBAR_PORTRAIT_BOTTOM_SIZE); - } + mSwipeTouchRegion.top = mSwipeTouchRegion.bottom - + getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE); } else { switch (defaultDisplay.getRotation()) { case Surface.ROTATION_90: @@ -353,7 +345,7 @@ public class TouchInteractionService extends Service implements break; default: mSwipeTouchRegion.top = mSwipeTouchRegion.bottom - - getNavbarSize(ResourceUtils.NAVBAR_PORTRAIT_BOTTOM_SIZE); + - getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE); } } } |