From 177801c2736579cbb734596be59d737005a308fd Mon Sep 17 00:00:00 2001 From: Jaewan Kim Date: Tue, 6 Sep 2016 00:45:51 -0700 Subject: Keep the PIP at the shifted position when the Settings is shown Some top level Settings menus launch activities from other packages. In that case, they should be considered as a part of the Settings if they follow the Leanback's side panel style. Add such activities to the whitelist to keep the PIP position. Bug: 31142005 Change-Id: I12cab611b346154048cbd61f6a678f23b5a10c00 --- .../SystemUI/src/com/android/systemui/tv/pip/PipManager.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java index 5e4854c24387..3f8650a5e116 100644 --- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java +++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java @@ -78,6 +78,18 @@ public class PipManager { sSettingsPackageAndClassNamePairList.add(new Pair( "com.google.android.leanbacklauncher", "com.google.android.leanbacklauncher.settings.HomeScreenSettingsActivity")); + sSettingsPackageAndClassNamePairList.add(new Pair( + "com.google.android.apps.mediashell", + "com.google.android.apps.mediashell.settings.CastSettingsActivity")); + sSettingsPackageAndClassNamePairList.add(new Pair( + "com.google.android.katniss", + "com.google.android.katniss.setting.SpeechSettingsActivity")); + sSettingsPackageAndClassNamePairList.add(new Pair( + "com.google.android.katniss", + "com.google.android.katniss.setting.SearchSettingsActivity")); + sSettingsPackageAndClassNamePairList.add(new Pair( + "com.google.android.gsf.notouch", + "com.google.android.gsf.notouch.UsageDiagnosticsSettingActivity")); } /** -- cgit v1.2.3-59-g8ed1b