Rename adapters to a more consistent plurality.
... really, this was just bugging me. I'm not trying to just pad
my CL count. ;)
Bug: 25343277
Change-Id: Ifa0e894415d64f373fc23b01eb6169b5fffd98ce
diff --git a/src/com/android/dialer/filterednumber/BlockedNumberAdapter.java b/src/com/android/dialer/filterednumber/BlockedNumbersAdapter.java
similarity index 93%
rename from src/com/android/dialer/filterednumber/BlockedNumberAdapter.java
rename to src/com/android/dialer/filterednumber/BlockedNumbersAdapter.java
index 76fc743..71a0547 100644
--- a/src/com/android/dialer/filterednumber/BlockedNumberAdapter.java
+++ b/src/com/android/dialer/filterednumber/BlockedNumbersAdapter.java
@@ -26,9 +26,9 @@
import com.android.dialer.calllog.ContactInfoHelper;
import com.android.dialer.database.FilteredNumberContract.FilteredNumberColumns;
-public class BlockedNumberAdapter extends NumberAdapter {
+public class BlockedNumbersAdapter extends NumbersAdapter {
- private BlockedNumberAdapter(
+ private BlockedNumbersAdapter(
Context context,
FragmentManager fragmentManager,
ContactInfoHelper contactInfoHelper,
@@ -36,9 +36,9 @@
super(context, fragmentManager, contactInfoHelper, contactPhotoManager);
}
- public static BlockedNumberAdapter newBlockedNumberAdapter(
+ public static BlockedNumbersAdapter newBlockedNumbersAdapter(
Context context, FragmentManager fragmentManager) {
- return new BlockedNumberAdapter(
+ return new BlockedNumbersAdapter(
context,
fragmentManager,
new ContactInfoHelper(context, GeoUtil.getCurrentCountryIso(context)),
diff --git a/src/com/android/dialer/filterednumber/BlockedNumbersFragment.java b/src/com/android/dialer/filterednumber/BlockedNumbersFragment.java
index 571c94b..3697888 100644
--- a/src/com/android/dialer/filterednumber/BlockedNumbersFragment.java
+++ b/src/com/android/dialer/filterednumber/BlockedNumbersFragment.java
@@ -47,7 +47,7 @@
implements LoaderManager.LoaderCallbacks<Cursor>, View.OnClickListener,
CallLogQueryHandler.Listener {
- private BlockedNumberAdapter mAdapter;
+ private BlockedNumbersAdapter mAdapter;
private CallLogQueryHandler mCallLogQueryHandler;
private VoicemailStatusHelper mVoicemailStatusHelper;
@@ -64,7 +64,7 @@
getListView().addHeaderView(inflater.inflate(R.layout.blocked_number_header, null));
if (mAdapter == null) {
- mAdapter = BlockedNumberAdapter.newBlockedNumberAdapter(
+ mAdapter = BlockedNumbersAdapter.newBlockedNumbersAdapter(
getContext(), getActivity().getFragmentManager());
}
setListAdapter(mAdapter);
diff --git a/src/com/android/dialer/filterednumber/NumberAdapter.java b/src/com/android/dialer/filterednumber/NumbersAdapter.java
similarity index 98%
rename from src/com/android/dialer/filterednumber/NumberAdapter.java
rename to src/com/android/dialer/filterednumber/NumbersAdapter.java
index b212fa3..1706107 100644
--- a/src/com/android/dialer/filterednumber/NumberAdapter.java
+++ b/src/com/android/dialer/filterednumber/NumbersAdapter.java
@@ -36,7 +36,7 @@
import com.android.dialer.calllog.ContactInfoHelper;
import com.android.dialer.util.PhoneNumberUtil;
-public class NumberAdapter extends SimpleCursorAdapter {
+public class NumbersAdapter extends SimpleCursorAdapter {
private Context mContext;
private FragmentManager mFragmentManager;
@@ -45,7 +45,7 @@
private BidiFormatter mBidiFormatter = BidiFormatter.getInstance();
private ContactPhotoManager mContactPhotoManager;
- public NumberAdapter(
+ public NumbersAdapter(
Context context,
FragmentManager fragmentManager,
ContactInfoHelper contactInfoHelper,
diff --git a/src/com/android/dialer/filterednumber/ViewNumbersToImportAdapter.java b/src/com/android/dialer/filterednumber/ViewNumbersToImportAdapter.java
index 40b81c7..58fe1d4 100644
--- a/src/com/android/dialer/filterednumber/ViewNumbersToImportAdapter.java
+++ b/src/com/android/dialer/filterednumber/ViewNumbersToImportAdapter.java
@@ -25,7 +25,7 @@
import com.android.dialer.R;
import com.android.dialer.calllog.ContactInfoHelper;
-public class ViewNumbersToImportAdapter extends NumberAdapter {
+public class ViewNumbersToImportAdapter extends NumbersAdapter {
private ViewNumbersToImportAdapter(
Context context,