Change text size in Android omnibox suggestions to 16sp.

chrome/android/java/src/org/chromium/chrome/browser/omnibox/SuggestionView.java

 // Copyright 2015 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.omnibox;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
+import android.support.annotation.IntDef;
 import android.support.v4.view.ViewCompat;
 import android.support.v7.app.AlertDialog;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextPaint;
 import android.text.TextUtils;
 import android.text.style.StyleSpan;
 import android.util.TypedValue;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.TextView.BufferType;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.omnibox.OmniboxResultsAdapter.OmniboxResultItem;
 import org.chromium.chrome.browser.omnibox.OmniboxResultsAdapter.OmniboxSuggestionDelegate;
 import org.chromium.chrome.browser.omnibox.OmniboxSuggestion.MatchClassification;
 import org.chromium.chrome.browser.widget.TintedDrawable;
 import org.chromium.ui.base.DeviceFormFactor;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Container view for omnibox suggestions made very specific for omnibox suggestions to minimize
  * any unnecessary measures and layouts.
  */
 class SuggestionView extends ViewGroup {
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({
+            SUGGESTION_ICON_UNDEFINED,
+            SUGGESTION_ICON_BOOKMARK,
+            SUGGESTION_ICON_HISTORY,
+            SUGGESTION_ICON_GLOBE,
+            SUGGESTION_ICON_MAGNIFIER,
+            SUGGESTION_ICON_VOICE
+    })
+    private @interface SuggestionIcon {}
+
     private static final int SUGGESTION_ICON_UNDEFINED = -1;
     private static final int SUGGESTION_ICON_BOOKMARK = 0;
     private static final int SUGGESTION_ICON_HISTORY = 1;
     private static final int SUGGESTION_ICON_GLOBE = 2;
     private static final int SUGGESTION_ICON_MAGNIFIER = 3;
     private static final int SUGGESTION_ICON_VOICE = 4;
 
-    private static final int FIRST_LINE_TEXT_SIZE_SP = 17;
-    private static final int SECOND_LINE_TEXT_SIZE_SP = 14;
-
     private static final long RELAYOUT_DELAY_MS = 20;
 
     static final int TITLE_COLOR_STANDARD_FONT_DARK = 0xFF333333;
     private static final int TITLE_COLOR_STANDARD_FONT_LIGHT = 0xFFFFFFFF;
     private static final int URL_COLOR = 0xFF5595FE;
 
-    private static final int ANSWER_LINE2_VERTICAL_SPACING_DP = 3;
-    private static final int ANSWER_IMAGE_VERTICAL_SPACING_DP =
-            ANSWER_LINE2_VERTICAL_SPACING_DP + 2;
-    private static final int ANSWER_IMAGE_HORIZONTAL_SPACING_DP = 4;
     private static final float ANSWER_IMAGE_SCALING_FACTOR = 1.15f;
 
-    private LocationBar mLocationBar;
+    private final LocationBar mLocationBar;
     private UrlBar mUrlBar;
     private ImageView mNavigationButton;
 
-    private int mSuggestionHeight;
-    private int mSuggestionAnswerHeight;
+    private final int mSuggestionHeight;
+    private final int mSuggestionAnswerHeight;
 
     private OmniboxResultItem mSuggestionItem;
     private OmniboxSuggestion mSuggestion;
     private OmniboxSuggestionDelegate mSuggestionDelegate;
     private Boolean mUseDarkColors;
     private int mPosition;
 
-    private SuggestionContentsContainer mContentsView;
+    private final SuggestionContentsContainer mContentsView;
 
-    private int mRefineWidth;
-    private View mRefineView;
+    private final int mRefineWidth;
+    private final View mRefineView;
     private TintedDrawable mRefineIcon;
 
     private final int[] mViewPositionHolder = new int[2];
 
-    // The offset for the phone's suggestions left-alignment.
-    private static final int PHONE_URL_BAR_LEFT_OFFSET_DP = 10;
-    private static final int PHONE_URL_BAR_LEFT_OFFSET_RTL_DP = 46;
     // Pre-computed offsets in px.
     private final int mPhoneUrlBarLeftOffsetPx;
     private final int mPhoneUrlBarLeftOffsetRtlPx;
 
     /**
      * Constructs a new omnibox suggestion view.
      *
      * @param context The context used to construct the suggestion view.
      * @param locationBar The location bar showing these suggestions.
      */
@@ skipping 57 matching lines @@
         // Although this has the same background as the suggestion view, it can not be shared as
         // it will result in the state of the drawable being shared and always showing up in the
         // refine view.
         mRefineView.setBackground(itemBackground.getConstantState().newDrawable());
         mRefineView.setId(R.id.refine_view_id);
         mRefineView.setClickable(true);
         mRefineView.setFocusable(true);
         mRefineView.setLayoutParams(new LayoutParams(0, 0));
         addView(mRefineView);
 
-        mRefineWidth = (int) (getResources().getDisplayMetrics().density * 48);
+        mRefineWidth = getResources()
+                .getDimensionPixelSize(R.dimen.omnibox_suggestion_refine_width);
 
         mUrlBar = (UrlBar) locationBar.getContainerView().findViewById(R.id.url_bar);
 
-        mPhoneUrlBarLeftOffsetPx = Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
-                PHONE_URL_BAR_LEFT_OFFSET_DP,
-                getContext().getResources().getDisplayMetrics()));
-        mPhoneUrlBarLeftOffsetRtlPx = Math.round(TypedValue.applyDimension(
-                TypedValue.COMPLEX_UNIT_DIP,
-                PHONE_URL_BAR_LEFT_OFFSET_RTL_DP,
-                getContext().getResources().getDisplayMetrics()));
+        mPhoneUrlBarLeftOffsetPx = getResources().getDimensionPixelOffset(
+                R.dimen.omnibox_suggestion_phone_url_bar_left_offset);
+        mPhoneUrlBarLeftOffsetRtlPx = getResources().getDimensionPixelOffset(
+                R.dimen.omnibox_suggestion_phone_url_bar_left_offset_rtl);
     }
 
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         if (getMeasuredWidth() == 0) return;
 
         if (mSuggestion.getType() != OmniboxSuggestionType.SEARCH_SUGGEST_TAIL) {
             mContentsView.resetTextWidths();
         }
 
         boolean refineVisible = mRefineView.getVisibility() == VISIBLE;
         boolean isRtl = ApiCompatibilityUtils.isLayoutRtl(this);
