Merge "fix suggestion dropdown offset" into honeycomb

3 files changed, 12 insertions, 6 deletions

diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index b1e1d92..300714b 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -44,4 +44,5 @@
     <dimen name="list_favicon_padding">5dip</dimen>
     <dimen name="list_favicon_corner_radius">3dip</dimen>
     <dimen name="tab_favicon_corner_radius">2dip</dimen>
+    <dimen name="dropdown_offset">8dip</dimen>
 </resources>
diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index ff06118..8dc8663 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -160,7 +160,7 @@ public class TitleBarXLarge extends TitleBarBase
 
     void setUseQuickControls(boolean useQuickControls) {
         mUseQuickControls = useQuickControls;
-        mUrlInput.setReverseResults(mUseQuickControls);
+        mUrlInput.setUseQuickControls(mUseQuickControls);
         if (mUseQuickControls) {
             mBackButton.setVisibility(View.GONE);
             mForwardButton.setVisibility(View.GONE);
diff --git a/src/com/android/browser/UrlInputView.java b/src/com/android/browser/UrlInputView.java
index 02c9f4c..3e49c06 100644
--- a/src/com/android/browser/UrlInputView.java
+++ b/src/com/android/browser/UrlInputView.java
@@ -60,6 +60,7 @@ public class UrlInputView extends AutoCompleteTextView
     private boolean mLandscape;
     private boolean mInVoiceMode;
     private boolean mIncognitoMode;
+    private int mVOffset;
 
     public UrlInputView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
@@ -86,6 +87,7 @@ public class UrlInputView extends AutoCompleteTextView
         onConfigurationChanged(ctx.getResources().getConfiguration());
         setThreshold(1);
         setOnItemClickListener(this);
+        mVOffset = 0;
     }
 
     void setController(UiController controller) {
@@ -94,6 +96,13 @@ public class UrlInputView extends AutoCompleteTextView
         setCustomSelectionActionModeCallback(urlSelectionMode);
     }
 
+    void setUseQuickControls(boolean useQuickControls) {
+        mVOffset = (useQuickControls
+                ? (int) getResources().getDimension(R.dimen.dropdown_offset)
+                : 0);
+        mAdapter.setReverseResults(useQuickControls);
+    }
+
     void setContainer(View container) {
         mContainer = container;
     }
@@ -135,7 +144,7 @@ public class UrlInputView extends AutoCompleteTextView
         if (getLeft() != -getDropDownHorizontalOffset()) {
             setDropDownHorizontalOffset(-getLeft());
         }
-        setDropDownVerticalOffset(8);
+        setDropDownVerticalOffset(mVOffset);
     }
 
     @Override
@@ -247,10 +256,6 @@ public class UrlInputView extends AutoCompleteTextView
 
     }
 
-    public void setReverseResults(boolean reverse) {
-        mAdapter.setReverseResults(reverse);
-    }
-
     public void setIncognitoMode(boolean incognito) {
         mIncognitoMode = incognito;
         mAdapter.setIncognitoMode(mIncognitoMode);