diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/prompts/ChoicePromptWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/prompts/ChoicePromptWidget.java
index 09eae0e98..7ed0f91f1 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/prompts/ChoicePromptWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/prompts/ChoicePromptWidget.java
@@ -146,13 +146,18 @@ protected void onDismiss() {
@Override
public void show(@ShowFlags int aShowFlags) {
- show(aShowFlags);
+ super.show(aShowFlags);
for (int i = 0; i < mListItems.length; i++) {
mList.setItemChecked(i, mListItems[i].mChoice.selected);
}
mAdapter.notifyDataSetChanged();
}
+ @Override
+ public int getMinHeight() {
+ return WidgetPlacement.dpDimension(getContext(), R.dimen.prompt_min_height);
+ }
+
public void setDelegate(GeckoSession.PromptDelegate.ChoiceCallback delegate) {
mCallback = delegate;
}
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/prompts/PromptWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/prompts/PromptWidget.java
index 399890c53..2c350a5f5 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/prompts/PromptWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/prompts/PromptWidget.java
@@ -68,7 +68,9 @@ protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
public void show(@ShowFlags int aShowFlags) {
mLayout.measure(View.MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
View.MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
- mWidgetPlacement.height = (int)(mLayout.getMeasuredHeight()/mWidgetPlacement.density);
+ mWidgetPlacement.height = (getMinHeight() == 0) ?
+ (int)(mLayout.getMeasuredHeight()/mWidgetPlacement.density) :
+ getMinHeight();
super.show(aShowFlags);
mWidgetManager.pushWorldBrightness(this, WidgetManagerDelegate.DEFAULT_DIM_BRIGHTNESS);
@@ -99,4 +101,8 @@ public void onGlobalFocusChanged(View oldFocus, View newFocus) {
}
}
+ public int getMinHeight() {
+ return 0;
+ }
+
}
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 5b33bb6b5..148d25e0c 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -145,6 +145,7 @@
450dp
300dp
520dp
+ 400dp
640dp