diff options
author | sail <sail@google.com> | 2017-06-29 08:46:43 -0700 |
---|---|---|
committer | Brandon Maxwell <maxwelb@google.com> | 2017-06-30 14:41:54 -0700 |
commit | 3331545bd3fb769ae3f9246c0bd92fe35c6308ab (patch) | |
tree | 2b5082a7e55335c4ea0e91d82f90d34fa54acd05 /java/com/android/contacts/common/list | |
parent | 8fd3656537f791c05d24d68281e8f2282d4d1711 (diff) |
Automated g4 rollback of changelist 160202511.
*** Reason for rollback ***
Causes crash, see b/63127884
*** Original change description ***
All Fragments are now support library Fragments.
Switch a bunch of imports to support library Fragments (and Loaders) instead of framework Fragments (and Loaders). This was needed to use FragmentManager.isStateSaved() instead of manually tracking that state. This should reduce errors around committing after state is saved.
Also adds METADATA presubmit to prevent new usages of framework Fragments or Loaders.
***
Bug: 38241305,63127884
Test: N/A
PiperOrigin-RevId: 160530287
Change-Id: Ie2c4d3561ebea2d0f05097ce89bdd9bc8767c8cf
Diffstat (limited to 'java/com/android/contacts/common/list')
6 files changed, 10 insertions, 10 deletions
diff --git a/java/com/android/contacts/common/list/ContactEntryListAdapter.java b/java/com/android/contacts/common/list/ContactEntryListAdapter.java index 19e43d81e..7335297e0 100644 --- a/java/com/android/contacts/common/list/ContactEntryListAdapter.java +++ b/java/com/android/contacts/common/list/ContactEntryListAdapter.java @@ -16,6 +16,7 @@ package com.android.contacts.common.list; import android.content.Context; +import android.content.CursorLoader; import android.content.res.Resources; import android.database.Cursor; import android.net.Uri; @@ -24,7 +25,6 @@ import android.provider.ContactsContract; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Directory; -import android.support.v4.content.CursorLoader; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/java/com/android/contacts/common/list/ContactEntryListFragment.java b/java/com/android/contacts/common/list/ContactEntryListFragment.java index d39c5af5c..04658be89 100644 --- a/java/com/android/contacts/common/list/ContactEntryListFragment.java +++ b/java/com/android/contacts/common/list/ContactEntryListFragment.java @@ -16,7 +16,12 @@ package com.android.contacts.common.list; +import android.app.Fragment; +import android.app.LoaderManager; +import android.app.LoaderManager.LoaderCallbacks; import android.content.Context; +import android.content.CursorLoader; +import android.content.Loader; import android.database.Cursor; import android.os.Bundle; import android.os.Handler; @@ -24,11 +29,6 @@ import android.os.Message; import android.os.Parcelable; import android.provider.ContactsContract.Directory; import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.LoaderManager; -import android.support.v4.app.LoaderManager.LoaderCallbacks; -import android.support.v4.content.CursorLoader; -import android.support.v4.content.Loader; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.MotionEvent; diff --git a/java/com/android/contacts/common/list/DefaultContactListAdapter.java b/java/com/android/contacts/common/list/DefaultContactListAdapter.java index 115434e18..7bcae0e0e 100644 --- a/java/com/android/contacts/common/list/DefaultContactListAdapter.java +++ b/java/com/android/contacts/common/list/DefaultContactListAdapter.java @@ -16,6 +16,7 @@ package com.android.contacts.common.list; import android.content.Context; +import android.content.CursorLoader; import android.content.SharedPreferences; import android.database.Cursor; import android.net.Uri; @@ -25,7 +26,6 @@ import android.provider.ContactsContract; import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Directory; import android.provider.ContactsContract.SearchSnippets; -import android.support.v4.content.CursorLoader; import android.text.TextUtils; import android.view.View; import com.android.contacts.common.compat.ContactsCompat; diff --git a/java/com/android/contacts/common/list/DirectoryListLoader.java b/java/com/android/contacts/common/list/DirectoryListLoader.java index 89c6b2f4c..be62cc7a8 100644 --- a/java/com/android/contacts/common/list/DirectoryListLoader.java +++ b/java/com/android/contacts/common/list/DirectoryListLoader.java @@ -15,6 +15,7 @@ */ package com.android.contacts.common.list; +import android.content.AsyncTaskLoader; import android.content.Context; import android.content.pm.PackageManager; import android.database.ContentObserver; @@ -23,7 +24,6 @@ import android.database.MatrixCursor; import android.net.Uri; import android.os.Handler; import android.provider.ContactsContract.Directory; -import android.support.v4.content.AsyncTaskLoader; import android.text.TextUtils; import com.android.contacts.common.R; import com.android.contacts.common.compat.DirectoryCompat; diff --git a/java/com/android/contacts/common/list/PhoneNumberListAdapter.java b/java/com/android/contacts/common/list/PhoneNumberListAdapter.java index 395024708..d1118c3c7 100644 --- a/java/com/android/contacts/common/list/PhoneNumberListAdapter.java +++ b/java/com/android/contacts/common/list/PhoneNumberListAdapter.java @@ -17,6 +17,7 @@ package com.android.contacts.common.list; import android.content.Context; +import android.content.CursorLoader; import android.database.Cursor; import android.net.Uri; import android.net.Uri.Builder; @@ -26,7 +27,6 @@ import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.CommonDataKinds.SipAddress; import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Directory; -import android.support.v4.content.CursorLoader; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java b/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java index e9083ae78..558f3b209 100644 --- a/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java +++ b/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java @@ -17,11 +17,11 @@ package com.android.contacts.common.list; import android.content.ComponentName; import android.content.Intent; +import android.content.Loader; import android.database.Cursor; import android.os.Bundle; import android.support.annotation.MainThread; import android.support.annotation.Nullable; -import android.support.v4.content.Loader; import android.text.TextUtils; import android.util.ArraySet; import android.view.LayoutInflater; |