Merge "Fixing issue with PiP settings not showing apps for other profiles." into oc-mr1-dev (625b1dd1) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/applications/PackageManagerWrapper.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.IPackageDeleteObserver;
		import android.content.pm.PackageInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.os.UserHandle;
		@@ -48,6 +49,11 @@ public interface PackageManagerWrapper {
		*/
		List<ApplicationInfo> getInstalledApplicationsAsUser(int flags, int userId);

		/**
		* Calls {@code PackageManager.getInstalledPackagesAsUser}
		*/
		List<PackageInfo> getInstalledPackagesAsUser(int flags, int userId);

		/**
		* Calls {@code PackageManager.hasSystemFeature()}.
		*

src/com/android/settings/applications/PackageManagerWrapperImpl.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.IPackageDeleteObserver;
		import android.content.pm.PackageInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.os.UserHandle;
		@@ -46,6 +47,11 @@ public class PackageManagerWrapperImpl implements PackageManagerWrapper {
		return mPm.getInstalledApplicationsAsUser(flags, userId);
		}

		@Override
		public List<PackageInfo> getInstalledPackagesAsUser(int flags, int userId) {
		return mPm.getInstalledPackagesAsUser(flags, userId);
		}

		@Override
		public boolean hasSystemFeature(String name) {
		return mPm.hasSystemFeature(name);

src/com/android/settings/applications/PictureInPictureSettings.java

+86 −25

Original line number	Diff line number	Diff line
		@@ -22,14 +22,16 @@ import android.content.Context;
		import android.content.pm.ActivityInfo;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageInfo;
		import android.content.pm.PackageItemInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.UserInfo;
		import android.os.Bundle;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.support.v7.preference.Preference;
		import android.support.v7.preference.Preference.OnPreferenceClickListener;
		import android.support.v7.preference.PreferenceScreen;
		import android.util.ArrayMap;
		import android.util.IconDrawableFactory;
		import android.util.Pair;
		import android.view.View;

		import com.android.internal.annotations.VisibleForTesting;
		@@ -37,8 +39,10 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.R;
		import com.android.settings.notification.EmptyTextSettings;

		import java.text.Collator;
		import java.util.ArrayList;
		import java.util.Collections;
		import java.util.Comparator;
		import java.util.List;

		public class PictureInPictureSettings extends EmptyTextSettings {
		@@ -50,8 +54,38 @@ public class PictureInPictureSettings extends EmptyTextSettings {
		IGNORE_PACKAGE_LIST.add("com.android.systemui");
		}

		/**
		* Comparator by name, then user id.
		* {@see PackageItemInfo#DisplayNameComparator}
		*/
		static class AppComparator implements Comparator<Pair<ApplicationInfo, Integer>> {

		private final Collator mCollator = Collator.getInstance();
		private final PackageManager mPm;

		public AppComparator(PackageManager pm) {
		mPm = pm;
		}

		public final int compare(Pair<ApplicationInfo, Integer> a,
		Pair<ApplicationInfo, Integer> b) {
		CharSequence sa = a.first.loadLabel(mPm);
		if (sa == null) sa = a.first.name;
		CharSequence sb = b.first.loadLabel(mPm);
		if (sb == null) sb = b.first.name;
		int nameCmp = mCollator.compare(sa.toString(), sb.toString());
		if (nameCmp != 0) {
		return nameCmp;
		} else {
		return a.second - b.second;
		}
		}
		}

		private Context mContext;
		private PackageManager mPackageManager;
		private PackageManagerWrapper mPackageManager;
		private UserManagerWrapper mUserManager;
		private IconDrawableFactory mIconDrawableFactory;

		/**
		* @return true if the package has any activities that declare that they support
		@@ -93,12 +127,23 @@ public class PictureInPictureSettings extends EmptyTextSettings {
		return false;
		}

		public PictureInPictureSettings() {
		// Do nothing
		}

		public PictureInPictureSettings(PackageManagerWrapper pm, UserManagerWrapper um) {
		mPackageManager = pm;
		mUserManager = um;
		}

		@Override
		public void onCreate(Bundle icicle) {
		super.onCreate(icicle);

		mContext = getActivity();
		mPackageManager = mContext.getPackageManager();
		mPackageManager = new PackageManagerWrapperImpl(mContext.getPackageManager());
		mUserManager = new UserManagerWrapperImpl(mContext.getSystemService(UserManager.class));
		mIconDrawableFactory = IconDrawableFactory.newInstance(mContext);
		setPreferenceScreen(getPreferenceManager().createPreferenceScreen(mContext));
		}

		@@ -110,33 +155,25 @@ public class PictureInPictureSettings extends EmptyTextSettings {
		final PreferenceScreen screen = getPreferenceScreen();
		screen.removeAll();

		// Fetch the set of applications which have at least one activity that declare that they
		// support picture-in-picture
		final ArrayMap<String, Boolean> packageToState = new ArrayMap<>();
		final ArrayList<ApplicationInfo> pipApps = new ArrayList<>();
		final List<PackageInfo> installedPackages = mPackageManager.getInstalledPackagesAsUser(
		GET_ACTIVITIES, UserHandle.myUserId());
		for (PackageInfo packageInfo : installedPackages) {
		if (checkPackageHasPictureInPictureActivities(packageInfo.packageName,
		packageInfo.activities)) {
		final String packageName = packageInfo.applicationInfo.packageName;
		final boolean state = PictureInPictureDetails.getEnterPipStateForPackage(
		mContext, packageInfo.applicationInfo.uid, packageName);
		pipApps.add(packageInfo.applicationInfo);
		packageToState.put(packageName, state);
		}
		}
		Collections.sort(pipApps, new PackageItemInfo.DisplayNameComparator(mPackageManager));
		// Fetch the set of applications for each profile which have at least one activity that
		// declare that they support picture-in-picture
		final PackageManager pm = mPackageManager.getPackageManager();
		final ArrayList<Pair<ApplicationInfo, Integer>> pipApps =
		collectPipApps(UserHandle.myUserId());
		Collections.sort(pipApps, new AppComparator(pm));

		// Rebuild the list of prefs
		final Context prefContext = getPrefContext();
		for (final ApplicationInfo appInfo : pipApps) {
		for (final Pair<ApplicationInfo, Integer> appData : pipApps) {
		final ApplicationInfo appInfo = appData.first;
		final int userId = appData.second;
		final UserHandle user = UserHandle.of(userId);
		final String packageName = appInfo.packageName;
		final CharSequence label = appInfo.loadLabel(mPackageManager);
		final CharSequence label = appInfo.loadLabel(pm);

		final Preference pref = new Preference(prefContext);
		pref.setIcon(appInfo.loadIcon(mPackageManager));
		pref.setTitle(label);
		pref.setIcon(mIconDrawableFactory.getBadgedIcon(appInfo, userId));
		pref.setTitle(pm.getUserBadgedLabel(label, user));
		pref.setSummary(PictureInPictureDetails.getPreferenceSummary(prefContext,
		appInfo.uid, packageName));
		pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
		@@ -162,4 +199,28 @@ public class PictureInPictureSettings extends EmptyTextSettings {
		public int getMetricsCategory() {
		return MetricsEvent.SETTINGS_MANAGE_PICTURE_IN_PICTURE;
		}

		/**
		* @return the list of applications for the given user and all their profiles that have
		* activities which support PiP.
		*/
		ArrayList<Pair<ApplicationInfo, Integer>> collectPipApps(int userId) {
		final ArrayList<Pair<ApplicationInfo, Integer>> pipApps = new ArrayList<>();
		final ArrayList<Integer> userIds = new ArrayList<>();
		for (UserInfo user : mUserManager.getProfiles(userId)) {
		userIds.add(user.id);
		}

		for (int id : userIds) {
		final List<PackageInfo> installedPackages = mPackageManager.getInstalledPackagesAsUser(
		GET_ACTIVITIES, id);
		for (PackageInfo packageInfo : installedPackages) {
		if (checkPackageHasPictureInPictureActivities(packageInfo.packageName,
		packageInfo.activities)) {
		pipApps.add(new Pair<>(packageInfo.applicationInfo, id));
		}
		}
		}
		return pipApps;
		}
		}

src/com/android/settings/applications/UserManagerWrapper.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,4 +29,5 @@ import java.util.List;
		public interface UserManagerWrapper {
		UserInfo getPrimaryUser();
		List<UserInfo> getUsers();
		List<UserInfo> getProfiles(int userHandle);
		}

src/com/android/settings/applications/UserManagerWrapperImpl.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -37,4 +37,9 @@ public class UserManagerWrapperImpl implements UserManagerWrapper {
		public List<UserInfo> getUsers() {
		return mUserManager.getUsers();
		}

		@Override
		public List<UserInfo> getProfiles(int userHandle) {
		return mUserManager.getProfiles(userHandle);
		}
		}