-        int contentsViewOffsetX = isRtl ? mRefineWidth : 0;
-        if (!refineVisible) contentsViewOffsetX = 0;
+        int contentsViewOffsetX = isRtl && refineVisible ? mRefineWidth : 0;
         mContentsView.layout(
                 contentsViewOffsetX,
                 0,
                 contentsViewOffsetX + mContentsView.getMeasuredWidth(),
                 mContentsView.getMeasuredHeight());
         int refineViewOffsetX = isRtl ? 0 : getMeasuredWidth() - mRefineWidth;
         mRefineView.layout(
                 refineViewOffsetX,
                 0,
                 refineViewOffsetX + mRefineWidth,
@@ skipping 69 matching lines @@
         mSuggestionItem = suggestionItem;
         mSuggestion = suggestionItem.getSuggestion();
         mSuggestionDelegate = suggestionDelegate;
         // Reset old computations.
         mContentsView.resetTextWidths();
         mContentsView.mAnswerImage.setVisibility(GONE);
         mContentsView.mAnswerImage.getLayoutParams().height = 0;
         mContentsView.mAnswerImage.getLayoutParams().width = 0;
         mContentsView.mAnswerImage.setImageDrawable(null);
         mContentsView.mAnswerImageMaxSize = 0;
-        mContentsView.mTextLine1.setTextSize(FIRST_LINE_TEXT_SIZE_SP);
-        mContentsView.mTextLine2.setTextSize(SECOND_LINE_TEXT_SIZE_SP);
+        mContentsView.mTextLine1.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources()
+                .getDimension(R.dimen.omnibox_suggestion_first_line_text_size));
+        mContentsView.mTextLine2.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources()
+                .getDimension(R.dimen.omnibox_suggestion_second_line_text_size));
 
         // Suggestions with attached answers are rendered with rich results regardless of which
         // suggestion type they are.
         if (mSuggestion.hasAnswer()) {
             setAnswer(mSuggestion.getAnswer());
             mContentsView.setSuggestionIcon(SUGGESTION_ICON_MAGNIFIER, colorsChanged);
             mContentsView.mTextLine2.setVisibility(VISIBLE);
             setRefinable(true);
             return;
         }
