Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Commit 374f724

Browse files
keianhzobluemarvin
keianhzo
authored and
bluemarvin
committed
User enum in widget show (#1352)
* User enum in widget show Refactored the show methods into a single method that uses a enum for readability. * Fixed Suggestions widget show override
1 parent b9e4984 commit 374f724

13 files changed

Lines changed: 55 additions & 50 deletions

‎app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import org.mozilla.vrbrowser.ui.widgets.TopBarWidget;
5656
import org.mozilla.vrbrowser.ui.widgets.TrayListener;
5757
import org.mozilla.vrbrowser.ui.widgets.TrayWidget;
58+
import org.mozilla.vrbrowser.ui.widgets.UIWidget;
5859
import org.mozilla.vrbrowser.ui.widgets.VideoProjectionMenuWidget;
5960
import org.mozilla.vrbrowser.ui.widgets.Widget;
6061
import org.mozilla.vrbrowser.ui.widgets.WidgetManagerDelegate;
@@ -447,7 +448,7 @@ private void handleCrashIntent(final Intent intent) {
447448
mCrashDialog.setCrashDialogDelegate(() -> sendCrashData(intent));
448449
}
449450

450-
mCrashDialog.show();
451+
mCrashDialog.show(UIWidget.REQUEST_FOCUS);
451452
}
452453
}
453454

‎app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/KeyboardWidget.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ private void handleVoiceInput() {
714714
}
715715
mIsInVoiceInput = true;
716716
TelemetryWrapper.voiceInputEvent();
717-
mVoiceSearchWidget.show(false);
717+
mVoiceSearchWidget.show(CLEAR_FOCUS);
718718
mWidgetPlacement.visible = false;
719719
mWidgetManager.updateWidget(this);
720720
}

‎app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ public void OnVoiceSearchClicked() {
824824
mVoiceSearchWidget.hide(REMOVE_WIDGET);
825825

826826
} else {
827-
mVoiceSearchWidget.show();
827+
mVoiceSearchWidget.show(REQUEST_FOCUS);
828828
}
829829
}
830830

@@ -881,7 +881,7 @@ public void OnShowSearchPopup() {
881881

882882
if (!mPopup.isVisible()) {
883883
mPopup.updatePlacement((int)WidgetPlacement.convertPixelsToDp(getContext(), mURLBar.getWidth()));
884-
mPopup.show();
884+
mPopup.show(CLEAR_FOCUS);
885885
}
886886
}
887887
);

‎app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/SuggestionsWidget.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
113113
}
114114

