Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "PIP: Address the comment from the previous CL"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-24 03:47:45 +00:00
committed by Android (Google) Code Review
parent cfeca52105 dc29875ac0
commit bdb7f42084
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/res/values/arrays_tv.xml
View File

@@ -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>

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

@@ -242,12 +242,17 @@ public class PipManager implements BasePipManager {
entry = Pair.<String, String>create(packageAndClassName[0], null);
break;
case 2:
entry = Pair.<String, String>create(
packageAndClassName[0],
packageAndClassName[0] + packageAndClassName[1]);
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]);
}
}
}