@@ skipping 12 matching lines @@
             boolean urlShown = !TextUtils.isEmpty(mSuggestion.getUrl());
             boolean urlHighlighted = false;
             if (urlShown) {
                 urlHighlighted = setUrlText(suggestionItem);
             } else {
                 mContentsView.mTextLine2.setVisibility(INVISIBLE);
             }
             setSuggestedQuery(suggestionItem, true, urlShown, urlHighlighted);
             setRefinable(!sameAsTyped);
         } else {
-            int suggestionIcon = SUGGESTION_ICON_MAGNIFIER;
+            @SuggestionIcon int suggestionIcon = SUGGESTION_ICON_MAGNIFIER;
             if (suggestionType == OmniboxSuggestionType.VOICE_SUGGEST) {
                 suggestionIcon = SUGGESTION_ICON_VOICE;
             } else if ((suggestionType == OmniboxSuggestionType.SEARCH_SUGGEST_PERSONALIZED)
                     || (suggestionType == OmniboxSuggestionType.SEARCH_HISTORY)) {
                 // Show history icon for suggestions based on user queries.
                 suggestionIcon = SUGGESTION_ICON_HISTORY;
             }
             mContentsView.setSuggestionIcon(suggestionIcon, colorsChanged);
             setRefinable(!sameAsTyped);
             setSuggestedQuery(suggestionItem, false, false, false);
@@ skipping 241 matching lines @@
 
     /**
      * Container view for the contents of the suggestion (the search query, URL, and suggestion type
      * icon).
      */
     private class SuggestionContentsContainer extends ViewGroup implements OnLayoutChangeListener {
         private int mSuggestionIconLeft = Integer.MIN_VALUE;
         private int mTextLeft = Integer.MIN_VALUE;
         private int mTextRight = Integer.MIN_VALUE;
         private Drawable mSuggestionIcon;
+        @SuggestionIcon
         private int mSuggestionIconType = SUGGESTION_ICON_UNDEFINED;
 
         private final TextView mTextLine1;
         private final TextView mTextLine2;
         private final ImageView mAnswerImage;
 
         private int mAnswerImageMaxSize;  // getMaxWidth() is API 16+, so store it locally.
         private float mRequiredWidth;
         private float mMatchContentsWidth;
         private boolean mForceIsFocused;
@@ skipping 134 matching lines @@
                 } else {
                     verticalOffset = height - line2Height;
                 }
             } else {
                 // The text lines fit comfortably, so vertically center them.
                 verticalOffset = (height - line1Height - line2Height) / 2;
                 if (child == mTextLine2) {
                     verticalOffset += line1Height;
                     if (mSuggestion.hasAnswer()
                             && mSuggestion.getAnswer().getSecondLine().hasImage()) {
-                        verticalOffset += ANSWER_LINE2_VERTICAL_SPACING_DP
-                                * getResources().getDisplayMetrics().density;
+                        verticalOffset += getResources().getDimensionPixelOffset(
+                                R.dimen.omnibox_suggestion_answer_line2_vertical_spacing);
                     }
                 }
                 // When one line is larger than the other, it contains extra vertical padding. This
                 // produces more apparent whitespace above or below the text lines.  Add a small
                 // offset to compensate.
                 if (line1Height != line2Height) {
                     verticalOffset += (line2Height - line1Height) / 10;
                 }
 
                 // The image is positioned vertically aligned with the second text line but
                 // requires a small additional offset to align with the ascent of the text instead
                 // of the top of the text which includes some whitespace.
                 if (child == mAnswerImage) {
-                    verticalOffset += ANSWER_IMAGE_VERTICAL_SPACING_DP
-                            * getResources().getDisplayMetrics().density;
+                    verticalOffset += getResources().getDimensionPixelOffset(
+                            R.dimen.omnibox_suggestion_answer_line2_vertical_spacing);
                 }
             }
 
             canvas.save();
             canvas.translate(0, verticalOffset);
             boolean retVal = super.drawChild(canvas, child, drawingTime);
             canvas.restore();
             return retVal;
         }
 
