From 092bc46ae905abf1287546d6a3f016b27368e973 Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Wed, 21 Aug 2019 00:04:52 +0200
Subject: [PATCH 1/2] Replace all the hardcoded Firefox strings

---
 .../vrbrowser/ui/views/settings/SwitchSetting.java   |  4 ++++
 .../mozilla/vrbrowser/ui/widgets/WindowWidget.java   | 12 +-----------
 .../ui/widgets/dialogs/VoiceSearchWidget.java        |  2 +-
 .../ui/widgets/settings/SettingsHeader.java          |  4 ++++
 app/src/main/res/layout/options_language_display.xml |  2 +-
 app/src/main/res/layout/options_privacy.xml          |  8 ++++----
 app/src/main/res/values/strings.xml                  | 12 ++++++------
 7 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/SwitchSetting.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/SwitchSetting.java
index eabf4b821..2da94e8f9 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/SwitchSetting.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/SwitchSetting.java
@@ -122,4 +122,8 @@ public void setHelpDelegate(Runnable aDelegate) {
         }
     }
 
+    public void setDescription(@NonNull String description) {
+        mSwitchDescription.setText(description);
+    }
+
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
index 8ac7f6e41..50a201edd 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
@@ -737,17 +737,7 @@ public void showButtonPrompt(String title, @NonNull String msg, @NonNull String[
         mConfirmPrompt.show(REQUEST_FOCUS);
     }
 
-    public void showAppDialog(@NonNull @StringRes int title, @NonNull @StringRes int  description, @NonNull  @StringRes int [] btnMsg, @NonNull AppDialogWidget.Delegate callback) {
-        mAppDialog = new AppDialogWidget(getContext());
-        mAppDialog.mWidgetPlacement.parentHandle = getHandle();
-        mAppDialog.setTitle(title);
-        mAppDialog.setMessage(description);
-        mAppDialog.setButtons(btnMsg);
-        mAppDialog.setDelegate(callback);
-        mAppDialog.show(REQUEST_FOCUS);
-    }
-
-    public void showAppDialog(@NonNull String title, @NonNull String description, @NonNull String[] btnMsg, @NonNull AppDialogWidget.Delegate callback) {
+    public void showAppDialog(@NonNull String title, @NonNull @StringRes int  description, @NonNull  @StringRes int [] btnMsg, @NonNull AppDialogWidget.Delegate callback) {
         mAppDialog = new AppDialogWidget(getContext());
         mAppDialog.mWidgetPlacement.parentHandle = getHandle();
         mAppDialog.setTitle(title);
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/VoiceSearchWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/VoiceSearchWidget.java
index 7806098db..c8467ff42 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/VoiceSearchWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/VoiceSearchWidget.java
@@ -286,7 +286,7 @@ public void show(@ShowFlags int aShowFlags) {
 
         } else {
             mWidgetManager.getFocusedWindow().showAppDialog(
-                    R.string.voice_samples_collect_dialog_title,
+                    getResources().getString(R.string.voice_samples_collect_dialog_title, getResources().getString(R.string.app_name)),
                     R.string.voice_samples_collect_dialog_description,
                     new int[]{
                             R.string.voice_samples_collect_dialog_do_not_allow,
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/SettingsHeader.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/SettingsHeader.java
index b32a81774..220dfcae0 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/SettingsHeader.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/SettingsHeader.java
@@ -81,4 +81,8 @@ public void setHelpClickListener(@NonNull View.OnClickListener listener) {
         mBinding.setHelpClickListener(listener);
     }
 
+    public void setTitle(@NonNull String title) {
+        mBinding.setTitle(title);
+    }
+
 }
diff --git a/app/src/main/res/layout/options_language_display.xml b/app/src/main/res/layout/options_language_display.xml
index dc0544996..2aeb2d1e0 100644
--- a/app/src/main/res/layout/options_language_display.xml
+++ b/app/src/main/res/layout/options_language_display.xml
@@ -18,7 +18,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:title="@string/settings_language_choose_language_display_title" />
+            app:title="@{String.format(@string/settings_language_choose_language_display_title, @string/app_name)}" />
 
         <ScrollView
             android:id="@+id/scrollbar"
diff --git a/app/src/main/res/layout/options_privacy.xml b/app/src/main/res/layout/options_privacy.xml
index 582969f57..a95d21fa7 100644
--- a/app/src/main/res/layout/options_privacy.xml
+++ b/app/src/main/res/layout/options_privacy.xml
@@ -115,7 +115,7 @@
                     style="@style/settingsDescription"
                     android:height="40dp"
                     android:gravity="center_vertical"
-                    android:text="@string/security_options_speech_data_title" />
+                    android:text="@{String.format(@string/security_options_speech_data_title, @string/app_name)}" />
 
                 <org.mozilla.vrbrowser.ui.views.settings.SwitchSetting
                     android:id="@+id/speechDataSwitch"
@@ -124,7 +124,7 @@
                     android:layout_marginStart="40dp"
                     app:on_text="@string/permission_allow"
                     app:off_text="@string/permission_reject"
-                    app:description="@string/security_options_speech_data" />
+                    app:description="@{String.format(@string/security_options_speech_data, @string/app_name)}" />
 
                 <org.mozilla.vrbrowser.ui.views.settings.SwitchSetting
                     android:id="@+id/telemetryDataSwitch"
@@ -133,7 +133,7 @@
                     android:layout_marginStart="40dp"
                     app:on_text="@string/permission_allow"
                     app:off_text="@string/permission_reject"
-                    app:description="@string/security_options_telemetry_data" />
+                    app:description="@{String.format(@string/security_options_telemetry_data, @string/app_name)}" />
 
                 <org.mozilla.vrbrowser.ui.views.settings.SwitchSetting
                     android:id="@+id/crashReportsDataSwitch"
@@ -142,7 +142,7 @@
                     android:layout_marginStart="40dp"
                     app:on_text="@string/permission_allow"
                     app:off_text="@string/permission_reject"
-                    app:description="@string/security_options_crash_reports_data" />
+                    app:description="@{String.format(@string/security_options_crash_reports_data, @string/app_name)}" />
 
             </LinearLayout>
         </ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f6b4d9438..c2c52765d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -141,7 +141,7 @@
          'Firefox Display Language' dialog window (accessible from the browser's Settings dialog window).
          Below this string appears a list of locales for the user to choose as their preferred display
          language for the application UI. -->
-    <string name="settings_language_choose_language_display_title">Firefox Display Language</string>
+    <string name="settings_language_choose_language_display_title">%1$s Display Language</string>
 
     <!-- This string is used to label a text label that appears in the header description of 'Language Settings' ->
          'Firefox Display Language' dialog window (accessible from the browser's Settings dialog window).
@@ -476,20 +476,20 @@
 
     <!-- This string is a label above the group of switches that indicates that the switches below
          relate to Firefox data collection and use. -->
-    <string name="security_options_speech_data_title">Firefox Data Collection and Use</string>
+    <string name="security_options_speech_data_title">%1$s Data Collection and Use</string>
 
     <!-- This string labels an Allow/Don't Allow switch in the Privacy and Security settings dialog
      and is used to enable or disable permission to collect speech data. -->
-    <string name="security_options_speech_data">Allow Firefox to collect speech data</string>
+    <string name="security_options_speech_data">Allow %1$s to collect speech data</string>
 
     <!-- This string labels an Allow/Don't Allow switch in the Privacy and Security settings dialog
      and is used to enable or disable permission to collect telemetry data. -->
-    <string name="security_options_telemetry_data">Allow Firefox to send technical and interaction data to Mozilla
+    <string name="security_options_telemetry_data">Allow %1$s to send technical and interaction data to Mozilla
  </string>
 
     <!-- This string labels an Allow/Don't Allow switch in the Privacy and Security settings dialog
      and is used to enable or disable permission to send crash reports. -->
-    <string name="security_options_crash_reports_data">Allow Firefox to send backlogged crash reports on your behalf
+    <string name="security_options_crash_reports_data">Allow %1$s to send backlogged crash reports on your behalf
 </string>
 
     <!-- This string is displayed below the On/Off switch to indicate a switch's current state as 'On'. -->
@@ -860,7 +860,7 @@
 
     <!-- This string is displayed in the title of the Voice Search samples collect dialog. That dialog is shown the first time
          a user tries to use the voice search. -->
-    <string name="voice_samples_collect_dialog_title">Allow Firefox Reality to Collect Voice Samples for Research?</string>
+    <string name="voice_samples_collect_dialog_title">Allow %1$s to Collect Voice Samples for Research?</string>
 
     <!-- This string is displayed in the description of the Voice Search samples collect dialog. That dialog is shown the first time
          a user tries to use the voice search. -->

From 4d04b49906c66f5e7c82f53b9254bb94c52b2cc5 Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Wed, 21 Aug 2019 23:21:52 +0200
Subject: [PATCH 2/2] Updated modified strings id

---
 .../ui/widgets/dialogs/VoiceSearchWidget.java        |  2 +-
 app/src/main/res/layout/options_language_display.xml |  2 +-
 app/src/main/res/layout/options_privacy.xml          |  8 ++++----
 app/src/main/res/layout/setting_switch.xml           |  1 +
 app/src/main/res/values/strings.xml                  | 12 ++++++------
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/VoiceSearchWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/VoiceSearchWidget.java
index c8467ff42..e41291424 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/VoiceSearchWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/VoiceSearchWidget.java
@@ -286,7 +286,7 @@ public void show(@ShowFlags int aShowFlags) {
 
         } else {
             mWidgetManager.getFocusedWindow().showAppDialog(
-                    getResources().getString(R.string.voice_samples_collect_dialog_title, getResources().getString(R.string.app_name)),
+                    getResources().getString(R.string.voice_samples_collect_data_dialog_title, getResources().getString(R.string.app_name)),
                     R.string.voice_samples_collect_dialog_description,
                     new int[]{
                             R.string.voice_samples_collect_dialog_do_not_allow,
diff --git a/app/src/main/res/layout/options_language_display.xml b/app/src/main/res/layout/options_language_display.xml
index 2aeb2d1e0..4a94887c8 100644
--- a/app/src/main/res/layout/options_language_display.xml
+++ b/app/src/main/res/layout/options_language_display.xml
@@ -18,7 +18,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:title="@{String.format(@string/settings_language_choose_language_display_title, @string/app_name)}" />
+            app:title="@{String.format(@string/settings_language_choose_display_language_title, @string/app_name)}" />
 
         <ScrollView
             android:id="@+id/scrollbar"
diff --git a/app/src/main/res/layout/options_privacy.xml b/app/src/main/res/layout/options_privacy.xml
index a95d21fa7..44549140b 100644
--- a/app/src/main/res/layout/options_privacy.xml
+++ b/app/src/main/res/layout/options_privacy.xml
@@ -115,7 +115,7 @@
                     style="@style/settingsDescription"
                     android:height="40dp"
                     android:gravity="center_vertical"
-                    android:text="@{String.format(@string/security_options_speech_data_title, @string/app_name)}" />
+                    android:text="@{String.format(@string/security_options_speech_data_collection_title, @string/app_name)}" />
 
                 <org.mozilla.vrbrowser.ui.views.settings.SwitchSetting
                     android:id="@+id/speechDataSwitch"
@@ -124,7 +124,7 @@
                     android:layout_marginStart="40dp"
                     app:on_text="@string/permission_allow"
                     app:off_text="@string/permission_reject"
-                    app:description="@{String.format(@string/security_options_speech_data, @string/app_name)}" />
+                    app:description="@{String.format(@string/security_options_speech_data_collect, @string/app_name)}" />
 
                 <org.mozilla.vrbrowser.ui.views.settings.SwitchSetting
                     android:id="@+id/telemetryDataSwitch"
@@ -133,7 +133,7 @@
                     android:layout_marginStart="40dp"
                     app:on_text="@string/permission_allow"
                     app:off_text="@string/permission_reject"
-                    app:description="@{String.format(@string/security_options_telemetry_data, @string/app_name)}" />
+                    app:description="@{String.format(@string/security_options_telemetry_send_data, @string/app_name)}" />
 
                 <org.mozilla.vrbrowser.ui.views.settings.SwitchSetting
                     android:id="@+id/crashReportsDataSwitch"
@@ -142,7 +142,7 @@
                     android:layout_marginStart="40dp"
                     app:on_text="@string/permission_allow"
                     app:off_text="@string/permission_reject"
-                    app:description="@{String.format(@string/security_options_crash_reports_data, @string/app_name)}" />
+                    app:description="@{String.format(@string/security_options_crash_reports_send_data, @string/app_name)}" />
 
             </LinearLayout>
         </ScrollView>
diff --git a/app/src/main/res/layout/setting_switch.xml b/app/src/main/res/layout/setting_switch.xml
index 75785f2b9..acf7789f9 100644
--- a/app/src/main/res/layout/setting_switch.xml
+++ b/app/src/main/res/layout/setting_switch.xml
@@ -22,6 +22,7 @@
                 <TextView
                     android:id="@+id/setting_description"
                     android:textAlignment="textStart"
+                    android:paddingEnd="20dp"
                     style="@style/settingsText"
                     tools:text="Switch Setting Description" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c2c52765d..989aaccb8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -141,7 +141,7 @@
          'Firefox Display Language' dialog window (accessible from the browser's Settings dialog window).
          Below this string appears a list of locales for the user to choose as their preferred display
          language for the application UI. -->
-    <string name="settings_language_choose_language_display_title">%1$s Display Language</string>
+    <string name="settings_language_choose_display_language_title">%1$s Display Language</string>
 
     <!-- This string is used to label a text label that appears in the header description of 'Language Settings' ->
          'Firefox Display Language' dialog window (accessible from the browser's Settings dialog window).
@@ -476,20 +476,20 @@
 
     <!-- This string is a label above the group of switches that indicates that the switches below
          relate to Firefox data collection and use. -->
-    <string name="security_options_speech_data_title">%1$s Data Collection and Use</string>
+    <string name="security_options_speech_data_collection_title">%1$s Data Collection and Use</string>
 
     <!-- This string labels an Allow/Don't Allow switch in the Privacy and Security settings dialog
      and is used to enable or disable permission to collect speech data. -->
-    <string name="security_options_speech_data">Allow %1$s to collect speech data</string>
+    <string name="security_options_speech_data_collect">Allow %1$s to collect speech data</string>
 
     <!-- This string labels an Allow/Don't Allow switch in the Privacy and Security settings dialog
      and is used to enable or disable permission to collect telemetry data. -->
-    <string name="security_options_telemetry_data">Allow %1$s to send technical and interaction data to Mozilla
+    <string name="security_options_telemetry_send_data">Allow %1$s to send technical and interaction data to Mozilla
  </string>
 
     <!-- This string labels an Allow/Don't Allow switch in the Privacy and Security settings dialog
      and is used to enable or disable permission to send crash reports. -->
-    <string name="security_options_crash_reports_data">Allow %1$s to send backlogged crash reports on your behalf
+    <string name="security_options_crash_reports_send_data">Allow %1$s to send backlogged crash reports on your behalf
 </string>
 
     <!-- This string is displayed below the On/Off switch to indicate a switch's current state as 'On'. -->
@@ -860,7 +860,7 @@
 
     <!-- This string is displayed in the title of the Voice Search samples collect dialog. That dialog is shown the first time
          a user tries to use the voice search. -->
-    <string name="voice_samples_collect_dialog_title">Allow %1$s to Collect Voice Samples for Research?</string>
+    <string name="voice_samples_collect_data_dialog_title">Allow %1$s to Collect Voice Samples for Research?</string>
 
     <!-- This string is displayed in the description of the Voice Search samples collect dialog. That dialog is shown the first time
          a user tries to use the voice search. -->