Visual makeover for infobars.

chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.infobar;
 
 import android.content.Context;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ClickableSpan;
 import android.view.View;
 import android.widget.CheckBox;
 
 import org.chromium.chrome.R;
 import org.chromium.ui.base.DeviceFormFactor;
 
 /**
  * Java version of the translate infobar
  */
-public class TranslateInfoBar extends TwoButtonInfoBar implements SubPanelListener {
+public class TranslateInfoBar extends InfoBar implements SubPanelListener {
     // Needs to be kept in sync with the Type enum in translate_infobar_delegate.h.
     public static final int BEFORE_TRANSLATE_INFOBAR = 0;
     public static final int TRANSLATING_INFOBAR = 1;
     public static final int AFTER_TRANSLATE_INFOBAR = 2;
     public static final int TRANSLATE_ERROR_INFOBAR = 3;
     public static final int MAX_INFOBAR_INDEX = 4;
 
     // Defines what subpanel needs to be shown, if any
     public static final int NO_PANEL = 0;
     public static final int LANGUAGE_PANEL = 1;
     public static final int NEVER_PANEL = 2;
     public static final int ALWAYS_PANEL = 3;
     public static final int MAX_PANEL_INDEX = 4;
 
     private int mInfoBarType;
     private final TranslateOptions mOptions;
     private int mOptionsPanelViewType;
     private TranslateSubPanel mSubPanel;
     private final boolean mShouldShowNeverBar;
     private final TranslateInfoBarDelegate mTranslateDelegate;
 
     public TranslateInfoBar(long nativeInfoBarPtr, TranslateInfoBarDelegate delegate,
             int infoBarType, int sourceLanguageIndex, int targetLanguageIndex,
             boolean autoTranslatePair, boolean shouldShowNeverBar,
             boolean triggeredFromMenu, String[] languages) {
-        super(null, R.drawable.infobar_translate);
-
+        super(null, R.drawable.infobar_translate, null);
         mTranslateDelegate = delegate;
         mOptions = new TranslateOptions(sourceLanguageIndex, targetLanguageIndex, languages,
                 autoTranslatePair, triggeredFromMenu);
         mInfoBarType = infoBarType;
         mShouldShowNeverBar = shouldShowNeverBar;
         mOptionsPanelViewType = NO_PANEL;
         setNativeInfoBar(nativeInfoBarPtr);
     }
 
     @Override
@@ skipping 44 matching lines @@
             case TranslateInfoBar.TRANSLATE_ERROR_INFOBAR:
                 // retry
                 action = InfoBar.ACTION_TYPE_TRANSLATE;
                 break;
             default:
                 break;
         }
         return action;
     }
 
-    @Override
-    public CharSequence getMessageText(Context context) {
+    private CharSequence getMessageText(Context context) {
         switch (getInfoBarType()) {
             case BEFORE_TRANSLATE_INFOBAR:
                 String template = context.getString(R.string.translate_infobar_text);
                 return formatBeforeInfoBarMessage(template, mOptions.sourceLanguage(),
                         mOptions.targetLanguage(), LANGUAGE_PANEL);
             case AFTER_TRANSLATE_INFOBAR:
                 String translated = context.getString(
                         R.string.translate_infobar_translation_done, mOptions.targetLanguage());
                 if (needsAlwaysPanel()) {
                     String moreOptions = context.getString(
                             R.string.translate_infobar_translation_more_options);
                     return formatAfterTranslateInfoBarMessage(translated, moreOptions,
                             ALWAYS_PANEL);
                 } else {
                     return translated;
                 }
             case TRANSLATING_INFOBAR:
                 return context.getString(R.string.translate_infobar_translating,
                         mOptions.targetLanguage());
             default:
                 return context.getString(R.string.translate_infobar_error);
         }
     }
 
-    @Override
-    public String getPrimaryButtonText(Context context) {
+    private String getPrimaryButtonText(Context context) {
         switch (getInfoBarType()) {
             case BEFORE_TRANSLATE_INFOBAR:
                 return context.getString(R.string.translate_button);
             case AFTER_TRANSLATE_INFOBAR:
                 if (!needsAlwaysPanel()) {
                     return context.getString(R.string.translate_button_done);
                 }
                 return null;
             case TRANSLATE_ERROR_INFOBAR:
                 return context.getString(R.string.translate_retry);
             default:
                 return null; // no inner buttons on the remaining infobars
         }
     }
 
-    @Override
-    public String getSecondaryButtonText(Context context) {
+    private String getSecondaryButtonText(Context context) {
         switch (getInfoBarType()) {
             case BEFORE_TRANSLATE_INFOBAR:
                 return context.getString(R.string.translate_nope);
             case AFTER_TRANSLATE_INFOBAR:
                 if (!needsAlwaysPanel()) {
                     return context.getString(R.string.translate_show_original);
                 }
                 return null;
             default:
                 return null;
         }
     }
 
     @Override
     public void createContent(InfoBarLayout layout) {
         if (mOptionsPanelViewType == NO_PANEL) {
             mSubPanel = null;
         } else {
             mSubPanel = panelFor(mOptionsPanelViewType);
             if (mSubPanel != null) {
                 mSubPanel.createContent(getContext(), layout);
             }
             return;
         }
 
+        Context context = layout.getContext();
+        layout.setMessage(getMessageText(context));
+        layout.setButtons(getPrimaryButtonText(context), getSecondaryButtonText(context));
+
         if (getInfoBarType() == AFTER_TRANSLATE_INFOBAR &&
                 !needsAlwaysPanel() &&
                 !mOptions.triggeredFromMenu()) {
             // Long always translate version
-             TranslateCheckBox checkBox = new TranslateCheckBox(mOptions, this);
-             checkBox.createContent(getContext(), layout);
+            TranslateCheckBox checkBox = new TranslateCheckBox(context, mOptions, this);
+            layout.setCustomContent(checkBox);
         }
-
-        super.createContent(layout);
     }
 
     // SubPanelListener implementation
     @Override
     public void onPanelClosed(int action) {
         setControlsEnabled(false);
         if (mOptionsPanelViewType == LANGUAGE_PANEL) {
             // Close the sub panel and show the infobar again.
             mOptionsPanelViewType = NO_PANEL;
             updateViewForCurrentState(createView());
@@ skipping 134 matching lines @@
     void changeInfoBarTypeAndNativePointer(int infoBarType, long newNativePointer) {
         if (infoBarType >= 0 && infoBarType < MAX_INFOBAR_INDEX) {
             mInfoBarType = infoBarType;
             replaceNativePointer(newNativePointer);
             updateViewForCurrentState(createView());
         } else {
             assert false : "Trying to change the InfoBar to a type that is invalid.";
         }
     }
 }