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

Commit d2067824 authored by Shuichi.Noguchi's avatar Shuichi.Noguchi
Browse files

Fix the logic to get tv_pip_settings_class_name 

Currently, Only the class which is started from "." can be
registered in PipManager. But some activities are not
following this and as the result, Pip is not displayed
in settings bounds even the name is registered in xml.

PipManager checks the class name not only it's started from ".",
but also any class name, then PipManager gets correct class name
even if it's not started from "."

Test: Launch PiP, the activity which is not started from ".".
      Then, open settings.

Change-Id: Iee29596aa8c1955d83338f6dd7a8dcdfccafc906
parent 22bd015c

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

100644 → 100755
+6 −5
Original line number Diff line number Diff line
@@ -251,12 +251,13 @@ public class PipManager implements BasePipManager { 
                            entry = Pair.<String, String>create(packageAndClassName[0], null);

                            break;

                        case 2:

                            if (packageAndClassName[1] != null

                                    && packageAndClassName[1].startsWith(".")) {

                                entry = Pair.<String, String>create(

                                        packageAndClassName[0],

                                        packageAndClassName[0] + packageAndClassName[1]);

                            if (packageAndClassName[1] != null) {

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

                                        packageAndClassName[1].startsWith(".")

                                                ? packageAndClassName[0] + packageAndClassName[1]

                                                : packageAndClassName[1]);

                            }

                            break;

                    }

                    if (entry != null) {

                        sSettingsPackageAndClassNamePairList.add(entry);