Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9f902b9 authored by Yiwei Zhang's avatar Yiwei Zhang Committed by Android (Google) Code Review
Browse files

Merge "GUP: Display a list of Apps and dialogs"

parents f57f490a 83c030f1

res/values/strings.xml

+14 −7
Original line number Diff line number Diff line
@@ -10055,17 +10055,24 @@ 
    <!-- UI debug setting: ANGLE enabled app has been set [CHAR LIMIT=NONE] -->

    <string name="angle_enabled_app_set">ANGLE enabled application: <xliff:g id="app_name" example="com.company.app">%1$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 Update Packages dashboard where developers can configure apps to use GUP or not [CHAR LIMIT=50] -->









    <string name="gup_dashboard_title">Game Update Packages Preferences</string>









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









    <string name="gup_dashboard_summary">Modify Game Update Packages settings</string>









    <!-- Title for Game Update Packages preference [CHAR LIMIT=50] -->









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









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









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









    <!-- The gup value for Game Update Packages preference [CHAR LIMIT=50] -->









    <string name="gup_app_preference_gup">Game Update Packages</string>









    <!-- The native value for Game Update Packages preference [CHAR LIMIT=50] -->









    <string name="gup_app_preference_native">Native Graphics Driver</string>









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









    <string-array name="gup_app_preference_values">









        <item>@string/gup_app_preference_default</item>









        <item>@string/gup_app_preference_gup</item>









        <item>@string/gup_app_preference_native</item>









    </string-array>

















    <!-- Slices Strings -->

































res/xml/development_settings.xml



+2
−6






























Original line number
Diff line number
Diff line







@@ -195,7 +195,8 @@







            android:key="gup_dashboard"









            android:title="@string/gup_dashboard_title"









            android:summary="@string/gup_dashboard_summary"









            android:fragment="com.android.settings.development.gup.GupDashboard" />









            android:fragment="com.android.settings.development.gup.GupDashboard"









            settings:searchable="false" />



















    </PreferenceCategory>


















@@ -430,11 +431,6 @@







            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
































res/xml/gup_settings.xml



+11
−1






























Original line number
Diff line number
Diff line







@@ -17,4 +17,14 @@

















<PreferenceScreen









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









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








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









    android:key="gup_settings"









    android:title="@string/gup_dashboard_title">



















    <PreferenceCategory









        android:key="gup_category"









        android:title="@string/gup_app_preference_title"









        settings:controller="com.android.settings.development.gup.GupPreferenceController">









    </PreferenceCategory>



















</PreferenceScreen>
























src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java



+0
−2






























Original line number
Diff line number
Diff line







@@ -31,6 +31,4 @@ public interface DevelopmentOptionsActivityRequestCodes {







    int REQUEST_CODE_ANGLE_DRIVER_PKGS = 4;



















    int REQUEST_CODE_ANGLE_DRIVER_VALUES = 5;



















    int REQUEST_CODE_GUP_DEV_OPT_IN_APPS = 6;









}
























src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java



+0
−1






























Original line number
Diff line number
Diff line







@@ -423,7 +423,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra







        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));