diff options
| author | Michael Kolb <kolby@google.com> | 2011-01-26 17:51:26 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-26 17:51:26 -0800 |
| commit | 510e93e535d5e3141f95c0fd1485732c75f943ea (patch) | |
| tree | 7f8a12b5f326b8640fd442085a23cc5abe46e158 /src/com | |
| parent | a295c7b034a55bc52d3338370fbff9449475f38b (diff) | |
| parent | 91902d5db3dcbd161bf824620567e210d6f4fcbe (diff) | |
| download | packages_apps_Browser-510e93e535d5e3141f95c0fd1485732c75f943ea.zip packages_apps_Browser-510e93e535d5e3141f95c0fd1485732c75f943ea.tar.gz packages_apps_Browser-510e93e535d5e3141f95c0fd1485732c75f943ea.tar.bz2 | |
Merge "fix suggestion dropdown offset" into honeycomb
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/browser/TitleBarXLarge.java | 2 | ||||
| -rw-r--r-- | src/com/android/browser/UrlInputView.java | 15 |
2 files changed, 11 insertions, 6 deletions
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); |