Snap for 10453938 from 6bd66c73aeb2249c21f38f35e37e430b897480e0 to mainline-odp-release
Change-Id: I56844b7de184c58d77b180d398cac9fd77bb04ae
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 357903b..9d8a58d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.systemui.plugin.globalactions.wallet">
<uses-sdk
- android:minSdkVersion="30"
+ android:minSdkVersion="33"
android:targetSdkVersion="33" />
<application/>
</manifest>
diff --git a/AndroidManifest_App.xml b/AndroidManifest_App.xml
index 185338b..d999b6f 100644
--- a/AndroidManifest_App.xml
+++ b/AndroidManifest_App.xml
@@ -21,7 +21,7 @@
android:versionName="1.0.0.0">
<uses-sdk
- android:minSdkVersion="30"
+ android:minSdkVersion="33"
android:targetSdkVersion="33"/>
<!-- For using plugins -->
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 6082758..1adf6f3 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -3,6 +3,6 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="error_user_locked" msgid="3088770324409338404">"Unlock your phone to load your payment info"</string>
<string name="accessibility_menu" msgid="1982506521504867550">"Menu"</string>
- <string name="error_generic" msgid="5736597066829262527">"There was a problem getting your cards. Please try again later."</string>
+ <string name="error_generic" msgid="5736597066829262527">"There was a problem getting your cards, please try again later"</string>
<string name="settings" msgid="4740257901811398113">"Settings"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 5a0e9c6..6529c43 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -3,6 +3,6 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="error_user_locked" msgid="3088770324409338404">"Buka kunci ponsel untuk memuat info pembayaran Anda"</string>
<string name="accessibility_menu" msgid="1982506521504867550">"Menu"</string>
- <string name="error_generic" msgid="5736597066829262527">"Terjadi masalah saat mendapatkan kartu Anda, harap coba lagi nanti"</string>
+ <string name="error_generic" msgid="5736597066829262527">"Terjadi error saat mendapatkan kartu Anda, harap coba lagi nanti"</string>
<string name="settings" msgid="4740257901811398113">"Setelan"</string>
</resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 2cd25c9..b87f9da 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -4,5 +4,5 @@
<string name="error_user_locked" msgid="3088770324409338404">"Төлөм маалыматыңызды жүктөө үчүн телефонуңуздун кулпусун ачыңыз"</string>
<string name="accessibility_menu" msgid="1982506521504867550">"Меню"</string>
<string name="error_generic" msgid="5736597066829262527">"Кыйытмаларды алууда ката кетти. Бир аздан кийин кайталап көрүңүз."</string>
- <string name="settings" msgid="4740257901811398113">"Жөндөөлөр"</string>
+ <string name="settings" msgid="4740257901811398113">"Параметрлер"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a8f430c..877cd76 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -3,6 +3,6 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="error_user_locked" msgid="3088770324409338404">"Lås opp telefonen for å laste inn betalingsopplysninger"</string>
<string name="accessibility_menu" msgid="1982506521504867550">"Meny"</string>
- <string name="error_generic" msgid="5736597066829262527">"Det oppsto et problem med henting av kortene dine. Prøv igjen senere"</string>
+ <string name="error_generic" msgid="5736597066829262527">"Det oppsto et problem med henting av kortene dine. Prøv på nytt senere"</string>
<string name="settings" msgid="4740257901811398113">"Innstillinger"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 6007efb..74f9ae6 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -3,6 +3,6 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="error_user_locked" msgid="3088770324409338404">"Desbloqueie o telemóvel para carregar as informações de pagamento."</string>
<string name="accessibility_menu" msgid="1982506521504867550">"Menu"</string>
- <string name="error_generic" msgid="5736597066829262527">"Ocorreu um problema ao obter os seus cartões. Tente novamente mais tarde."</string>
+ <string name="error_generic" msgid="5736597066829262527">"Ocorreu um problema ao obter os seus cartões. Tente mais tarde."</string>
<string name="settings" msgid="4740257901811398113">"Definições"</string>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 72b20f8..8a02a42 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="error_user_locked" msgid="3088770324409338404">"Deblocați telefonul și încărcați informațiile de plată"</string>
+ <string name="error_user_locked" msgid="3088770324409338404">"Deblochează telefonul și încarcă informațiile de plată"</string>
<string name="accessibility_menu" msgid="1982506521504867550">"Meniu"</string>
- <string name="error_generic" msgid="5736597066829262527">"A apărut o problemă la preluarea cardurilor. Încercați din nou mai târziu"</string>
+ <string name="error_generic" msgid="5736597066829262527">"A apărut o problemă la preluarea cardurilor. Încearcă din nou mai târziu."</string>
<string name="settings" msgid="4740257901811398113">"Setări"</string>
</resources>
diff --git a/src/com/android/systemui/plugin/globalactions/wallet/WalletPanelViewController.java b/src/com/android/systemui/plugin/globalactions/wallet/WalletPanelViewController.java
index 22165d4..4e9ce4f 100644
--- a/src/com/android/systemui/plugin/globalactions/wallet/WalletPanelViewController.java
+++ b/src/com/android/systemui/plugin/globalactions/wallet/WalletPanelViewController.java
@@ -24,6 +24,7 @@
import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon;
import android.os.Handler;
+import android.os.UserHandle;
import android.os.Looper;
import android.service.quickaccesswallet.GetWalletCardsError;
import android.service.quickaccesswallet.GetWalletCardsRequest;
@@ -361,7 +362,14 @@
*/
QAWalletCardViewInfo(WalletCard walletCard) {
mWalletCard = walletCard;
- mCardDrawable = mWalletCard.getCardImage().loadDrawable(mPluginContext);
+ Icon cardImage = mWalletCard.getCardImage();
+ if (cardImage.getType() == Icon.TYPE_URI) {
+ // Do not allow icon created with content URI.
+ mCardDrawable = null;
+ } else {
+ mCardDrawable =
+ mWalletCard.getCardImage().loadDrawable(mPluginContext);
+ }
Icon icon = mWalletCard.getCardIcon();
mIconDrawable = icon == null ? null : icon.loadDrawable(mPluginContext);
}
diff --git a/tests/robolectric/Android.bp b/tests/robolectric/Android.bp
index 2b3e0c9..dc49a46 100644
--- a/tests/robolectric/Android.bp
+++ b/tests/robolectric/Android.bp
@@ -30,5 +30,6 @@
"androidx.test.core",
"androidx.test.runner",
"androidx.test.ext.junit",
- ],
+ ],
+ upstream: true,
}
diff --git a/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/QuickAccessWalletClientTest.java b/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/QuickAccessWalletClientTest.java
index e11c356..4d9a042 100644
--- a/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/QuickAccessWalletClientTest.java
+++ b/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/QuickAccessWalletClientTest.java
@@ -33,7 +33,6 @@
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
-import android.os.Build;
import android.provider.Settings;
import android.service.quickaccesswallet.QuickAccessWalletClient;
@@ -58,7 +57,7 @@
* Ensures compatibility between the {@link QuickAccessWalletClient} and the plugin
*/
@RunWith(RobolectricTestRunner.class)
-@Config(sdk = Build.VERSION_CODES.R, shadows = {
+@Config(shadows = {
QuickAccessWalletClientTest.ShadowActivityManager.class,
QuickAccessWalletClientTest.ShadowLockPatternUtils.class})
public class QuickAccessWalletClientTest {
diff --git a/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/WalletPanelViewControllerTest.java b/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/WalletPanelViewControllerTest.java
index fedc25c..85c67c6 100644
--- a/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/WalletPanelViewControllerTest.java
+++ b/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/WalletPanelViewControllerTest.java
@@ -38,7 +38,6 @@
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon;
-import android.os.Build;
import android.service.quickaccesswallet.GetWalletCardsError;
import android.service.quickaccesswallet.GetWalletCardsRequest;
import android.service.quickaccesswallet.GetWalletCardsResponse;
@@ -69,7 +68,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowLog;
import java.util.Arrays;
@@ -78,7 +76,6 @@
@RunWith(RobolectricTestRunner.class)
-@Config(sdk = Build.VERSION_CODES.R)
public class WalletPanelViewControllerTest {
private static final int MAX_CARDS = 10;
diff --git a/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/WalletPluginServiceTest.java b/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/WalletPluginServiceTest.java
index aaf8a80..9205228 100644
--- a/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/WalletPluginServiceTest.java
+++ b/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/WalletPluginServiceTest.java
@@ -8,7 +8,6 @@
import android.content.ContentResolver;
import android.content.Context;
-import android.os.Build;
import android.provider.Settings;
import android.service.quickaccesswallet.QuickAccessWalletClient;
@@ -22,11 +21,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowLog;
@RunWith(RobolectricTestRunner.class)
-@Config(sdk = Build.VERSION_CODES.R)
public class WalletPluginServiceTest {
private final Context mContext = ApplicationProvider.getApplicationContext();
@@ -161,4 +158,4 @@
assertThat(viewController).isNull();
}
-}
\ No newline at end of file
+}
