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

Commit 6090cf4

Browse files
bluemarvinbluemarvin
authored
Remove Window and Max Window Size settings. Fixes #1822 (#1835)
1 parent 560505e commit 6090cf4

6 files changed

Lines changed: 6 additions & 221 deletions

File tree

‎app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java‎

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -266,25 +266,11 @@ public void setDisplayDensity(float aDensity) {
266266
}
267267

268268
public int getWindowWidth() {
269-
return mPrefs.getInt(
270-
mContext.getString(R.string.settings_key_window_width), WINDOW_WIDTH_DEFAULT);
271-
}
272-
273-
public void setWindowWidth(int aWindowWidth) {
274-
SharedPreferences.Editor editor = mPrefs.edit();
275-
editor.putInt(mContext.getString(R.string.settings_key_window_width), aWindowWidth);
276-
editor.commit();
269+
return WINDOW_WIDTH_DEFAULT;
277270
}
278271

279272
public int getWindowHeight() {
280-
return mPrefs.getInt(
281-
mContext.getString(R.string.settings_key_window_height), WINDOW_HEIGHT_DEFAULT);
282-
}
283-
284-
public void setWindowHeight(int aWindowHeight) {
285-
SharedPreferences.Editor editor = mPrefs.edit();
286-
editor.putInt(mContext.getString(R.string.settings_key_window_height), aWindowHeight);
287-
editor.commit();
273+
return WINDOW_HEIGHT_DEFAULT;
288274
}
289275

