summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Liu <jminjie@google.com>2020-08-04 11:34:03 -0700
committerJordan Liu <jminjie@google.com>2020-08-06 16:54:46 +0000
commit4f605ac2386284e03c4525b7a80c0361142d5415 (patch)
tree25f5056ff16624a213af9d397340fed4ddeb23dd
parent9a5cf012cbd57b5418329c4ee1f1a8ede4750997 (diff)
downloadStk-4f605ac2386284e03c4525b7a80c0361142d5415.tar.gz
Treat recentapps as home press for STK dialogs
For interactive STK dialogs which listen for user presses of the HOME key, we will treat RECENTAPPS presses as equivalent. The reason for this is because with new gesture-based navigation it's hard for the user to trigger a HOME press, and the same user intention often triggers a RECENTAPPS press. Bug: 161207764 Test: manual Change-Id: Ib64068f191e62b7103472d39525305be3dab59c8 Merged-In: Ib64068f191e62b7103472d39525305be3dab59c8
-rw-r--r--src/com/android/stk/StkAppService.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index 9f86610..8bac03e 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -299,6 +299,7 @@ public class StkAppService extends Service implements Runnable {
// The reason based on Intent.ACTION_CLOSE_SYSTEM_DIALOGS.
private static final String SYSTEM_DIALOG_REASON_KEY = "reason";
private static final String SYSTEM_DIALOG_REASON_HOME_KEY = "homekey";
+ private static final String SYSTEM_DIALOG_REASON_RECENTAPPS_KEY = "recentapps";
private BroadcastReceiver mHomeKeyEventReceiver = null;
@Override
@@ -828,8 +829,11 @@ public class StkAppService extends Service implements Runnable {
}
mHomeKeyEventReceiver = new BroadcastReceiver() {
@Override public void onReceive(Context context, Intent intent) {
- if (SYSTEM_DIALOG_REASON_HOME_KEY.equals(
- intent.getStringExtra(SYSTEM_DIALOG_REASON_KEY))) {
+ final String reason = intent.getStringExtra(SYSTEM_DIALOG_REASON_KEY);
+ // gesture-based launchers may interpret swipe-up as "recent apps" instead of
+ // "home" so we accept both here
+ if (SYSTEM_DIALOG_REASON_HOME_KEY.equals(reason)
+ || SYSTEM_DIALOG_REASON_RECENTAPPS_KEY.equals(reason)) {
Message message = mServiceHandler.obtainMessage();
message.arg1 = OP_HOME_KEY_PRESSED;
mServiceHandler.sendMessage(message);