Migrated EmergencyInfo to androidx.
Test: make EmergencyInfo
Bug: 76692459
Change-Id: Ic4c4cc8a93ee5e5788d88ad31da98929b6dc9a66
Merged-In: Ic4c4cc8a93ee5e5788d88ad31da98929b6dc9a66
(cherry picked from commit 4b48b07b936283563c59c74c1a9cda0a2bc0ab10)
(cherry picked from commit 5635cac8f64934c4cb72e4ebf2b4c09e3ba3add4)
(cherry picked from commit 7399b9122cf868c46381fed32f6768c0934cce06)
diff --git a/Android.mk b/Android.mk
index fbdb14b..e9c6bad 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,14 +24,14 @@
LOCAL_PRIVILEGED_MODULE := true
LOCAL_STATIC_ANDROID_LIBRARIES := \
- android-support-v14-preference \
- android-support-v13 \
- android-support-v7-appcompat \
- android-support-v7-preference \
- android-support-v7-recyclerview \
- android-support-v4 \
- $(ANDROID_SUPPORT_DESIGN_TARGETS) \
- android-support-transition
+ androidx.legacy_legacy-preference-v14 \
+ androidx.legacy_legacy-support-v13 \
+ androidx.appcompat_appcompat \
+ androidx.preference_preference \
+ androidx.recyclerview_recyclerview \
+ androidx.legacy_legacy-support-v4 \
+ androidx.design_design \
+ androidx.transition_transition
LOCAL_USE_AAPT2 := true
diff --git a/proguard.flags b/proguard.flags
index 29911b8..69df085 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -1,10 +1,10 @@
# Retain all Preference classes, which the tests rely on.
--keep class android.support.v7.preference.Preference* {
+-keep class androidx.preference.Preference* {
*;
}
# Keep annotated classes or class members.
--keep @android.support.annotation.Keep class *
+-keep @androidx.annotation.Keep class *
-keepclassmembers class * {
- @android.support.annotation.Keep *;
+ @androidx.annotation.Keep *;
}
diff --git a/res/layout/tabs.xml b/res/layout/tabs.xml
index 61ddfc8..e91324c 100644
--- a/res/layout/tabs.xml
+++ b/res/layout/tabs.xml
@@ -26,7 +26,7 @@
android:background="?attr/colorPrimary"
android:elevation="@dimen/tab_elevation" />
- <android.support.v4.view.ViewPager
+ <androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="fill_parent" />
diff --git a/src/com/android/emergency/edit/EditInfoActivity.java b/src/com/android/emergency/edit/EditInfoActivity.java
index 39f6737..8f19692 100644
--- a/src/com/android/emergency/edit/EditInfoActivity.java
+++ b/src/com/android/emergency/edit/EditInfoActivity.java
@@ -27,8 +27,8 @@
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.os.Bundle;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.PreferenceManager;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.PreferenceManager;
import android.util.Pair;
import android.view.Menu;
import android.view.MenuInflater;
diff --git a/src/com/android/emergency/edit/EditInfoFragment.java b/src/com/android/emergency/edit/EditInfoFragment.java
index 006c725..2a1c911 100644
--- a/src/com/android/emergency/edit/EditInfoFragment.java
+++ b/src/com/android/emergency/edit/EditInfoFragment.java
@@ -22,10 +22,10 @@
import android.net.Uri;
import android.os.Bundle;
import android.provider.ContactsContract;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceManager;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceManager;
import android.util.Log;
import android.widget.Toast;
diff --git a/src/com/android/emergency/edit/EditMedicalInfoFragment.java b/src/com/android/emergency/edit/EditMedicalInfoFragment.java
index 1b0e3a3..d132c69 100644
--- a/src/com/android/emergency/edit/EditMedicalInfoFragment.java
+++ b/src/com/android/emergency/edit/EditMedicalInfoFragment.java
@@ -18,8 +18,8 @@
import android.app.DialogFragment;
import android.app.Fragment;
import android.os.Bundle;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.Preference;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.Preference;
import android.text.TextUtils;
import com.android.emergency.PreferenceKeys;
diff --git a/src/com/android/emergency/overlay/FeatureFactoryImpl.java b/src/com/android/emergency/overlay/FeatureFactoryImpl.java
index d25fd59..d963262 100644
--- a/src/com/android/emergency/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/emergency/overlay/FeatureFactoryImpl.java
@@ -2,7 +2,7 @@
import android.content.Context;
import android.net.Uri;
-import android.support.annotation.Keep;
+import androidx.annotation.Keep;
import com.android.emergency.edit.EmergencyContactsFeatureProvider;
import com.android.emergency.edit.EmergencyContactsFeatureProviderImpl;
diff --git a/src/com/android/emergency/preferences/AutoCompleteEditTextPreference.java b/src/com/android/emergency/preferences/AutoCompleteEditTextPreference.java
index ab3c6b4..a94576b 100644
--- a/src/com/android/emergency/preferences/AutoCompleteEditTextPreference.java
+++ b/src/com/android/emergency/preferences/AutoCompleteEditTextPreference.java
@@ -23,7 +23,7 @@
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
-import android.support.v14.preference.PreferenceDialogFragment;
+import androidx.preference.PreferenceDialogFragment;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.KeyEvent;
diff --git a/src/com/android/emergency/preferences/ContactPreference.java b/src/com/android/emergency/preferences/ContactPreference.java
index feb8d2d..459d1b8 100644
--- a/src/com/android/emergency/preferences/ContactPreference.java
+++ b/src/com/android/emergency/preferences/ContactPreference.java
@@ -28,10 +28,10 @@
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
import android.telecom.TelecomManager;
import android.text.BidiFormatter;
import android.text.TextDirectionHeuristics;
diff --git a/src/com/android/emergency/preferences/EmergencyContactsPreference.java b/src/com/android/emergency/preferences/EmergencyContactsPreference.java
index 5a811bf..4756c36 100644
--- a/src/com/android/emergency/preferences/EmergencyContactsPreference.java
+++ b/src/com/android/emergency/preferences/EmergencyContactsPreference.java
@@ -19,10 +19,10 @@
import android.content.SharedPreferences;
import android.content.res.TypedArray;
import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceManager;
+import androidx.annotation.NonNull;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
import android.util.AttributeSet;
import android.util.Log;
import android.widget.Toast;
diff --git a/src/com/android/emergency/preferences/EmergencyEditTextPreference.java b/src/com/android/emergency/preferences/EmergencyEditTextPreference.java
index 7a6cfe5..79c3b13 100644
--- a/src/com/android/emergency/preferences/EmergencyEditTextPreference.java
+++ b/src/com/android/emergency/preferences/EmergencyEditTextPreference.java
@@ -17,8 +17,8 @@
import android.content.Context;
import android.content.res.TypedArray;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.View;
diff --git a/src/com/android/emergency/preferences/EmergencyListPreference.java b/src/com/android/emergency/preferences/EmergencyListPreference.java
index 9b3b94a..b20a66e 100644
--- a/src/com/android/emergency/preferences/EmergencyListPreference.java
+++ b/src/com/android/emergency/preferences/EmergencyListPreference.java
@@ -17,8 +17,8 @@
import android.content.Context;
import android.content.res.TypedArray;
-import android.support.annotation.Nullable;
-import android.support.v7.preference.ListPreference;
+import androidx.annotation.Nullable;
+import androidx.preference.ListPreference;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextUtils;
diff --git a/src/com/android/emergency/preferences/NameAutoCompletePreference.java b/src/com/android/emergency/preferences/NameAutoCompletePreference.java
index 7af25e5..93c1e7e 100644
--- a/src/com/android/emergency/preferences/NameAutoCompletePreference.java
+++ b/src/com/android/emergency/preferences/NameAutoCompletePreference.java
@@ -17,7 +17,7 @@
import android.content.Context;
import android.os.UserManager;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.widget.ArrayAdapter;
diff --git a/src/com/android/emergency/preferences/ViewEmergencyContactsPreference.java b/src/com/android/emergency/preferences/ViewEmergencyContactsPreference.java
index e0d0a6a..48a4e6e 100644
--- a/src/com/android/emergency/preferences/ViewEmergencyContactsPreference.java
+++ b/src/com/android/emergency/preferences/ViewEmergencyContactsPreference.java
@@ -16,7 +16,7 @@
package com.android.emergency.preferences;
import android.content.Context;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
import android.util.AttributeSet;
/**
diff --git a/src/com/android/emergency/util/PreferenceUtils.java b/src/com/android/emergency/util/PreferenceUtils.java
index 0036a48..dfb386d 100644
--- a/src/com/android/emergency/util/PreferenceUtils.java
+++ b/src/com/android/emergency/util/PreferenceUtils.java
@@ -19,7 +19,7 @@
import android.content.Context;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
-import android.support.v7.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
import android.text.TextUtils;
import com.android.emergency.PreferenceKeys;
diff --git a/src/com/android/emergency/view/ViewEmergencyContactsFragment.java b/src/com/android/emergency/view/ViewEmergencyContactsFragment.java
index f9de3b6..88b9bd5 100644
--- a/src/com/android/emergency/view/ViewEmergencyContactsFragment.java
+++ b/src/com/android/emergency/view/ViewEmergencyContactsFragment.java
@@ -19,8 +19,8 @@
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.PreferenceManager;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.PreferenceManager;
import android.widget.ListView;
import com.android.emergency.PreferenceKeys;
diff --git a/src/com/android/emergency/view/ViewEmergencyInfoFragment.java b/src/com/android/emergency/view/ViewEmergencyInfoFragment.java
index 1d35e73..87f73e3 100644
--- a/src/com/android/emergency/view/ViewEmergencyInfoFragment.java
+++ b/src/com/android/emergency/view/ViewEmergencyInfoFragment.java
@@ -17,9 +17,9 @@
import android.app.Fragment;
import android.os.Bundle;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceManager;
+import androidx.preference.PreferenceFragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
import com.android.emergency.PreferenceKeys;
import com.android.emergency.R;
diff --git a/src/com/android/emergency/view/ViewInfoActivity.java b/src/com/android/emergency/view/ViewInfoActivity.java
index cc0b62a..87b46ff 100644
--- a/src/com/android/emergency/view/ViewInfoActivity.java
+++ b/src/com/android/emergency/view/ViewInfoActivity.java
@@ -21,13 +21,13 @@
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
import android.support.design.widget.TabLayout;
import android.support.design.widget.TabLayout.TabLayoutOnPageChangeListener;
import android.support.design.widget.TabLayout.ViewPagerOnTabSelectedListener;
-import android.support.v13.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.preference.PreferenceManager;
+import androidx.legacy.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.preference.PreferenceManager;
import android.text.TextUtils;
import android.util.Pair;
import android.view.Menu;
diff --git a/tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java b/tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java
index caddd12..7aac1bf 100644
--- a/tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java
+++ b/tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java
@@ -29,9 +29,9 @@
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.net.Uri;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
import com.android.emergency.ContactTestUtils;
import com.android.emergency.EmergencyContactManager;
diff --git a/tests/robolectric/src/com/android/emergency/preferences/EmergencyEditTextPreferenceTest.java b/tests/robolectric/src/com/android/emergency/preferences/EmergencyEditTextPreferenceTest.java
index fbac306..31315e2 100644
--- a/tests/robolectric/src/com/android/emergency/preferences/EmergencyEditTextPreferenceTest.java
+++ b/tests/robolectric/src/com/android/emergency/preferences/EmergencyEditTextPreferenceTest.java
@@ -23,9 +23,9 @@
import android.content.Context;
import android.content.SharedPreferences;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
import com.android.emergency.PreferenceKeys;
import com.android.emergency.TestConfig;
diff --git a/tests/robolectric/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java b/tests/robolectric/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java
index df7eb1b..5c951e2 100644
--- a/tests/robolectric/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java
+++ b/tests/robolectric/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java
@@ -23,9 +23,9 @@
import android.content.Context;
import android.content.SharedPreferences;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import com.android.emergency.PreferenceKeys;
diff --git a/tests/robolectric/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java b/tests/robolectric/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java
index c191325..8ae9bbf 100644
--- a/tests/robolectric/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java
+++ b/tests/robolectric/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java
@@ -25,9 +25,9 @@
import android.content.Context;
import android.content.SharedPreferences;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
import android.text.Editable;
import android.view.View;
import android.widget.AutoCompleteTextView;
diff --git a/tests/unit/src/com/android/emergency/edit/EditInfoActivityTest.java b/tests/unit/src/com/android/emergency/edit/EditInfoActivityTest.java
index e0049b6..d266cc3 100644
--- a/tests/unit/src/com/android/emergency/edit/EditInfoActivityTest.java
+++ b/tests/unit/src/com/android/emergency/edit/EditInfoActivityTest.java
@@ -33,9 +33,9 @@
import android.provider.ContactsContract;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceManager;
import com.android.emergency.ContactTestUtils;
import com.android.emergency.PreferenceKeys;
diff --git a/tests/unit/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java b/tests/unit/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java
index 5b451de..ea464ae 100644
--- a/tests/unit/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java
+++ b/tests/unit/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java
@@ -31,7 +31,7 @@
import android.support.test.espresso.UiController;
import android.support.test.espresso.ViewAction;
import android.support.test.runner.AndroidJUnit4;
-import android.support.v7.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
import android.view.View;
import com.android.emergency.ContactTestUtils;
diff --git a/tests/unit/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java b/tests/unit/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java
index 7323568..e733672 100644
--- a/tests/unit/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java
+++ b/tests/unit/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java
@@ -22,7 +22,7 @@
import android.content.Intent;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
-import android.support.v7.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
import android.text.SpannableString;
import android.text.style.TtsSpan;
diff --git a/tests/unit/src/com/android/emergency/view/ViewInfoActivityTest.java b/tests/unit/src/com/android/emergency/view/ViewInfoActivityTest.java
index ab1c128..5f8ae78 100644
--- a/tests/unit/src/com/android/emergency/view/ViewInfoActivityTest.java
+++ b/tests/unit/src/com/android/emergency/view/ViewInfoActivityTest.java
@@ -21,7 +21,7 @@
import android.app.Instrumentation;
import android.content.Context;
import android.content.Intent;
-import android.support.v7.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import android.support.test.uiautomator.UiDevice;