115115
@Override
116-
public void show() {
117-
super.show(false);
116+
public void show(@ShowFlags int aShowFlags) {
117+
super.show(aShowFlags);
118118
mList.startAnimation(mScaleUpAnimation);
119119
}
120120

‎app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TrayWidget.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ private void toggleSettingsDialog() {
268268
if (widget.isVisible()) {
269269
widget.hide(REMOVE_WIDGET);
270270
} else {
271-
widget.show();
271+
widget.show(REQUEST_FOCUS);
272272
}
273273
}
274274

@@ -281,14 +281,14 @@ public void setTrayVisible(boolean aVisible) {
281281

282282
private void updateVisibility() {
283283
if (mTrayVisible && !mKeyboardVisible) {
284-
this.show();
284+
this.show(REQUEST_FOCUS);
285285
} else {
286286
this.hide(UIWidget.KEEP_WIDGET);
287287
}
288288
}
289289

290290
@Override
291-
public void show() {
291+
public void show(@ShowFlags int aShowFlags) {
292292
if (!mWidgetPlacement.visible) {
293293
mWidgetPlacement.visible = true;
294294
mWidgetManager.addWidget(this);

‎app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/UIWidget.java‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -248,24 +248,28 @@ public void toggle() {
248248
hide(REMOVE_WIDGET);
249249

250250
} else {
251-
show();
251+
show(REQUEST_FOCUS);
252252
}
253253
}
254254

255-
public void show() {
256-
show(true);
257-
}
255+
@IntDef(value = { REQUEST_FOCUS, CLEAR_FOCUS })
256+
public @interface ShowFlags {}
257+
public static final int REQUEST_FOCUS = 0;
258+
public static final int CLEAR_FOCUS = 1;
258259

259-
public void show(boolean focus) {
260+
public void show(@ShowFlags int aShowFlags) {
260261
if (!mWidgetPlacement.visible) {
261262
mWidgetPlacement.visible = true;
262263
mWidgetManager.addWidget(this);
263264
mWidgetManager.pushBackHandler(mBackHandler);
264265
}
265266

266-
if (focus) {
267-
setFocusableInTouchMode(true);
267+
setFocusableInTouchMode(false);
268+
if (aShowFlags == REQUEST_FOCUS) {
268269
requestFocusFromTouch();
270+
271+
} else {
272+
clearFocus();
269273
}
270274
}
271275

‎app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,19 @@ protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
103103
}
104104

105105
@Override
106-
public void show(boolean focus) {
106+
public void show(@ShowFlags int aShowFlags) {
107107
if (!mWidgetPlacement.visible) {
108108
mWidgetPlacement.visible = true;
109109
}
110110

111111
mWidgetManager.updateWidget(this);
112112

113-
if (focus) {
114-
setFocusableInTouchMode(true);
113+
setFocusableInTouchMode(false);
114+
if (aShowFlags == REQUEST_FOCUS) {
115115
requestFocusFromTouch();
116+
117+
} else {
118+
clearFocus();
116119
}
117120
}
118121

@@ -581,7 +584,7 @@ public void setNoInternetToastVisible(boolean aVisible) {
581584
mNoInternetToast.mWidgetPlacement.parentHandle = getHandle();
582585
}
583586
if (aVisible && !mNoInternetToast.isVisible()) {
584-
mNoInternetToast.show();
587+
mNoInternetToast.show(REQUEST_FOCUS);
585588
} else if (!aVisible && mNoInternetToast.isVisible()) {
586589
mNoInternetToast.hide(REMOVE_WIDGET);
587590
}
@@ -593,7 +596,7 @@ public void showAlert(String title, @NonNull String msg, @NonNull AlertCallback
593596
mAlertPrompt.setTitle(title);
594597
mAlertPrompt.setMessage(msg);
595598
mAlertPrompt.setDelegate(callback);
596-
mAlertPrompt.show();
599+
mAlertPrompt.show(REQUEST_FOCUS);
597600
}
598601

599602
// PromptDelegate
@@ -605,7 +608,7 @@ public void onAlert(GeckoSession session, String title, String msg, AlertCallbac
605608
mAlertPrompt.setTitle(title);
606609
mAlertPrompt.setMessage(msg);
607610
mAlertPrompt.setDelegate(callback);
608-
mAlertPrompt.show();
611+
mAlertPrompt.show(REQUEST_FOCUS);
609612
}
610613

611614
@Override
@@ -616,7 +619,7 @@ public void onButtonPrompt(GeckoSession session, String title, String msg, Strin
616619
mConfirmPrompt.setMessage(msg);
617620
mConfirmPrompt.setButtons(btnMsg);
618621
mConfirmPrompt.setDelegate(callback);
619-
mConfirmPrompt.show();
622+
mConfirmPrompt.show(REQUEST_FOCUS);
620623
}
621624

622625
@Override
@@ -627,7 +630,7 @@ public void onTextPrompt(GeckoSession session, String title, String msg, String
627630
mTextPrompt.setMessage(msg);
628631
mTextPrompt.setDefaultText(value);
629632
mTextPrompt.setDelegate(callback);
630-
mTextPrompt.show();
633+
mTextPrompt.show(REQUEST_FOCUS);
631634
}
632635

633636
@Override
@@ -637,7 +640,7 @@ public void onAuthPrompt(GeckoSession session, String title, String msg, AuthOpt
637640
mAuthPrompt.setTitle(title);
638641
mAuthPrompt.setMessage(msg);
639642
mAuthPrompt.setAuthOptions(options, callback);
640-
mAuthPrompt.show();
643+
mAuthPrompt.show(REQUEST_FOCUS);
641644
}
642645

643646
@Override
@@ -649,7 +652,7 @@ public void onChoicePrompt(GeckoSession session, String title, String msg, int t
649652
mChoicePrompt.setChoices(choices);
650653
mChoicePrompt.setMenuType(type);
651654
mChoicePrompt.setDelegate(callback);
652-
mChoicePrompt.show();
655+
mChoicePrompt.show(REQUEST_FOCUS);
653656
}
654657

655658
@Override

‎app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/CrashDialogWidget.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
134134
}
135135

136136
@Override
137-
public void show() {
138-
super.show();
137+
public void show(@ShowFlags int aShowFlags) {
138+
super.show(aShowFlags);
139139

140140
mWidgetManager.pushWorldBrightness(this, WidgetManagerDelegate.DEFAULT_DIM_BRIGHTNESS);
141141
}

‎app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/PermissionWidget.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
8282
}
8383

8484
@Override
85-
public void show() {
86-
super.show();
85+
public void show(@ShowFlags int aShowFlags) {
86+
super.show(aShowFlags);
8787

8888
mWidgetManager.pushWorldBrightness(this, WidgetManagerDelegate.DEFAULT_DIM_BRIGHTNESS);
8989
}
@@ -141,7 +141,7 @@ public void showPrompt(String aUri, PermissionType aType, GeckoSession.Permissio
141141
mPermissionMessage.setText(str);
142142
mPermissionIcon.setImageResource(iconId);
143143

144-
show();
144+
show(REQUEST_FOCUS);
145145
}
146146

147147
String getRequesterName(String aUri) {

‎app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/VoiceSearchWidget.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,18 +258,18 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in
258258
}
259259

260260
if (granted) {
261-
show();
261+
show(REQUEST_FOCUS);
262262

263263
} else {
264-
super.show(true);
264+
super.show(REQUEST_FOCUS);
265265
setPermissionNotGranted();
266266
}
267267
}
268268
}
269269

270270
@Override
271-
public void show(boolean aFocus) {
272-
super.show(aFocus);
271+
public void show(@ShowFlags int aShowFlags) {
272+
super.show(aShowFlags);
273273

274274
setStartListeningState();
275275

0 commit comments

Comments
 (0)