Hash :
c8be560b
Author :
Date :
2019-01-14T17:34:09
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/1410286 Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com> Commit-Queue: Tim Van Patten <timvp@google.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2018 The ANGLE Project Authors. All rights reserved. Use of this
source code is governed by a BSD-style license that can be found in the
LICENSE file.
-->
<android.support.v7.preference.PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory
android:key="@string/pref_key_angle_flags_category"
android:title="@string/angle_general_title">
<!--TODO : Issue 2989 : boulder-graphics-team@google.com
Enable the switch once Android can boot with ANGLE enabled for everything-->
<android.support.v14.preference.SwitchPreference
android:key="@string/pref_key_all_angle"
android:title="@string/use_angle_for_all_apps"
android:summary="@string/global_settings_driver_all_angle"
android:defaultValue="false"
android:enabled="false"/>
<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_show_angle_in_use_dialog_box"
android:defaultValue="false"
android:enabled="true"/>
</PreferenceCategory>
<PreferenceCategory
android:key="@string/pref_key_select_opengl_driver_category"
android:title="@string/select_opengl_driver_title">
</PreferenceCategory>
</android.support.v7.preference.PreferenceScreen>