290276
public float getWindowAspect() {
@@ -303,25 +289,11 @@ public void setDisplayDpi(int aDpi) {
303289
}
304290

305291
public int getMaxWindowWidth() {
306-
return mPrefs.getInt(
307-
mContext.getString(R.string.settings_key_max_window_width), MAX_WINDOW_WIDTH_DEFAULT);
308-
}
309-
310-
public void setMaxWindowWidth(int aMaxWindowWidth) {
311-
SharedPreferences.Editor editor = mPrefs.edit();
312-
editor.putInt(mContext.getString(R.string.settings_key_max_window_width), aMaxWindowWidth);
313-
editor.commit();
292+
return MAX_WINDOW_WIDTH_DEFAULT;
314293
}
315294

316295
public int getMaxWindowHeight() {
317-
return mPrefs.getInt(
318-
mContext.getString(R.string.settings_key_max_window_height), MAX_WINDOW_HEIGHT_DEFAULT);
319-
}
320-
321-
public void setMaxWindowHeight(int aMaxWindowHeight) {
322-
SharedPreferences.Editor editor = mPrefs.edit();
323-
editor.putInt(mContext.getString(R.string.settings_key_max_window_height), aMaxWindowHeight);
324-
editor.commit();
296+
return MAX_WINDOW_HEIGHT_DEFAULT;
325297
}
326298

327299
public String getEnvironment() {

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

Lines changed: 0 additions & 154 deletions
Original file line numberDiff line numberDiff line change
@@ -93,30 +93,6 @@ private void initialize(Context aContext) {
9393
mBinding.dpiEdit.setFirstText(Integer.toString(SettingsStore.getInstance(getContext()).getDisplayDpi()));
9494
mBinding.dpiEdit.setOnClickListener(mDpiListener);
9595
setDisplayDpi(SettingsStore.getInstance(getContext()).getDisplayDpi());
96-
97-
mBinding.windowSizeEdit.setHint1(String.valueOf(SettingsStore.WINDOW_WIDTH_DEFAULT));
98-
mBinding.windowSizeEdit.setHint2(String.valueOf(SettingsStore.WINDOW_HEIGHT_DEFAULT));
99-
mBinding.windowSizeEdit.setDefaultFirstValue(String.valueOf(SettingsStore.WINDOW_WIDTH_DEFAULT));
100-
mBinding.windowSizeEdit.setDefaultSecondValue(String.valueOf(SettingsStore.WINDOW_HEIGHT_DEFAULT));
101-
mBinding.windowSizeEdit.setFirstText(Integer.toString(SettingsStore.getInstance(getContext()).getWindowWidth()));
102-
mBinding.windowSizeEdit.setSecondText(Integer.toString(SettingsStore.getInstance(getContext()).getWindowHeight()));
103-
mBinding.windowSizeEdit.setOnClickListener(mWindowSizeListener);
104-
setWindowSize(
105-
SettingsStore.getInstance(getContext()).getWindowWidth(),
106-
SettingsStore.getInstance(getContext()).getWindowHeight(),
107-
false);
108-
109-
mBinding.maxWindowSizeEdit.setHint1(String.valueOf(SettingsStore.MAX_WINDOW_WIDTH_DEFAULT));
110-
mBinding.maxWindowSizeEdit.setHint2(String.valueOf(SettingsStore.MAX_WINDOW_HEIGHT_DEFAULT));
111-
mBinding.maxWindowSizeEdit.setDefaultFirstValue(String.valueOf(SettingsStore.MAX_WINDOW_WIDTH_DEFAULT));
112-
mBinding.maxWindowSizeEdit.setDefaultSecondValue(String.valueOf(SettingsStore.MAX_WINDOW_HEIGHT_DEFAULT));
113-
mBinding.maxWindowSizeEdit.setFirstText(Integer.toString(SettingsStore.getInstance(getContext()).getMaxWindowWidth()));
114-
mBinding.maxWindowSizeEdit.setSecondText(Integer.toString(SettingsStore.getInstance(getContext()).getMaxWindowHeight()));
115-
mBinding.maxWindowSizeEdit.setOnClickListener(mMaxWindowSizeListener);
116-
setMaxWindowSize(
117-
SettingsStore.getInstance(getContext()).getMaxWindowWidth(),
118-
SettingsStore.getInstance(getContext()).getMaxWindowHeight(),
119-
false);
12096
}
12197

12298
@Override
@@ -147,16 +123,6 @@ public boolean isEditing() {
147123
mBinding.dpiEdit.cancel();
148124
}
149125

150-
if (mBinding.windowSizeEdit.isEditing()) {
151-
editing = true;
152-
mBinding.windowSizeEdit.cancel();
153-
}
154-
155-
if (mBinding.maxWindowSizeEdit.isEditing()) {
156-
editing = true;
157-
mBinding.maxWindowSizeEdit.cancel();
158-
}
159-
160126
if (mBinding.homepageEdit.isEditing()) {
161127
editing = true;
162128
mBinding.homepageEdit.cancel();
@@ -214,28 +180,6 @@ public boolean isEditing() {
214180
}
215181
};
216182

217-
private OnClickListener mWindowSizeListener = (view) -> {
218-
try {
219-
int newWindowWidth = Integer.parseInt(mBinding.windowSizeEdit.getFirstText());
220-
int newWindowHeight = Integer.parseInt(mBinding.windowSizeEdit.getSecondText());
221-
setWindowSize(newWindowWidth, newWindowHeight, true);
222-
223-
} catch (NumberFormatException e) {
224-
setWindowSize(SettingsStore.WINDOW_WIDTH_DEFAULT, SettingsStore.WINDOW_HEIGHT_DEFAULT, true);
225-
}
226-
};
227-
228-
private OnClickListener mMaxWindowSizeListener = (view) -> {
229-
try {
230-
int newMaxWindowWidth = Integer.parseInt(mBinding.maxWindowSizeEdit.getFirstText());
231-
int newMaxWindowHeight = Integer.parseInt(mBinding.maxWindowSizeEdit.getSecondText());
232-
setMaxWindowSize(newMaxWindowWidth, newMaxWindowHeight, true);
233-
234-
} catch (NumberFormatException e) {
235-
setMaxWindowSize(SettingsStore.MAX_WINDOW_WIDTH_DEFAULT, SettingsStore.MAX_WINDOW_HEIGHT_DEFAULT, true);
236-
}
237-
};
238-
239183
private SwitchSetting.OnCheckedChangeListener mCurvedDisplayListener = (compoundButton, enabled, apply) ->
240184
setCurvedDisplay(enabled, true);
241185

@@ -260,19 +204,6 @@ public boolean isEditing() {
260204
restart = restart | setDisplayDensity(SettingsStore.DISPLAY_DENSITY_DEFAULT);
261205
restart = restart | setDisplayDpi(SettingsStore.DISPLAY_DPI_DEFAULT);
262206

263-
try {
264-
if (Integer.parseInt(mBinding.windowSizeEdit.getFirstText()) != SettingsStore.WINDOW_WIDTH_DEFAULT ||
265-
Integer.parseInt(mBinding.windowSizeEdit.getSecondText()) != SettingsStore.WINDOW_HEIGHT_DEFAULT) {
266-
setWindowSize(SettingsStore.WINDOW_WIDTH_DEFAULT, SettingsStore.WINDOW_HEIGHT_DEFAULT, true);
267-
}
268-
if (Integer.parseInt(mBinding.maxWindowSizeEdit.getFirstText()) != SettingsStore.MAX_WINDOW_WIDTH_DEFAULT ||
269-
Integer.parseInt(mBinding.maxWindowSizeEdit.getSecondText()) != SettingsStore.MAX_WINDOW_HEIGHT_DEFAULT) {
270-
setMaxWindowSize(SettingsStore.MAX_WINDOW_WIDTH_DEFAULT, SettingsStore.MAX_WINDOW_HEIGHT_DEFAULT, true);
271-
}
272-
} catch (NumberFormatException ex) {
273-
setWindowSize(SettingsStore.WINDOW_WIDTH_DEFAULT, SettingsStore.WINDOW_HEIGHT_DEFAULT, true);
274-
setMaxWindowSize(SettingsStore.MAX_WINDOW_WIDTH_DEFAULT, SettingsStore.MAX_WINDOW_HEIGHT_DEFAULT, true);
275-
}
276207

277208
setHomepage(mDefaultHomepageUrl);
278209
setAutoplay(SettingsStore.AUTOPLAY_ENABLED, true);
@@ -393,81 +324,6 @@ private boolean setDisplayDpi(int newDpi) {
393324
return restart;
394325
}
395326

396-
private void setWindowSize(int newWindowWidth, int newWindowHeight, boolean doApply) {
397-
int prevWindowWidth = SettingsStore.getInstance(getContext()).getWindowWidth();
398-
if (newWindowWidth <= 0) {
399-
newWindowWidth = prevWindowWidth;
400-
}
401-
402-
int prevWindowHeight = SettingsStore.getInstance(getContext()).getWindowHeight();
403-
if (newWindowHeight <= 0) {
404-
newWindowHeight = prevWindowHeight;
405-
}
406-
407-
int maxWindowWidth = SettingsStore.getInstance(getContext()).getMaxWindowWidth();
408-
if (newWindowWidth > maxWindowWidth) {
409-
newWindowWidth = maxWindowWidth;
410-
}
411-
412-
int maxWindowHeight = SettingsStore.getInstance(getContext()).getMaxWindowHeight();
413-
if (newWindowHeight > maxWindowHeight) {
414-
newWindowHeight = maxWindowHeight;
415-
}
416-
417-
if (prevWindowWidth != newWindowWidth || prevWindowHeight != newWindowHeight) {
418-
SettingsStore.getInstance(getContext()).setWindowWidth(newWindowWidth);
419-
SettingsStore.getInstance(getContext()).setWindowHeight(newWindowHeight);
420-
421-
if (doApply) {
422-
mWidgetManager.setWindowSize(newWindowWidth, newWindowHeight);
423-
}
424-
}
425-
426-
String newWindowWidthStr = Integer.toString(newWindowWidth);
427-
mBinding.windowSizeEdit.setFirstText(newWindowWidthStr);
428-
String newWindowHeightStr = Integer.toString(newWindowHeight);
429-
mBinding.windowSizeEdit.setSecondText(newWindowHeightStr);
430-
}
431-
432-
private void setMaxWindowSize(int newMaxWindowWidth, int newMaxWindowHeight, boolean doApply) {
433-
int prevMaxWindowWidth = SettingsStore.getInstance(getContext()).getMaxWindowWidth();
434-
if (newMaxWindowWidth <= 0) {
435-
newMaxWindowWidth = prevMaxWindowWidth;
436-
}
437-
438-
int prevMaxWindowHeight = SettingsStore.getInstance(getContext()).getMaxWindowHeight();
439-
if (newMaxWindowHeight <= 0) {
440-
newMaxWindowHeight = prevMaxWindowHeight;
441-
}
442-
443-
int windowWidth = SettingsStore.getInstance(getContext()).getWindowWidth();
444-
if (newMaxWindowWidth < windowWidth) {
445-
newMaxWindowWidth = windowWidth;
446-
}
447-
448-
int windowHeight = SettingsStore.getInstance(getContext()).getWindowHeight();
449-
if (newMaxWindowHeight < windowHeight) {
450-
newMaxWindowHeight = windowHeight;
451-
}
452-
453-
if (newMaxWindowWidth != prevMaxWindowWidth ||
454-
newMaxWindowHeight != prevMaxWindowHeight) {
455-
SettingsStore.getInstance(getContext()).setMaxWindowWidth(newMaxWindowWidth);
456-
SettingsStore.getInstance(getContext()).setMaxWindowHeight(newMaxWindowHeight);
457-
458-
if (doApply) {
459-
SettingsStore.getInstance(getContext()).setMaxWindowWidth(newMaxWindowWidth);
460-
SettingsStore.getInstance(getContext()).setMaxWindowHeight(newMaxWindowHeight);
461-
showRestartDialog();
462-
}
463-
}
464-
465-
String newMaxWindowWidthStr = Integer.toString(newMaxWindowWidth);
466-
mBinding.maxWindowSizeEdit.setFirstText(newMaxWindowWidthStr);
467-
String newMaxWindowHeightStr = Integer.toString(newMaxWindowHeight);
468-
mBinding.maxWindowSizeEdit.setSecondText(newMaxWindowHeightStr);
469-
}
470-
471327
@Override
472328
public void onGlobalFocusChanged(View oldFocus, View newFocus) {
473329
if (oldFocus != null) {
@@ -477,16 +333,6 @@ public void onGlobalFocusChanged(View oldFocus, View newFocus) {
477333
if (mBinding.dpiEdit.contains(oldFocus) && mBinding.dpiEdit.isEditing()) {
478334
mBinding.dpiEdit.cancel();
479335
}
480-
if (mBinding.windowSizeEdit.contains(oldFocus) &&
481-
(newFocus != null && !mBinding.windowSizeEdit.contains(newFocus)) &&
482-
mBinding.windowSizeEdit.isEditing()) {
483-
mBinding.windowSizeEdit.cancel();
484-
}
485-
if (mBinding.maxWindowSizeEdit.contains(oldFocus) &&
486-
(newFocus != null && !mBinding.maxWindowSizeEdit.contains(newFocus)) &&
487-
mBinding.maxWindowSizeEdit.isEditing()) {
488-
mBinding.maxWindowSizeEdit.cancel();
489-
}
490336
if (mBinding.homepageEdit.contains(oldFocus) && mBinding.homepageEdit.isEditing()) {
491337
mBinding.homepageEdit.cancel();
492338
}

‎app/src/main/res/layout/options_display.xml‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -112,27 +112,6 @@
112112
app:description="@string/developer_options_display_dpi"
113113
app:highlightedTextColor="@color/fog" />
114114

115-
<org.mozilla.vrbrowser.ui.views.settings.DoubleEditSetting
116-
android:id="@+id/windowSize_edit"
117-
android:layout_width="match_parent"
118-
android:layout_height="wrap_content"
119-
android:width="75dp"
120-
android:inputType="number"
121-
android:maxLength="4"
122-
app:by="@string/developer_options_by"
123-
app:description="@string/developer_options_window_size"
124-
app:highlightedTextColor="@color/fog" />
125-
126-
<org.mozilla.vrbrowser.ui.views.settings.DoubleEditSetting
127-
android:id="@+id/maxWindowSize_edit"
128-
android:layout_width="match_parent"
129-
android:layout_height="wrap_content"
130-
android:width="75dp"
131-
android:inputType="number"
132-
android:maxLength="4"
133-
app:by="@string/developer_options_by"
134-
app:description="@string/developer_options_max_window_size"
135-
app:highlightedTextColor="@color/fog" />
136115
</LinearLayout>
137116
</ScrollView>
138117

‎app/src/main/res/layout/setting_edit.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
android:id="@+id/setting_description"
2626
style="@style/settingsText"
2727
android:layout_marginEnd="5dp"
28-
android:text="@string/developer_options_window_size"
28+
android:text="@string/developer_options_display_dpi"
2929
tools:text="Setting Description" />
3030

3131
<TextView

‎app/src/main/res/values/non_L10n.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@
2020
<string name="settings_key_user_agent_version" translatable="false">settings_user_agent_version</string>
2121
<string name="settings_key_input_mode" translatable="false">settings_touch_mode</string>
2222
<string name="settings_key_display_density" translatable="false">settings_display_density</string>
23-
<string name="settings_key_window_width" translatable="false">settings_window_width</string>
24-
<string name="settings_key_window_height" translatable="false">settings_window_height</string>
25-
<string name="settings_key_display_dpi" translatable="false">settings_display_dpi</string>
26-
<string name="settings_key_max_window_width" translatable="false">settings_max_window_width</string>
27-
<string name="settings_key_max_window_height" translatable="false">settings_max_window_height</string>
23+
<string name="settings_key_display_dpi" translatable="false">settings_display_dpi</string>>
2824
<string name="settings_key_env" translatable="false">settings_env</string>
2925
<string name="settings_key_pointer_color" translatable="false">settings_pointer_color</string>
3026
<string name="settings_key_scroll_direction" translatable="false">settings_scroll_direction</string>

‎app/src/main/res/values/strings.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -302,10 +302,6 @@
302302
use for the display density. -->
303303
<string name="developer_options_display_density">Display Density:</string>
304304

305-
<!-- This string is used to label two integer-entry fields where the default width and height of
306-
the browser window may be set. -->
307-
<string name="developer_options_window_size">Window Size:</string>
308-
309305
<!-- This string is used to label buttons to enable editing of text fields in the
310306
'Developer Options' dialog. Pressing this button switches the text to
311307
editable-text fields so their values may be changed. -->
@@ -324,10 +320,6 @@
324320
for the virtual displays Dots Per Inch (DPI). -->
325321
<string name="developer_options_display_dpi">Display DPI:</string>
326322

327-
<!-- This string is used to label two integer entry fields that will allow the user to adjust
328-
the maximum window size in the X and Y dimensions. -->
329-
<string name="developer_options_max_window_size">Max. Window Size:</string>
330-
331323
<!-- This string is used to label radio buttons for setting Multi-Sample Anti-Aliasing (MSAA) in
332324
VR Immersive Mode. -->
333325
<string name="developer_options_msaa">MSAA</string>

0 commit comments

Comments
 (0)