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

Commit

Permalink
FxA related fixes (#2083)
Browse files Browse the repository at this point in the history
  • Loading branch information
@keianhzo @bluemarvin
keianhzo authored and bluemarvin committed Oct 28, 2019
1 parent 4989c03 commit 70cb3f6
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 52 deletions.
2 changes: 1 addition & 1 deletion app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/SettingsWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ private void initialize() {
onDismiss();
});

mBinding.reportIssueLayout.setOnClickListener(v -> {
mBinding.reportIssueButton.setOnClickListener(v -> {
onSettingsReportClick();
onDismiss();
});
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/options_fxa_account.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:title="@string/settings_display" />
app:title="@string/settings_fxa_account_manage" />

<org.mozilla.vrbrowser.ui.views.CustomScrollView
android:id="@+id/scrollbar"
Expand Down
58 changes: 8 additions & 50 deletions app/src/main/res/layout/settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,56 +25,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<LinearLayout
android:id="@+id/reportIssueLayout"
android:layout_width="@dimen/report_issue_width"
android:layout_height="@dimen/report_issue_height"
android:layout_marginTop="54dp"
android:layout_marginEnd="42dp"
android:background="@drawable/panel_button_background"
android:descendantFocusability="afterDescendants"
android:gravity="center"
android:focusable="true"
android:clickable="true"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">

<ImageView
android:id="@+id/settings_button_icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center"
android:layout_marginEnd="5dp"
android:gravity="center"
android:scaleType="fitXY"
android:duplicateParentState="true"
android:tint="@color/fog_void_tint"
android:src="@drawable/ic_settings_reportissue" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:descendantFocusability="afterDescendants"
android:duplicateParentState="true"
android:orientation="vertical">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:duplicateParentState="true"
android:text="@string/settings_report_issue"
android:textColor="@color/fog_void_tint"/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:duplicateParentState="true"
android:text="@string/bug_report_url"
android:textColor="@color/fog_void_tint"/>
</LinearLayout>
</LinearLayout>

<LinearLayout
android:id="@+id/settingsMasthead"
android:layout_width="wrap_content"
Expand Down Expand Up @@ -237,6 +187,14 @@
app:honeycombButtonIcon="@drawable/ic_settings_help"
app:honeycombButtonText="@string/settings_help"
app:honeycombButtonTextSize="@dimen/settings_main_button_text_width" />

<org.mozilla.vrbrowser.ui.views.HoneycombButton
android:id="@+id/reportIssueButton"
style="?attr/honeycombButtonStyle"
app:honeycombButtonIcon="@drawable/ic_settings_reportissue"
app:honeycombButtonText="@string/settings_report_issue"
app:honeycombSecondaryText="@string/bug_report_url"
app:honeycombButtonTextSize="@dimen/settings_main_button_text_width" />
</LinearLayout>
</RelativeLayout>
</HorizontalScrollView>
Expand Down

0 comments on commit 70cb3f6

Please sign in to comment.