summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jaewan Kim <jaewan@google.com> 2016-09-06 22:27:24 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-09-06 22:27:27 +0000
commite70f79b5847b92cd2cb0dd3dd7ef6c3690d341d9 (patch)
tree7628c66f9114278a0d697b1ce9dab730b028cc7a
parent1191fee63466117a886ce3d7b03b0562086c2984 (diff)
parent177801c2736579cbb734596be59d737005a308fd (diff)
Merge "Keep the PIP at the shifted position when the Settings is shown" into nyc-mr1-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java12
1 files changed, 12 insertions, 0 deletions
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<String, String>(
"com.google.android.leanbacklauncher",
"com.google.android.leanbacklauncher.settings.HomeScreenSettingsActivity"));
+ sSettingsPackageAndClassNamePairList.add(new Pair<String, String>(
+ "com.google.android.apps.mediashell",
+ "com.google.android.apps.mediashell.settings.CastSettingsActivity"));
+ sSettingsPackageAndClassNamePairList.add(new Pair<String, String>(
+ "com.google.android.katniss",
+ "com.google.android.katniss.setting.SpeechSettingsActivity"));
+ sSettingsPackageAndClassNamePairList.add(new Pair<String, String>(
+ "com.google.android.katniss",
+ "com.google.android.katniss.setting.SearchSettingsActivity"));
+ sSettingsPackageAndClassNamePairList.add(new Pair<String, String>(
+ "com.google.android.gsf.notouch",
+ "com.google.android.gsf.notouch.UsageDiagnosticsSettingActivity"));
}
/**