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

Commit 8af250ef authored by Jaewan Kim's avatar Jaewan Kim
Browse files

PIP: Use resource to maintain settings class list to shift PIP to left 

Bug: 31322754
Test: manual test
Change-Id: Ic36c2437409d8d1fcddd71087eda754f1a8752e1
parent 2f837e7b

packages/SystemUI/res/values/arrays_tv.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/**

 * 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.

 */

-->

<resources>

    <!-- List of package name or class name which are considered as Settings,

         so PIP location should be adjusted to the left of the side panel.

         This can be overriden in an overlay -->

    <string-array name="tv_pip_settings_class_name" translatable="false">

        <item>com.android.tv.settings</item>

        <item>com.google.android.leanbacklauncher/.settings.HomeScreenSettingsActivity</item>

        <item>com.google.android.apps.mediashell/.settings.CastSettingsActivity</item>

        <item>com.google.android.katniss.setting/.SpeechSettingsActivity</item>

        <item>com.google.android.katniss.setting/.SearchSettingsActivity</item>

        <item>com.google.android.gsf.notouch/.UsageDiagnosticsSettingActivity</item>

    </string-array>

</resources>

packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java

+27 −26
Original line number Diff line number Diff line
@@ -68,34 +68,10 @@ public class PipManager implements BasePipManager { 
    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

    private static final boolean DEBUG_FORCE_ONBOARDING =

            SystemProperties.getBoolean("debug.tv.pip_force_onboarding", false);

    private static final String SETTINGS_PACKAGE_AND_CLASS_DELIMITER = "/";



    private static PipManager sPipManager;



    /**

     * List of package and class name which are considered as Settings,

     * so PIP location should be adjusted to the left of the side panel.

     */

    private static final List<Pair<String, String>> sSettingsPackageAndClassNamePairList;

    static {

        sSettingsPackageAndClassNamePairList = new ArrayList<>();

        sSettingsPackageAndClassNamePairList.add(new Pair<String, String>(

                "com.android.tv.settings", null));

        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"));

    }

    private static List<Pair<String, String>> sSettingsPackageAndClassNamePairList;



    /**

     * State when there's no PIP.
@@ -252,6 +228,31 @@ public class PipManager implements BasePipManager { 
        mOnboardingShown = Prefs.getBoolean(

                mContext, TV_PICTURE_IN_PICTURE_ONBOARDING_SHOWN, false);



        if (sSettingsPackageAndClassNamePairList == null) {

            String[] settings = mContext.getResources().getStringArray(

                    R.array.tv_pip_settings_class_name);

            sSettingsPackageAndClassNamePairList = new ArrayList<>();

            if (settings != null) {

                for (int i = 0; i < settings.length; i++) {

                    Pair<String, String> entry = null;

                    String[] packageAndClassName =

                            settings[i].split(SETTINGS_PACKAGE_AND_CLASS_DELIMITER);

                    switch (packageAndClassName.length) {

                        case 1:

                            entry = Pair.<String, String>create(packageAndClassName[0], null);

                            break;

                        case 2:

                            entry = Pair.<String, String>create(

                                    packageAndClassName[0],

                                    packageAndClassName[0] + packageAndClassName[1]);

                    }

                    if (entry != null) {

                        sSettingsPackageAndClassNamePairList.add(entry);

                    }

                }

            }

        }



        loadConfigurationsAndApply();

        mPipRecentsOverlayManager = new PipRecentsOverlayManager(context);

        mMediaSessionManager =