@@ skipping 23 matching lines @@
                         : Math.max(textWidth - maxMatchContentsWidth, 0);
                 ApiCompatibilityUtils.setPaddingRelative(
                         mTextLine1, (int) paddingStart, mTextLine1.getPaddingTop(),
                         0, // TODO(skanuj) : Change to ApiCompatibilityUtils.getPaddingEnd(...).
                         mTextLine1.getPaddingBottom());
             }
 
             int imageWidth = mAnswerImageMaxSize;
             int imageSpacing = 0;
             if (mAnswerImage.getVisibility() == VISIBLE && imageWidth > 0) {
-                float density = getResources().getDisplayMetrics().density;
-                imageSpacing = (int) (ANSWER_IMAGE_HORIZONTAL_SPACING_DP * density);
+                imageSpacing = getResources().getDimensionPixelOffset(
+                        R.dimen.omnibox_suggestion_answer_image_horizontal_spacing);
             }
             if (isRTL) {
                 mTextLine1.layout(0, t, mTextRight, b);
                 mAnswerImage.layout(mTextRight - imageWidth , t, mTextRight, b);
                 mTextLine2.layout(0, t, mTextRight - (imageWidth + imageSpacing), b);
             } else {
                 mTextLine1.layout(mTextLeft, t, r - l, b);
                 mAnswerImage.layout(mTextLeft, t, mTextLeft + imageWidth, b);
                 mTextLine2.layout(mTextLeft + imageWidth + imageSpacing, t, r - l, b);
             }
@@ skipping 103 matching lines @@
             // When creating the drawable states, treat selected as focused to get the proper
             // highlight when in non-touch mode (i.e. physical keyboard).  This is because only
             // a single view in a window can have focus, and the these will only appear if
             // the omnibox has focus, so we trick the drawable state into believing it has it.
             mForceIsFocused = isSelected() && !isInTouchMode();
             int[] drawableState = super.onCreateDrawableState(extraSpace);
             mForceIsFocused = false;
             return drawableState;
         }
 
-        private void setSuggestionIcon(int type, boolean invalidateCurrentIcon) {
+        private void setSuggestionIcon(@SuggestionIcon int type, boolean invalidateCurrentIcon) {
             if (mSuggestionIconType == type && !invalidateCurrentIcon) return;
             assert type != SUGGESTION_ICON_UNDEFINED;
 
             int drawableId = R.drawable.ic_omnibox_page;
             switch (type) {
                 case SUGGESTION_ICON_BOOKMARK:
                     drawableId = R.drawable.btn_star;
                     break;
                 case SUGGESTION_ICON_MAGNIFIER:
                     drawableId = R.drawable.ic_suggestion_magnifier;
@@ skipping 62 matching lines @@
             if (mUrlBar != null) mUrlBar.removeOnLayoutChangeListener(this);
             if (mLocationBar != null) {
                 mLocationBar.getContainerView().removeOnLayoutChangeListener(this);
             }
             getRootView().removeOnLayoutChangeListener(this);
 
             super.onDetachedFromWindow();
         }
     }
 }