Migrated EmergencyInfo to androidx

Test: make RunEmergencyInfoRoboTests
Bug: 119329752
Change-Id: I02b5d961bf3c4e8a0e1ef3476ecd5dd5de94e78a

3 files changed, 12 insertions, 12 deletions

diff --git a/src/com/android/emergency/view/ViewEmergencyContactsFragment.java b/src/com/android/emergency/view/ViewEmergencyContactsFragment.java
index 88b9bd53..689edef2 100644
--- a/src/com/android/emergency/view/ViewEmergencyContactsFragment.java
+++ b/src/com/android/emergency/view/ViewEmergencyContactsFragment.java
@@ -15,11 +15,11 @@
  */
 package com.android.emergency.view;
 
-import android.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import androidx.preference.PreferenceFragment;
+import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 import android.widget.ListView;
 
@@ -30,7 +30,7 @@ import com.android.emergency.preferences.EmergencyContactsPreference;
 /**
  * Fragment that displays emergency contacts.
  */
-public class ViewEmergencyContactsFragment extends PreferenceFragment {
+public class ViewEmergencyContactsFragment extends PreferenceFragmentCompat {
     /** The category that holds the emergency contacts. */
     private EmergencyContactsPreference mEmergencyContactsPreference;
 
diff --git a/src/com/android/emergency/view/ViewEmergencyInfoFragment.java b/src/com/android/emergency/view/ViewEmergencyInfoFragment.java
index 87f73e38..4efcca0e 100644
--- a/src/com/android/emergency/view/ViewEmergencyInfoFragment.java
+++ b/src/com/android/emergency/view/ViewEmergencyInfoFragment.java
@@ -15,9 +15,9 @@
  */
 package com.android.emergency.view;
 
-import android.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.os.Bundle;
-import androidx.preference.PreferenceFragment;
+import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceManager;
 
@@ -31,7 +31,7 @@ import java.util.List;
 /**
  * Fragment that displays personal and medical information.
  */
-public class ViewEmergencyInfoFragment extends PreferenceFragment {
+public class ViewEmergencyInfoFragment extends PreferenceFragmentCompat {
     /** A list with all the preferences. */
     private final List<Preference> mPreferences = new ArrayList<Preference>();
 
diff --git a/src/com/android/emergency/view/ViewInfoActivity.java b/src/com/android/emergency/view/ViewInfoActivity.java
index 68dc0dbd..dcdc579e 100644
--- a/src/com/android/emergency/view/ViewInfoActivity.java
+++ b/src/com/android/emergency/view/ViewInfoActivity.java
@@ -15,9 +15,9 @@
  */
 package com.android.emergency.view;
 
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentManager;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -30,7 +30,7 @@ import android.os.UserManager;
 import android.support.design.widget.TabLayout;
 import android.support.design.widget.TabLayout.TabLayoutOnPageChangeListener;
 import android.support.design.widget.TabLayout.ViewPagerOnTabSelectedListener;
-import androidx.legacy.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 import androidx.preference.PreferenceManager;
 import android.text.TextUtils;
@@ -59,7 +59,7 @@ import java.util.ArrayList;
 /**
  * Activity for viewing emergency information.
  */
-public class ViewInfoActivity extends Activity {
+public class ViewInfoActivity extends FragmentActivity {
     private ImageView mPersonalCardLargeIcon;
     private TextView mPersonalCardLargeItem;
     private SharedPreferences mSharedPreferences;
@@ -206,7 +206,7 @@ public class ViewInfoActivity extends Activity {
         if (mTabsAdapter == null) {
             // The viewpager that will host the section contents.
             ViewPager viewPager = (ViewPager) findViewById(R.id.view_pager);
-            mTabsAdapter = new ViewPagerAdapter(getFragmentManager());
+            mTabsAdapter = new ViewPagerAdapter(getSupportFragmentManager());
             viewPager.setAdapter(mTabsAdapter);
             mTabLayout.setTabsFromPagerAdapter(mTabsAdapter);