Merge changes from topic "GameDriver2"

         show both names, with the directory name wrapped in parenthesis -->

    <string name="directory_on_volume"><xliff:g id="volume" example="SD Card">%1$s</xliff:g> (<xliff:g id="directory" example="Movies">%2$s</xliff:g>)</string>

    <!-- UI debug setting: select an app to use Game Update Package [CHAR LIMIT=100] -->

    <string name="gup_dev_opt_in_app">Use Game Update Package</string>

    <!-- UI debug setting: no app selected to use Game Update Package [CHAR LIMIT=100] -->

    <string name="gup_dev_opt_in_app_not_set">No selected app</string>

    <!-- UI debug setting: app selected to use Game Update Package [CHAR LIMIT=NONE] -->

    <string name="gup_dev_opt_in_app_set"><xliff:g id="app_name" example="com.company.app">%1$s</xliff:g></string>

    <!-- Title for Game Driver dashboard where developers can configure apps to use game driver or not [CHAR LIMIT=50] -->

    <string name="game_driver_dashboard_title">Game Driver Preferences</string>

    <!-- Summary for Game Driver dashboard [CHAR LIMIT=50] -->

    <string name="game_driver_dashboard_summary">Modify Game Driver settings</string>

    <!-- Footer text for Game Driver dashboard [CHAR LIMIT=NONE] -->

    <string name="game_driver_footer_text">When Game Driver is turned on, you can pick to use the updated graphics driver for Apps installed on the device.</string>

    <!-- Title for Game Driver all apps preference [CHAR LIMIT=50] -->

    <string name="game_driver_all_apps_preference_title">Enable for all apps</string>

    <!-- Title for Game Driver app preference [CHAR LIMIT=50] -->

    <string name="game_driver_app_preference_title">Select Graphics Driver</string>

    <!-- The default value for Game Driver app preference [CHAR LIMIT=50] -->

    <string name="game_driver_app_preference_default">Default</string>

    <!-- The game driver value for Game Driver app preference [CHAR LIMIT=50] -->

    <string name="game_driver_app_preference_game_driver">Game Driver</string>

    <!-- The system value for Game Driver app preference [CHAR LIMIT=50] -->

    <string name="game_driver_app_preference_system">System Graphics Driver</string>

    <!-- All the values for Game Driver app preference [CHAR LIMIT=50] -->

    <string-array name="game_driver_app_preference_values">

        <item>@string/game_driver_app_preference_default</item>

        <item>@string/game_driver_app_preference_game_driver</item>

        <item>@string/game_driver_app_preference_system</item>

    </string-array>

    <!-- Slices Strings -->

            android:title="@string/enable_gpu_debug_layers"

            android:summary="@string/enable_gpu_debug_layers_summary" />

        <Preference

            android:key="game_driver_dashboard"

            android:title="@string/game_driver_dashboard_title"

            android:summary="@string/game_driver_dashboard_summary"

            android:fragment="com.android.settings.development.gamedriver.GameDriverDashboard" />

    </PreferenceCategory>

    <PreferenceCategory

            android:summary="%s"

            android:title="@string/simulate_color_space" />

        <Preference

            android:title="@string/gup_dev_opt_in_app"

            android:key="gup_dev_opt_in_app"

            android:summary="@string/gup_dev_opt_in_app_summary" />

    </PreferenceCategory>

    <PreferenceCategory

<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright 2019 The Android Open Source Project

  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->

<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:key="game_driver_settings"

    android:title="@string/game_driver_dashboard_title">

    <SwitchPreference

        android:key="game_driver_all_apps_preference"

        android:title="@string/game_driver_all_apps_preference_title"

        settings:controller="com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController">

    </SwitchPreference>

    <PreferenceCategory

        android:key="game_driver_category"

        android:title="@string/game_driver_app_preference_title"

        settings:controller="com.android.settings.development.gamedriver.GameDriverAppPreferenceController">

    </PreferenceCategory>

    <com.android.settingslib.widget.FooterPreference

        android:key="footer_preference"

        android:title="@string/game_driver_footer_text"

        android:selectable="false"

        settings:controller="com.android.settings.development.gamedriver.GameDriverFooterPreferenceController">

    </com.android.settingslib.widget.FooterPreference>

</PreferenceScreen>

    int REQUEST_CODE_DEBUG_APP = 1;

    int REQUEST_MOCK_LOCATION_APP = 2;

    int REQUEST_CODE_GUP_DEV_OPT_IN_APPS = 6;

}

        controllers.add(new SelectDebugAppPreferenceController(context, fragment));

        controllers.add(new WaitForDebuggerPreferenceController(context));

        controllers.add(new EnableGpuDebugLayersPreferenceController(context));

        controllers.add(new GameUpdatePackageDevOptInPreferenceController(context, fragment));

        controllers.add(new VerifyAppsOverUsbPreferenceController(context));

        controllers.add(new LogdSizePreferenceController(context));

        controllers.add(new LogPersistPreferenceController(context, fragment, lifecycle));