diff options
| author | Jordan Liu <jminjie@google.com> | 2020-08-05 17:18:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-05 17:18:22 +0000 |
| commit | a718758cb5475cd2209d403a59098806ee7eb2b7 (patch) | |
| tree | 1da5705e5802dcaafaa5934b919705c002d8fa3e /src | |
| parent | 09bc6ea0d146bf98b3a0d25f45d828f3e3b95bd0 (diff) | |
| parent | 369b84b595666fc28b26f54dfd5ff6604ff24457 (diff) | |
| download | Stk-a718758cb5475cd2209d403a59098806ee7eb2b7.tar.gz | |
Merge "Treat recentapps as home press for STK dialogs" am: 2708362895 am: 369b84b595
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1389216
Change-Id: I167b47c0fc642799fd4b32088e7b7b863859ec82
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/stk/StkAppService.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java index c78dbbe..8032b0f 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); |