Fix show_angle_in_use_dialog_box Global.Setting Name

timvpGoogle · Commit Bot · commit c8be560bbabe · 2019-01-15T21:04:57.000Z
The Global.Setting was previously named angle_in_use_dialog_box, which doesn't match some of the other variables and uses on the Android side. This change will update it to show_angle_in_use_dialog_box to make everything match both here and where it's used within Android. Bug: angleproject:3006 Test: Load an app with ANGLE enabled and verify dialog box is shown. Test: Load an app without ANGLE and verify dialog box is not shown. Change-Id: I808ebc94f706a019eca6f3911a702853642926e0 Reviewed-on: https://chromium-review.googlesource.com/c/1410286 Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com> Commit-Queue: Tim Van Patten <timvp@google.com>
diff --git a/android/res/values/global_settings.xml b/android/res/values/global_settings.xml
@@ -7,7 +7,7 @@
 
 <resources>
     <string name="global_settings_driver_all_angle">angle_gl_driver_all_angle</string>
-    <string name="global_settings_angle_in_use_dialog_box">angle_in_use_dialog_box</string>
+    <string name="global_settings_show_angle_in_use_dialog_box">show_angle_in_use_dialog_box</string>
     <string name="global_settings_driver_selection_pkgs">angle_gl_driver_selection_pkgs</string>
     <string name="global_settings_driver_selection_values">angle_gl_driver_selection_values</string>
 </resources>
diff --git a/android/res/xml/main.xml b/android/res/xml/main.xml
@@ -24,7 +24,7 @@
         <android.support.v14.preference.SwitchPreference
             android:key="@string/pref_key_angle_in_use_dialog"
             android:title="@string/show_angle_in_use_dialog_box"
-            android:summary="@string/global_settings_angle_in_use_dialog_box"
+            android:summary="@string/global_settings_show_angle_in_use_dialog_box"
             android:defaultValue="false"
             android:enabled="true"/>
     </PreferenceCategory>
diff --git a/android/src/com/android/angle/common/GlobalSettings.java b/android/src/com/android/angle/common/GlobalSettings.java
@@ -54,7 +54,7 @@ Boolean getShowAngleInUseDialogBox()
         try
         {
             int showAngleInUseDialogBox = Settings.Global.getInt(contentResolver,
-                    mContext.getString(R.string.global_settings_angle_in_use_dialog_box));
+                    mContext.getString(R.string.global_settings_show_angle_in_use_dialog_box));
             return (showAngleInUseDialogBox == 1);
         }
         catch (Settings.SettingNotFoundException e)
@@ -74,7 +74,7 @@ static void updateShowAngleInUseDialog(Context context, Boolean showAngleInUseDi
     {
         ContentResolver contentResolver = context.getContentResolver();
         Settings.Global.putInt(contentResolver,
-                context.getString(R.string.global_settings_angle_in_use_dialog_box),
+                context.getString(R.string.global_settings_show_angle_in_use_dialog_box),
                 showAngleInUseDialog ? 1 : 0);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ Boolean getShowAngleInUseDialogBox()`
`54`	`54`	`try`
`55`	`55`	`{`
`56`	`56`	`int showAngleInUseDialogBox = Settings.Global.getInt(contentResolver,`
`57`		`- mContext.getString(R.string.global_settings_angle_in_use_dialog_box));`
	`57`	`+ mContext.getString(R.string.global_settings_show_angle_in_use_dialog_box));`
`58`	`58`	`return (showAngleInUseDialogBox == 1);`
`59`	`59`	`}`
`60`	`60`	`catch (Settings.SettingNotFoundException e)`
`@@ -74,7 +74,7 @@ static void updateShowAngleInUseDialog(Context context, Boolean showAngleInUseDi`
`74`	`74`	`{`
`75`	`75`	`ContentResolver contentResolver = context.getContentResolver();`
`76`	`76`	`Settings.Global.putInt(contentResolver,`
`77`		`- context.getString(R.string.global_settings_angle_in_use_dialog_box),`
	`77`	`+ context.getString(R.string.global_settings_show_angle_in_use_dialog_box),`
`78`	`78`	`showAngleInUseDialog ? 1 : 0);`
`79`	`79`	`}`
`80`	`80`