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

Merge "Remove more wrappers" into pi-dev am: a1c7bd0640

Browse Source 
am: 483ad78026

Change-Id: Ic5fc39baf1511bf4b786720e647e66c73d543496
This commit is contained in:
Fan Zhang
2018-03-31 07:43:57 +00:00
committed by android-build-merger
parent 0f9a6d439f 483ad78026
commit a38a3728c6
19 changed files with 130 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/applications/appinfo/PictureInPictureSettings.java
View File

@@ -40,7 +40,6 @@ import com.android.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.notification.EmptyTextSettings;
import com.android.settings.widget.AppPreference;
import com.android.settings.wrapper.ActivityInfoWrapper;
import com.android.settings.wrapper.UserManagerWrapper;
import com.android.settingslib.wrapper.PackageManagerWrapper;
@@ -96,25 +95,9 @@ public class PictureInPictureSettings extends EmptyTextSettings {
* @return true if the package has any activities that declare that they support
* picture-in-picture.
*/
public static boolean checkPackageHasPictureInPictureActivities(String packageName,
ActivityInfo[] activities) {
ActivityInfoWrapper[] wrappedActivities = null;
if (activities != null) {
wrappedActivities = new ActivityInfoWrapper[activities.length];
for (int i = 0; i < activities.length; i++) {
wrappedActivities[i] = new ActivityInfoWrapper(activities[i]);
}
}
return checkPackageHasPictureInPictureActivities(packageName, wrappedActivities);
}
/**
* @return true if the package has any activities that declare that they support
* picture-in-picture.
*/
@VisibleForTesting
static boolean checkPackageHasPictureInPictureActivities(String packageName,
ActivityInfoWrapper[] activities) {
// Skip if it's in the ignored list
if (IGNORE_PACKAGE_LIST.contains(packageName)) {
return false;