Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/StatusListItem.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/StatusListItem.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/StatusListItem.java |
index 09737987930009275f81fbcefa2d48f7dac3e1bd..61a9b29b002804281e548c7f608a6cbf41c35619 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/StatusListItem.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/StatusListItem.java |
@@ -4,35 +4,189 @@ |
package org.chromium.chrome.browser.ntp.cards; |
+import android.content.Context; |
import android.view.View; |
import android.view.View.OnClickListener; |
import android.widget.Button; |
+import android.widget.TextView; |
+import org.chromium.base.Log; |
import org.chromium.chrome.R; |
+import org.chromium.chrome.browser.ntp.NewTabPageView.NewTabPageManager; |
+import org.chromium.chrome.browser.ntp.snippets.DisabledReason; |
+import org.chromium.chrome.browser.preferences.PreferencesLauncher; |
+import org.chromium.chrome.browser.signin.AccountSigninActivity; |
+import org.chromium.chrome.browser.signin.SigninAccessPoint; |
+import org.chromium.chrome.browser.sync.ui.SyncCustomizationFragment; |
/** |
* Card that is shown when the user needs to be made aware of some information about their |
* configuration about the NTP suggestions: there is no more available suggested content, sync |
* should be enabled, etc. |
*/ |
-public class StatusListItem implements NewTabPageListItem { |
+public abstract class StatusListItem implements NewTabPageListItem { |
/** |
* ViewHolder for an item of type {@link #VIEW_TYPE_STATUS}. |
*/ |
public static class ViewHolder extends CardViewHolder { |
- public ViewHolder(NewTabPageRecyclerView parent, final NewTabPageAdapter adapter) { |
+ private final TextView mTitleView; |
+ private final TextView mBodyView; |
+ private final Button mActionView; |
+ |
+ public ViewHolder(NewTabPageRecyclerView parent) { |
super(R.layout.new_tab_page_status_card, parent); |
- Button reloadButton = ((Button) itemView.findViewById(R.id.reload_button)); |
- reloadButton.setOnClickListener(new OnClickListener() { |
+ mTitleView = (TextView) itemView.findViewById(R.id.status_title); |
+ mBodyView = (TextView) itemView.findViewById(R.id.status_body); |
+ mActionView = (Button) itemView.findViewById(R.id.status_action_button); |
+ } |
+ |
+ @Override |
+ public void onBindViewHolder(NewTabPageListItem item) { |
+ assert item instanceof StatusListItem; |
+ super.onBindViewHolder(item); |
+ |
+ final StatusListItem listItem = (StatusListItem) item; |
+ mTitleView.setText(listItem.mHeaderStringId); |
+ mBodyView.setText(listItem.mDescriptionStringId); |
+ mActionView.setText(listItem.mActionStringId); |
+ mActionView.setOnClickListener(new OnClickListener() { |
@Override |
public void onClick(View v) { |
- adapter.reloadSnippets(); |
+ listItem.performAction(v.getContext()); |
} |
}); |
} |
} |
+ private static class NoSnippets extends StatusListItem { |
+ private final NewTabPageAdapter mNewTabPageAdapter; |
+ |
+ public NoSnippets(NewTabPageAdapter adapter) { |
+ super(R.string.ntp_status_card_title_empty, |
+ R.string.ntp_status_card_body_empty, |
+ R.string.reload); |
+ mNewTabPageAdapter = adapter; |
+ Log.d(TAG, "Registering card for status: No Snippets"); |
+ } |
+ |
+ @Override |
+ protected void performAction(Context context) { |
+ mNewTabPageAdapter.reloadSnippets(); |
+ } |
+ } |
+ |
+ private static class SignedOut extends StatusListItem { |
+ public SignedOut() { |
+ super(R.string.ntp_status_card_generic_title, |
+ R.string.ntp_status_card_body_signed_out, |
+ R.string.sign_in_button); |
+ Log.d(TAG, "Registering card for status: User Signed out"); |
+ } |
+ |
+ @Override |
+ protected void performAction(Context context) { |
+ AccountSigninActivity.startIfAllowed(context, SigninAccessPoint.NTP_LINK); |
+ } |
+ } |
+ |
+ private static class SyncDisabled extends StatusListItem { |
+ public SyncDisabled() { |
+ super(R.string.ntp_status_card_generic_title, |
+ R.string.ntp_status_card_body_sync, |
+ R.string.ntp_status_card_action_sync); |
+ Log.d(TAG, "Registering card for status: Sync Disabled"); |
+ } |
+ |
+ @Override |
+ protected void performAction(Context context) { |
+ PreferencesLauncher.launchSettingsPage( |
+ context, SyncCustomizationFragment.class.getName()); |
+ } |
+ } |
+ |
+ private static class HistorySyncDisabled extends StatusListItem { |
+ public HistorySyncDisabled() { |
+ super(R.string.ntp_status_card_generic_title, |
+ R.string.ntp_status_card_body_history_sync, |
+ R.string.ntp_status_card_action_history_sync); |
+ Log.d(TAG, "Registering card for status: History Sync Disabled"); |
+ } |
+ |
+ @Override |
+ protected void performAction(Context context) { |
+ PreferencesLauncher.launchSettingsPage( |
+ context, SyncCustomizationFragment.class.getName()); |
+ } |
+ } |
+ |
+ private static class PassphraseEncryptionEnabled extends StatusListItem { |
+ private static final String HELP_URL = "https://support.google.com/chrome/answer/1181035"; |
+ private final NewTabPageManager mNewTabPageManager; |
+ |
+ public PassphraseEncryptionEnabled(NewTabPageManager manager) { |
+ super(R.string.ntp_status_card_generic_title, |
+ R.string.ntp_status_card_body_passphrase, |
+ R.string.learn_more); |
+ mNewTabPageManager = manager; |
+ Log.d(TAG, "Registering card for status: Passphrase Encryption Enabled"); |
+ } |
+ |
+ @Override |
+ protected void performAction(Context context) { |
+ mNewTabPageManager.openUrl(HELP_URL); |
+ } |
+ } |
+ |
+ private static final String TAG = "NtpCards"; |
+ |
+ private final int mHeaderStringId; |
+ private final int mDescriptionStringId; |
+ private final int mActionStringId; |
+ |
+ public static StatusListItem create( |
+ int disabledReason, NewTabPageAdapter adapter, NewTabPageManager manager) { |
+ switch (disabledReason) { |
+ case DisabledReason.NONE: |
+ return new NoSnippets(adapter); |
+ |
+ case DisabledReason.SIGNED_OUT: |
+ return new SignedOut(); |
+ |
+ case DisabledReason.SYNC_DISABLED: |
+ return new SyncDisabled(); |
+ |
+ case DisabledReason.PASSPHRASE_ENCRYPTION_ENABLED: |
+ return new PassphraseEncryptionEnabled(manager); |
+ |
+ case DisabledReason.HISTORY_SYNC_STATE_UNKNOWN: |
+ // This should only be a transient state: during app launch, or when the sync |
+ // settings are being modified, and the user should never see a card showing this. |
+ // So let's just use HistorySyncDisabled as fallback. If we add a spinner at some |
Bernhard Bauer
2016/06/16 14:03:35
Make it a TODO()?
dgn
2016/06/16 14:34:10
Done.
|
+ // point (e.g. to show that we are fetching snippets) we could use it here too. |
+ case DisabledReason.HISTORY_SYNC_DISABLED: |
+ return new HistorySyncDisabled(); |
+ |
+ case DisabledReason.EXPLICITLY_DISABLED: |
+ Log.wtf(TAG, "FATAL: Attempted to create a status card while the feature should be " |
+ + "off."); |
+ return null; |
+ |
+ default: |
+ Log.wtf(TAG, "FATAL: Attempted to create a status card for an unknown value: %d", |
+ disabledReason); |
+ return null; |
+ } |
+ } |
+ |
+ private StatusListItem(int headerStringId, int descriptionStringId, int actionStringId) { |
+ mHeaderStringId = headerStringId; |
+ mDescriptionStringId = descriptionStringId; |
+ mActionStringId = actionStringId; |
+ } |
+ |
+ protected abstract void performAction(Context context); |
+ |
@Override |
public int getType() { |
return NewTabPageListItem.VIEW_TYPE_STATUS; |