commit 0a0d95a05a734d94c9fa5027e0181c61c375829d
author Winson Chung <winsonc@google.com> Fri Jan 20 11:22:44 2017 -0800
committer Winson Chung <winsonc@google.com> Tue Jan 24 09:04:46 2017 -0800
tree d21fc013db854e11adfd7aaf22a5e51564956c0e
parent 32bc813f04f4f7759c9bdfab59a319d66156b82e

Adding settings for managing auto-enter picture-in-picture.

- Add per-app setting for users to control whether an app can
  enter picture-in-picture when it is hidden.

Bug: 34520451
Test: make -j40 RunSettingsRoboTests
Change-Id: I182d6069ad01e42f1d3d6623ea21362ce802efba
Signed-off-by: Winson Chung <winsonc@google.com>

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a949715..0ed73e7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2574,6 +2574,20 @@
                        android:value="com.android.settings.applications.VrListenerSettings" />
         </activity>
 
+        <activity android:name="Settings$PictureInPictureSettingsActivity"
+            android:label="@string/picture_in_picture_title"
+            android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.PICTURE_IN_PICTURE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.applications.PictureInPictureSettings" />
+        </activity>
 
         <activity android:name="Settings$ZenAccessSettingsActivity"
                   android:label="@string/manage_zen_access_title"