Skip to content

A
angle
Commit c8be560b by Tim Van Patten Committed by Commit Bot
Options

Fix show_angle_in_use_dialog_box Global.Setting Name

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/1410286Reviewed-by: 's avatarCourtney Goeltzenleuchter <courtneygo@google.com> Commit-Queue: Tim Van Patten <timvp@google.com>
parent 5f82dde6
Showing with 5 additions and 4 deletions
android/res/values/global_settings.xml
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<resources> <resources>
<string name="global_settings_driver_all_angle">angle_gl_driver_all_angle</string> <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_pkgs">angle_gl_driver_selection_pkgs</string>
<string name="global_settings_driver_selection_values">angle_gl_driver_selection_values</string> <string name="global_settings_driver_selection_values">angle_gl_driver_selection_values</string>
</resources> </resources>
\ No newline at end of file
android/res/xml/main.xml
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<android.support.v14.preference.SwitchPreference <android.support.v14.preference.SwitchPreference
android:key="@string/pref_key_angle_in_use_dialog" android:key="@string/pref_key_angle_in_use_dialog"
android:title="@string/show_angle_in_use_dialog_box" 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:defaultValue="false"
android:enabled="true"/> android:enabled="true"/>
</PreferenceCategory> </PreferenceCategory>
......
android/src/com/android/angle/common/GlobalSettings.java
...@@ -54,7 +54,7 @@ class GlobalSettings ...@@ -54,7 +54,7 @@ class GlobalSettings
try try
{ {
int showAngleInUseDialogBox = Settings.Global.getInt(contentResolver, 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); return (showAngleInUseDialogBox == 1);
} }
catch (Settings.SettingNotFoundException e) catch (Settings.SettingNotFoundException e)
...@@ -74,7 +74,7 @@ class GlobalSettings ...@@ -74,7 +74,7 @@ class GlobalSettings
{ {
ContentResolver contentResolver = context.getContentResolver(); ContentResolver contentResolver = context.getContentResolver();
Settings.Global.putInt(contentResolver, 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); showAngleInUseDialog ? 1 : 0);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment