From 3c4d041b925bd45da88d20a88f819b8d02ef9aa5 Mon Sep 17 00:00:00 2001 From: Brian Attwell Date: Fri, 29 May 2015 11:21:32 -0700 Subject: Use new definitions of ProviderStatus And rebundle Contacts again. Bug: 21090207 Change-Id: I7e93e36ad0c0d667ac56983c76acb1b97bd8755c --- .../contacts/list/ContactsUnavailableFragment.java | 16 +++------------- src/com/android/contacts/list/ProviderStatusWatcher.java | 6 +++--- 2 files changed, 6 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/com/android/contacts/list/ContactsUnavailableFragment.java b/src/com/android/contacts/list/ContactsUnavailableFragment.java index 48c4e9efd..c1b2c410f 100644 --- a/src/com/android/contacts/list/ContactsUnavailableFragment.java +++ b/src/com/android/contacts/list/ContactsUnavailableFragment.java @@ -88,7 +88,7 @@ public class ContactsUnavailableFragment extends Fragment implements OnClickList return; } switch (providerStatus) { - case ProviderStatus.STATUS_NO_ACCOUNTS_NO_CONTACTS: + case ProviderStatus.STATUS_EMPTY: setMessageText(mNoContactsMsgResId, mNSecNoContactsMsgResId); mCreateContactButton.setVisibility(View.VISIBLE); mAddAccountButton.setVisibility(View.VISIBLE); @@ -96,17 +96,7 @@ public class ContactsUnavailableFragment extends Fragment implements OnClickList mProgress.setVisibility(View.GONE); break; - case ProviderStatus.STATUS_CHANGING_LOCALE: - mMessageView.setText(R.string.locale_change_in_progress); - mMessageView.setGravity(Gravity.CENTER_HORIZONTAL); - mMessageView.setVisibility(View.VISIBLE); - mCreateContactButton.setVisibility(View.GONE); - mAddAccountButton.setVisibility(View.GONE); - mImportContactsButton.setVisibility(View.GONE); - mProgress.setVisibility(View.VISIBLE); - break; - - case ProviderStatus.STATUS_UPGRADING: + case ProviderStatus.STATUS_BUSY: mMessageView.setText(R.string.upgrade_in_progress); mMessageView.setGravity(Gravity.CENTER_HORIZONTAL); mMessageView.setVisibility(View.VISIBLE); @@ -144,7 +134,7 @@ public class ContactsUnavailableFragment extends Fragment implements OnClickList mNoContactsMsgResId = resId; mNSecNoContactsMsgResId = secResId; if ((mMessageView != null) && (mProviderStatus != null) && - (mProviderStatus.equals(ProviderStatus.STATUS_NO_ACCOUNTS_NO_CONTACTS))) { + (mProviderStatus.equals(ProviderStatus.STATUS_EMPTY))) { if (resId != -1) { mMessageView.setText(mNoContactsMsgResId); mMessageView.setGravity(Gravity.CENTER_HORIZONTAL); diff --git a/src/com/android/contacts/list/ProviderStatusWatcher.java b/src/com/android/contacts/list/ProviderStatusWatcher.java index 23ae4d5b4..f42bc3e96 100644 --- a/src/com/android/contacts/list/ProviderStatusWatcher.java +++ b/src/com/android/contacts/list/ProviderStatusWatcher.java @@ -167,16 +167,16 @@ public class ProviderStatusWatcher extends ContentObserver { * provider?) this may still cause ANRs. * * In order to avoid that, if we can't load the status within {@link #LOAD_WAIT_TIMEOUT_MS}, - * we'll give up and just returns {@link ProviderStatus#STATUS_UPGRADING} in order to unblock + * we'll give up and just returns {@link ProviderStatus#STATUS_BUSY} in order to unblock * the UI thread. The actual result will be delivered later via {@link ProviderStatusListener}. - * (If {@link ProviderStatus#STATUS_UPGRADING} is returned, the app (should) shows an according + * (If {@link ProviderStatus#STATUS_BUSY} is returned, the app (should) shows an according * message, like "contacts are being updated".) */ public int getProviderStatus() { waitForLoaded(); if (mProviderStatus == null) { - return ProviderStatus.STATUS_UPGRADING; + return ProviderStatus.STATUS_BUSY; } return mProviderStatus; -- cgit v1.2.3