Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #2536 Fixes #2539 Fixes #2538 Fixes #2680 Fixes #2344 Fixes #1979 Settings adjustment for better L10n #2680

Merged
merged 2 commits into from
Jan 24, 2020
Merged

Fixes #2536 Fixes #2539 Fixes #2538 Fixes #2680 Fixes #2344 Fixes #1979 Settings adjustment for better L10n #2680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
671a11f
Adjustments for the honeycomb buttons
keianhzo Jan 20, 2020
f00269c
Make settings panels wider to better fit all languages
keianhzo Jan 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DisplayOptionsView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

import org.mozilla.vrbrowser.R;
import org.mozilla.vrbrowser.browser.SettingsStore;
import org.mozilla.vrbrowser.browser.engine.SessionStore;
import org.mozilla.vrbrowser.databinding.OptionsDisplayBinding;
import org.mozilla.vrbrowser.ui.views.settings.RadioGroupSetting;
import org.mozilla.vrbrowser.ui.views.settings.SwitchSetting;
Expand Down Expand Up @@ -336,7 +335,7 @@ public void onGlobalFocusChanged(View oldFocus, View newFocus) {

@Override
public Point getDimensions() {
return new Point( WidgetPlacement.dpDimension(getContext(), R.dimen.display_options_width),
return new Point( WidgetPlacement.dpDimension(getContext(), R.dimen.settings_dialog_width),
WidgetPlacement.dpDimension(getContext(), R.dimen.display_options_height));
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/PrivacyOptionsView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ private void setRestoreTabs(boolean value, boolean doApply) {

@Override
public Point getDimensions() {
return new Point( WidgetPlacement.dpDimension(getContext(), R.dimen.privacy_options_width),
return new Point( WidgetPlacement.dpDimension(getContext(), R.dimen.settings_dialog_width),
WidgetPlacement.dpDimension(getContext(), R.dimen.privacy_options_height));
}

Expand Down
10 changes: 4 additions & 6 deletions app/src/main/res/layout/honeycomb_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingStart="3dp"
android:paddingEnd="3dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:fontFamily="sans-serif"
android:gravity="center"
android:text="@string/settings_privacy_policy"
Expand All @@ -33,8 +31,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:fontFamily="sans-serif"
android:gravity="center"
android:text="Secondary text"
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/res/values/dimen.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,15 +218,13 @@
<item name="tooltip_default_density" format="float" type="dimen">3.0</item>

<!-- General 2nd level settings dimensions -->
<dimen name="settings_dialog_width">585dp</dimen>
<dimen name="settings_dialog_width">600dp</dimen>
<dimen name="settings_dialog_height">360dp</dimen>

<!-- Privacy settings -->
<dimen name="privacy_options_width">585dp</dimen>
<dimen name="privacy_options_height">490dp</dimen>

<!-- Display settings -->
<dimen name="display_options_width">585dp</dimen>
<dimen name="display_options_height">420dp</dimen>

<!-- JS Prompt dialogs -->
Expand Down