Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-31 22:25:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 748469 - (Part 2) Clean up FormAssist.positionAndShowPopup. r=wesj

Browse Source
This commit is contained in:
Margaret Leibovic 2013-03-01 17:06:00 -08:00
parent 51e346166d
commit 9da4fa49ef
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mobile/android/base/FormAssistPopup.java
View File

@ -52,7 +52,7 @@ public class FormAssistPopup extends RelativeLayout implements GeckoEventListene
private static RelativeLayout.LayoutParams sValidationTextLayoutNormal;
private static RelativeLayout.LayoutParams sValidationTextLayoutInverted;
private static final String LOGTAG = "FormAssistPopup";
private static final String LOGTAG = "GeckoFormAssistPopup";
// The blocklist is so short that ArrayList is probably cheaper than HashSet.
private static final Collection<String> sInputMethodBlocklist = Arrays.asList(new String[] {
@ -184,18 +184,12 @@ public class FormAssistPopup extends RelativeLayout implements GeckoEventListene
positionAndShowPopup(rect, false);
}
// Returns true if the popup is successfully shown, false otherwise
private boolean positionAndShowPopup(JSONObject rect, boolean isAutoComplete) {
private void positionAndShowPopup(JSONObject rect, boolean isAutoComplete) {
// Don't show the form assist popup when using fullscreen VKB
InputMethodManager imm =
(InputMethodManager) GeckoApp.mAppContext.getSystemService(Context.INPUT_METHOD_SERVICE);
if (imm.isFullscreenMode())
return false;
if (!isShown()) {
setVisibility(VISIBLE);
startAnimation(mAnimation);
}
return;
// Hide/show the appropriate popup contents
if (mAutoCompleteList != null)
@ -225,7 +219,11 @@ public class FormAssistPopup extends RelativeLayout implements GeckoEventListene
top = (int) (rect.getDouble("y") * zoom - viewportMetrics.viewportRectTop);
width = (int) (rect.getDouble("w") * zoom);
height = (int) (rect.getDouble("h") * zoom);
} catch (JSONException e) { }
} catch (JSONException e) {
// Bail if we can't get the correct dimensions for the popup.
Log.e(LOGTAG, "Error getting FormAssistPopup dimensions", e);
return;
}
int popupWidth = RelativeLayout.LayoutParams.FILL_PARENT;
int popupLeft = left < 0 ? 0 : left;
@ -292,7 +290,10 @@ public class FormAssistPopup extends RelativeLayout implements GeckoEventListene
setLayoutParams(layoutParams);
requestLayout();
return true;
if (!isShown()) {
setVisibility(VISIBLE);
startAnimation(mAnimation);
}
}
public void hide() {