Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a0d95a0 authored by Winson Chung's avatar Winson Chung
Browse files

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: default avatarWinson Chung <winsonc@google.com>
parent 32bc813f

AndroidManifest.xml

+14 −0
Original line number Diff line number Diff line
@@ -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"

res/values/strings.xml

+15 −0
Original line number Diff line number Diff line
@@ -6317,6 +6317,21 @@ 
         flicker while in VR mode. -->

    <string name="display_vr_pref_off">Reduce flicker</string>









    <!-- Special access > Title for managing Picture-in-picture settings. [CHAR LIMIT=50] -->









    <string name="picture_in_picture_title">Picture-in-picture</string>

















    <!-- Special access > Picture-in-picture > Text to display when the list is empty. [CHAR LIMIT=NONE] -->









    <string name="picture_in_picture_empty_text">No installed apps support Picture-in-picture</string>

















    <!-- Special access > Picture-in-picture > Additional keywords to search for. [CHAR LIMIT=NONE] -->









    <string name="picture_in_picture_keywords">pip picture in</string>

















    <!-- Apps > App Details > Advanced section string title. [CHAR LIMIT=NONE] -->









    <string name="picture_in_picture_app_detail_title">Picture-in-picture</string>

















    <!-- Apps > App Details > Advanced section string description. [CHAR LIMIT=NONE] -->









    <string name="picture_in_picture_app_detail_summary">Permit entering picture-in-picture when leaving app</string>

















    <!-- Sound & notification > Advanced section: Title for managing Do Not Disturb access option. [CHAR LIMIT=40] -->









    <string name="manage_zen_access_title">Do Not Disturb access</string>








































res/xml/special_access.xml



+5
−0






























Original line number
Diff line number
Diff line







@@ -73,6 +73,11 @@







        android:title="@string/manage_notification_access_title"









        android:fragment="com.android.settings.notification.NotificationAccessSettings" />



















    <Preference









        android:key="picture_in_picture"









        android:title="@string/picture_in_picture_title"









        android:fragment="com.android.settings.applications.PictureInPictureSettings"









        settings:keywords="@string/picture_in_picture_keywords" />









    <Preference









        android:key="premium_sms"









        android:title="@string/premium_sms_access"
































src/com/android/settings/Settings.java



+1
−0






























Original line number
Diff line number
Diff line







@@ -105,6 +105,7 @@ public class Settings extends SettingsActivity {







    public static class UserSettingsActivity extends SettingsActivity { /* empty */ }









    public static class NotificationAccessSettingsActivity extends SettingsActivity { /* empty */ }









    public static class VrListenersSettingsActivity extends SettingsActivity { /* empty */ }









    public static class PictureInPictureSettingsActivity extends SettingsActivity { /* empty */ }









    public static class ZenAccessSettingsActivity extends SettingsActivity { /* empty */ }









    public static class ConditionProviderSettingsActivity extends SettingsActivity { /* empty */ }









    public static class UsbSettingsActivity extends SettingsActivity { /* empty */ }
































src/com/android/settings/applications/ActivityInfoWrapper.java
0 → 100644



+30
−0






























Original line number
Diff line number
Diff line









/*









 * Copyright (C) 2017 The Android Open Source Project









 *









 * Licensed under the Apache License, Version 2.0 (the "License");









 * you may not use this file except in compliance with the License.









 * You may obtain a copy of the License at









 *









 *      http://www.apache.org/licenses/LICENSE-2.0









 *









 * Unless required by applicable law or agreed to in writing, software









 * distributed under the License is distributed on an "AS IS" BASIS,









 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.









 * See the License for the specific language governing permissions and









 * limitations under the License.









 */



















package com.android.settings.applications;



















/**









 * This interface replicates a subset of the android.content.pm.ActivityInfo. The interface









 * exists so that we can use a thin wrapper around the ActivityInfo in production code and a mock in









 * tests.









 */









public interface ActivityInfoWrapper {



















    /**









     * Returns the resizeMode of the activity.









     */









    int getResizeMode();









}