summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Junker <philipjunker@google.com>2022-04-26 11:57:10 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-26 11:57:10 +0000
commita8eb19619adf5084d4882f48ae6822ffe2cc5e12 (patch)
tree31b9d6ad531cdaff7708f44978af8bea629f69e8
parentc2e91b3e7225a453618b7a3efcdd05c8298cedc2 (diff)
parent873e5032fe21b31c9393684ba5508b7d492b312f (diff)
downloadatv-a8eb19619adf5084d4882f48ae6822ffe2cc5e12.tar.gz
Merge "Set TvSettings global key receiver as default for KEYCODE_PAIRING." into tm-dev am: 873e5032fe
Original change: https://googleplex-android-review.googlesource.com/c/device/google/atv/+/17607934 Change-Id: I822109798c58a9cadd066baa3551ddf1dba3fc5d Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--overlay/TvFrameworkOverlay/res/xml/global_keys.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/overlay/TvFrameworkOverlay/res/xml/global_keys.xml b/overlay/TvFrameworkOverlay/res/xml/global_keys.xml
index 4c0ab10..1fadb57 100644
--- a/overlay/TvFrameworkOverlay/res/xml/global_keys.xml
+++ b/overlay/TvFrameworkOverlay/res/xml/global_keys.xml
@@ -32,6 +32,7 @@
<key keyCode="KEYCODE_GUIDE" component="com.google.android.tv/.receiver.GlobalKeyReceiver" />
<key keyCode="KEYCODE_TV" component="com.google.android.tv/.receiver.GlobalKeyReceiver" />
<key keyCode="KEYCODE_TV_INPUT" component="com.google.android.tv/.receiver.GlobalKeyReceiver" />
+ <key keyCode="KEYCODE_PAIRING" component="com.android.tv.settings/.GlobalKeyReceiver" />
<!-- OEMs might want to add more custom global key handlings for TV specific key codes. -->
</global_keys>