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

Commit dc29875a authored Feb 24, 2017 by Jaewan Kim

PIP: Address the comment from the previous CL

This address the comments from the following CL

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

Test: Manual test
Change-Id: Ib7cae7ba019018375e9c1e51f1a0ef7d91447d52

parent 0c6d24f7

packages/SystemUI/res/values/arrays_tv.xml

+6 −2

Original line number	Diff line number	Diff line
		@@ -17,9 +17,13 @@
		*/
		-->
		<resources>
		<!-- List of package name or class name which are considered as Settings,
		<!-- List of package names or class names 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 -->
		If it should be applied for all activities in a package, add the package name.
		If it should be applied for an activity in a package, add its class name with package name.
		The class name must follow format 'package_name/.class_name' ('/.' in between).
		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>

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

+8 −3

Original line number	Diff line number	Diff line
		@@ -242,12 +242,17 @@ 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 (entry != null) {
		sSettingsPackageAndClassNamePairList.add(entry);
		} else {
		Log.w(TAG, "Ignoring malformed settings name " + settings[i]);
		}
		}
		}