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

Commit 6584f32b authored by Sally Qi's avatar Sally Qi Committed by Android (Google) Code Review
Browse files

Merge "Settings: add a new developer menu entry to show hdr/sdr ratio overlay." into main

parents 57ca9c9c fbb088ff

aconfig/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ aconfig_declarations { 
    srcs: [

        "settings_accessibility_flag_declarations.aconfig",

        "settings_connecteddevice_flag_declarations.aconfig",

        "settings_development_flag_declarations.aconfig",

        "settings_globalintl_flag_declarations.aconfig",

        "settings_experience_flag_declarations.aconfig",

	"settings_notification_flag_declarations.aconfig",

aconfig/settings_development_flag_declarations.aconfig

0 → 100644
+13 −0
Original line number Diff line number Diff line 
package: "com.android.settings.flags"



# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.



# NOTE: All Settings flags share the same Flags class, so prefix our

# flags with 'development' to prevent naming collision.



flag {

  name: "development_hdr_sdr_ratio"

  namespace: "core_graphics"

  description: "Shows hdr/sdr dev opton on the development options page from aconfig"

  bug: "291863102"

}

res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -1857,6 +1857,11 @@ 
    <!-- Debugging developer settings: show refresh rate summary [CHAR LIMIT=58] -->

    <string name="show_refresh_rate_summary">Show the current display refresh rate</string>









    <!-- Debugging developer settings: show HDR/SDR ratio? [CHAR LIMIT=36] -->









    <string name="show_hdr_sdr_ratio">Show HDR/SDR ratio</string>









    <!-- Debugging developer settings: show HDR/SDR ratio summary [CHAR LIMIT=58] -->









    <string name="show_hdr_sdr_ratio_summary">Show the current HDR/SDR ratio</string>

















    <!-- NFC settings -->









    <!-- Used in the 1st-level settings screen to turn on NFC -->









    <string name="nfc_quick_toggle_title">NFC</string>
































res/xml/development_settings.xml



+5
−0






























Original line number
Diff line number
Diff line







@@ -273,6 +273,11 @@







            android:title="@string/show_refresh_rate"









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



















        <SwitchPreferenceCompat









            android:key="show_hdr_sdr_ratio"









            android:title="@string/show_hdr_sdr_ratio"









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



















        <SwitchPreferenceCompat









            android:key="overlay_settings"









            android:title="@string/overlay_settings_title"
































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



+1
−0






























Original line number
Diff line number
Diff line







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







        controllers.add(new ShowKeyPressesPreferenceController(context));









        controllers.add(new ShowSurfaceUpdatesPreferenceController(context));









        controllers.add(new ShowLayoutBoundsPreferenceController(context));









        controllers.add(new ShowHdrSdrRatioPreferenceController(context));









        controllers.add(new ShowRefreshRatePreferenceController(context));









        controllers.add(new RtlLayoutPreferenceController(context));









        controllers.add(new WindowAnimationScalePreferenceController(context));