Snap for 9847922 from 978c9b59c4142f37f052ff845a5ea86929ca1ebd to mainline-cellbroadcast-release
Change-Id: Ia8a31c1f1442a0977d792e508783b46bb0246179
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b509ebe..015d4f4 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -40,7 +40,7 @@
<string name="deletion_helper_clear_dialog_remove" msgid="863575755467985516">"Libera spazio"</string>
<string name="deletion_helper_upsell_title" msgid="8512037674466762017">"Gestire automaticamente lo spazio di archiviazione?"</string>
<string name="deletion_helper_upsell_summary" msgid="2301597713694474407">"<xliff:g id="USED">%1$s</xliff:g> liberi. Vuoi consentire a Gestione archiviazione di liberare spazio automaticamente rimuovendo dal dispositivo i contenuti di cui hai eseguito il backup?"</string>
- <string name="deletion_helper_upsell_cancel" msgid="7084167642850053889">"No grazie"</string>
+ <string name="deletion_helper_upsell_cancel" msgid="7084167642850053889">"No, grazie"</string>
<string name="deletion_helper_upsell_activate" msgid="7157360257760895976">"Attiva"</string>
<string name="deletion_helper_apps_group_title" msgid="2578309121350341258">"App meno utilizzate"</string>
<!-- no translation found for deletion_helper_apps_group_summary (360315517252452356) -->
diff --git a/robotests/Android.bp b/robotests/Android.bp
index c6ea51f..44a8845 100644
--- a/robotests/Android.bp
+++ b/robotests/Android.bp
@@ -15,8 +15,8 @@
libs: [
"robolectric_android-all-stub",
- "Robolectric_all-target",
- "mockito-robolectric-prebuilt",
+ //"Robolectric_all-target",
+ //"mockito-robolectric-prebuilt",
"truth-prebuilt",
],
@@ -25,4 +25,5 @@
test_options: {
timeout: 36000,
},
+ upstream: true,
}
diff --git a/robotests/config/robolectric.properties b/robotests/config/robolectric.properties
index 850557a..2a9e50d 100644
--- a/robotests/config/robolectric.properties
+++ b/robotests/config/robolectric.properties
@@ -1 +1,2 @@
-sdk=NEWEST_SDK
\ No newline at end of file
+sdk=NEWEST_SDK
+instrumentedPackages=androidx.preference
diff --git a/robotests/src/com/android/storagemanager/automatic/AutomaticStorageManagementJobServiceTest.java b/robotests/src/com/android/storagemanager/automatic/AutomaticStorageManagementJobServiceTest.java
index 0ccc893..c9ffb21 100644
--- a/robotests/src/com/android/storagemanager/automatic/AutomaticStorageManagementJobServiceTest.java
+++ b/robotests/src/com/android/storagemanager/automatic/AutomaticStorageManagementJobServiceTest.java
@@ -26,6 +26,7 @@
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import static org.robolectric.annotation.LooperMode.Mode.LEGACY;
import android.app.NotificationManager;
import android.app.job.JobParameters;
@@ -49,6 +50,7 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.LooperMode;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@@ -60,6 +62,7 @@
import java.util.List;
@RunWith(RobolectricTestRunner.class)
+@LooperMode(LEGACY)
public class AutomaticStorageManagementJobServiceTest {
@Mock private BatteryManager mBatteryManager;
@Mock private NotificationManager mNotificationManager;
diff --git a/robotests/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroupTest.java b/robotests/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroupTest.java
index 892ae78..10e6fb4 100644
--- a/robotests/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroupTest.java
+++ b/robotests/src/com/android/storagemanager/deletionhelper/CollapsibleCheckboxPreferenceGroupTest.java
@@ -18,6 +18,7 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
+import static org.robolectric.annotation.LooperMode.Mode.LEGACY;
import android.content.Context;
import android.view.LayoutInflater;
@@ -31,11 +32,13 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.LooperMode;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
+@LooperMode(LEGACY)
public class CollapsibleCheckboxPreferenceGroupTest {
private Context mContext;
diff --git a/robotests/src/com/android/storagemanager/deletionhelper/PhotosDeletionPreferenceTest.java b/robotests/src/com/android/storagemanager/deletionhelper/PhotosDeletionPreferenceTest.java
index d3f44ff..e122c24 100644
--- a/robotests/src/com/android/storagemanager/deletionhelper/PhotosDeletionPreferenceTest.java
+++ b/robotests/src/com/android/storagemanager/deletionhelper/PhotosDeletionPreferenceTest.java
@@ -27,14 +27,17 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.LooperMode;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
+import static org.robolectric.annotation.LooperMode.Mode.LEGACY;
@RunWith(RobolectricTestRunner.class)
+@LooperMode(LEGACY)
public class PhotosDeletionPreferenceTest {
private PreferenceViewHolder mHolder;
private PhotosDeletionPreference mPreference;