Merge remote-tracking branch 'origin/lineage-21.0' into a14 (d2439f9f) · Commits · e / os / android_frameworks_base

packages/PackageInstaller/src/com/android/packageinstaller/UninstallerActivity.java

+9 −8

Original line number	Diff line number	Diff line
		@@ -58,8 +58,6 @@ import com.android.packageinstaller.common.EventResultPersister;
		import com.android.packageinstaller.common.UninstallEventReceiver;
		import com.android.packageinstaller.v2.ui.UninstallLaunch;

		import java.util.List;

		/*
		* This activity presents UI to uninstall an application. Usually launched with intent
		* Intent.ACTION_UNINSTALL_PKG_COMMAND and attribute
		@@ -182,14 +180,17 @@ public class UninstallerActivity extends Activity {
		if (mDialogInfo.user == null) {
		mDialogInfo.user = Process.myUserHandle();
		} else {
		List<UserHandle> profiles = userManager.getUserProfiles();
		if (!profiles.contains(mDialogInfo.user)) {
		if (!mDialogInfo.user.equals(Process.myUserHandle())) {
		final boolean isCurrentUserProfileOwner = Process.myUserHandle().equals(
		userManager.getProfileParent(mDialogInfo.user));
		if (!isCurrentUserProfileOwner) {
		Log.e(TAG, "User " + Process.myUserHandle() + " can't request uninstall "
		+ "for user " + mDialogInfo.user);
		showUserIsNotAllowed();
		return;
		}
		}
		}

		mDialogInfo.callback = intent.getParcelableExtra(PackageInstaller.EXTRA_CALLBACK,
		PackageManager.UninstallCompleteCallback.class);

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java

0 → 100644

+545 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java

+21 −6

Original line number	Diff line number	Diff line
		@@ -16,8 +16,13 @@

		package com.android.systemui.qs.tiles;

		import static android.graphics.drawable.Icon.TYPE_URI;
		import static android.provider.Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT;
		import static android.graphics.drawable.Icon.TYPE_URI;
		import static android.graphics.drawable.Icon.TYPE_URI_ADAPTIVE_BITMAP;
		import static android.graphics.drawable.Icon.TYPE_RESOURCE;
		import static android.graphics.drawable.Icon.TYPE_BITMAP;
		import static android.graphics.drawable.Icon.TYPE_ADAPTIVE_BITMAP;
		import static android.graphics.drawable.Icon.TYPE_DATA;

		import static com.android.systemui.wallet.controller.QuickAccessWalletController.WalletChangeEvent.DEFAULT_PAYMENT_APP_CHANGE;
		import static com.android.systemui.wallet.controller.QuickAccessWalletController.WalletChangeEvent.DEFAULT_WALLET_APP_CHANGE;
		@@ -230,11 +235,21 @@ public class QuickAccessWalletTile extends QSTileImpl<QSTile.State> {
		return;
		}
		mSelectedCard = cards.get(selectedIndex);
		android.graphics.drawable.Icon cardImageIcon = mSelectedCard.getCardImage();
		if (cardImageIcon.getType() == TYPE_URI) {
		mCardViewDrawable = null;
		} else {
		switch (mSelectedCard.getCardImage().getType()) {
		case TYPE_BITMAP:
		case TYPE_ADAPTIVE_BITMAP:
		mCardViewDrawable = mSelectedCard.getCardImage().loadDrawable(mContext);
		break;
		case TYPE_URI:
		case TYPE_URI_ADAPTIVE_BITMAP:
		case TYPE_RESOURCE:
		case TYPE_DATA:
		mCardViewDrawable = null;
		break;
		default:
		Log.e(TAG, "Unknown icon type: " + mSelectedCard.getCardImage().getType());
		mCardViewDrawable = null;
		break;
		}
		refreshState();
		}

packages/SystemUI/src/com/android/systemui/wallet/ui/WalletScreenController.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -330,13 +330,19 @@ public class WalletScreenController implements
		QAWalletCardViewInfo(Context context, WalletCard walletCard) {
		mWalletCard = walletCard;
		Icon cardImageIcon = mWalletCard.getCardImage();
		if (cardImageIcon.getType() == Icon.TYPE_URI) {
		mCardDrawable = null;
		} else {
		if (cardImageIcon.getType() == Icon.TYPE_BITMAP
		\|\| cardImageIcon.getType() == Icon.TYPE_ADAPTIVE_BITMAP) {
		mCardDrawable = mWalletCard.getCardImage().loadDrawable(context);
		} else {
		mCardDrawable = null;
		}
		Icon icon = mWalletCard.getCardIcon();
		mIconDrawable = icon == null ? null : icon.loadDrawable(context);
		if (icon != null && (icon.getType() == Icon.TYPE_BITMAP
		\|\| icon.getType() == Icon.TYPE_ADAPTIVE_BITMAP)) {
		mIconDrawable = icon.loadDrawable(context);
		} else {
		mIconDrawable = null;
		}
		}

		@Override

packages/SystemUI/src/com/android/systemui/wallet/ui/WalletView.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -283,6 +283,11 @@ public class WalletView extends FrameLayout implements WalletCardCarousel.OnCard
		return mCardLabel;
		}

		@VisibleForTesting
		ImageView getIcon() {
		return mIcon;
		}

		@Nullable
		private static Drawable getHeaderIcon(Context context, WalletCardViewInfo walletCard) {
		Drawable icon = walletCard.getIcon();