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

Merge "Update the string on how to exit pinning mode in gesture navigation" into qt-qpr1-dev

Browse Source 
am: e6c9ed5f90

Change-Id: Ic4cad25be6307b9706ffe56491a7fb58ee5a04e7
This commit is contained in:
Hongwei Wang
2019-08-15 19:37:17 -07:00
committed by android-build-merger
parent ee1cdc610e e6c9ed5f90
commit 5bdaa0b84f
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values/strings.xml
View File

@@ -1386,6 +1386,8 @@
buttons</string> buttons</string>
<string name="screen_pinning_toast_recents_invisible">To unpin this screen, touch &amp; hold Back <string name="screen_pinning_toast_recents_invisible">To unpin this screen, touch &amp; hold Back
and Home buttons</string> and Home buttons</string>
<!-- Notify (in toast) user how to unpin screen in gesture navigation mode [CHAR LIMIT=NONE] -->
<string name="screen_pinning_toast_gesture_nav">To unpin this screen, swipe up &amp; hold</string>
<!-- Screen pinning positive response. --> <!-- Screen pinning positive response. -->
<string name="screen_pinning_positive">Got it</string> <string name="screen_pinning_positive">Got it</string>
<!-- Screen pinning negative response. --> <!-- Screen pinning negative response. -->

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
View File

@@ -17,6 +17,7 @@
package com.android.systemui.statusbar.phone; package com.android.systemui.statusbar.phone;
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON; import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON;
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED;
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;
@@ -920,7 +921,8 @@ public class NavigationBarView extends FrameLayout implements
} }
public void showPinningEscapeToast() { public void showPinningEscapeToast() {
mScreenPinningNotify.showEscapeToast(isRecentsButtonVisible()); mScreenPinningNotify.showEscapeToast(
mNavBarMode == NAV_BAR_MODE_GESTURAL, isRecentsButtonVisible());
} }
public boolean isVertical() { public boolean isVertical() {

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/ScreenPinningNotify.java
View File

@@ -51,7 +51,7 @@ public class ScreenPinningNotify {
} }
/** Show a toast that describes the gesture the user should use to escape pinned mode. */ /** Show a toast that describes the gesture the user should use to escape pinned mode. */
public void showEscapeToast(boolean isRecentsButtonVisible) { public void showEscapeToast(boolean isGestureNavEnabled, boolean isRecentsButtonVisible) {
long showToastTime = SystemClock.elapsedRealtime(); long showToastTime = SystemClock.elapsedRealtime();
if ((showToastTime - mLastShowToastTime) < SHOW_TOAST_MINIMUM_INTERVAL) { if ((showToastTime - mLastShowToastTime) < SHOW_TOAST_MINIMUM_INTERVAL) {
Slog.i(TAG, "Ignore toast since it is requested in very short interval."); Slog.i(TAG, "Ignore toast since it is requested in very short interval.");
@@ -60,7 +60,9 @@ public class ScreenPinningNotify {
if (mLastToast != null) { if (mLastToast != null) {
mLastToast.cancel(); mLastToast.cancel();
} }
mLastToast = makeAllUserToastAndShow(isRecentsButtonVisible mLastToast = makeAllUserToastAndShow(isGestureNavEnabled
? R.string.screen_pinning_toast_gesture_nav
: isRecentsButtonVisible
? R.string.screen_pinning_toast ? R.string.screen_pinning_toast
: R.string.screen_pinning_toast_recents_invisible); : R.string.screen_pinning_toast_recents_invisible);
mLastShowToastTime = showToastTime; mLastShowToastTime = showToastTime;