Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0364db7 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE - Merge Android 10 into master"

parents e3a35dc8 007ac2d5
Loading
Loading
Loading
Loading
+10 −10
Original line number Diff line number Diff line
<?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="recovery_installing" msgid="2013591905463558223">"Installing system update"</string>
    <string name="recovery_erasing" msgid="7334826894904037088">"Erasing"</string>
    <string name="recovery_no_command" msgid="4465476568623024327">"No command"</string>
    <string name="recovery_error" msgid="5748178989622716736">"Error!"</string>
    <string name="recovery_installing_security" msgid="9184031299717114342">"Installing security update"</string>
    <string name="recovery_wipe_data_menu_header" msgid="550255032058254478">"Cannot load Android system. Your data may be corrupt. If you continue to get this message, you may need to perform a factory data reset and erase all user data stored on this device."</string>
    <string name="recovery_try_again" msgid="7168248750158873496">"Try again"</string>
    <string name="recovery_factory_data_reset" msgid="7321351565602894783">"Factory data reset"</string>
    <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"Wipe all user data?\n\n THIS CAN NOT BE UNDONE!"</string>
    <string name="recovery_cancel_wipe_data" msgid="66987687653647384">"Cancel"</string>
    <string name="recovery_installing" msgid="2013591905463558223">"Installing system update"</string>
    <string name="recovery_erasing" msgid="7334826894904037088">"Erasing"</string>
    <string name="recovery_no_command" msgid="4465476568623024327">"No command"</string>
    <string name="recovery_error" msgid="5748178989622716736">"Error!"</string>
    <string name="recovery_installing_security" msgid="9184031299717114342">"Installing security update"</string>
    <string name="recovery_wipe_data_menu_header" msgid="550255032058254478">"Cannot load Android system. Your data may be corrupt. If you continue to get this message, you may need to perform a factory data reset and erase all user data stored on this device."</string>
    <string name="recovery_try_again" msgid="7168248750158873496">"Try again"</string>
    <string name="recovery_factory_data_reset" msgid="7321351565602894783">"Factory data reset"</string>
    <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"Wipe all user data?\n\n THIS CAN NOT BE UNDONE!"</string>
    <string name="recovery_cancel_wipe_data" msgid="66987687653647384">"Cancel"</string>
</resources>
+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ android_test {
    ],

    static_libs: [
        "android-support-test",
        "androidx.test.runner",
        "androidx.test.rules",
        "mockito-target-minus-junit4",
        "guava",
    ],
+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@
        <uses-library android:name="android.test.runner" />
    </application>

    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
                     android:targetPackage="com.example.android.systemupdatersample"
                     android:label="Tests for SystemUpdaterSample."/>

+4 −3
Original line number Diff line number Diff line
@@ -21,9 +21,10 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;

import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;

import com.example.android.systemupdatersample.tests.R;
import com.google.common.io.CharStreams;
+5 −4
Original line number Diff line number Diff line
@@ -30,10 +30,11 @@ import android.os.Bundle;
import android.os.ResultReceiver;
import android.os.UpdateEngine;
import android.os.UpdateEngineCallback;
import android.support.test.InstrumentationRegistry;
import android.support.test.annotation.UiThreadTest;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;

import androidx.test.InstrumentationRegistry;
import androidx.test.annotation.UiThreadTest;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;

import com.example.android.systemupdatersample.services.PrepareUpdateService;
import com.example.android.systemupdatersample.tests.R;
Loading