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

Commit 32600e06 authored by tmfang's avatar tmfang Committed by android-build-merger
Browse files

Merge "Add summary for white balance feature" into qt-r1-dev am: 9cd8167b 

am: ef24931f

Change-Id: I9b205093afd8e9280b529fdc64e6b6c70cc94a77
parents 5328bb34 ef24931f

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -2824,6 +2824,8 @@ 








    <!-- Display settings screen, display white balance settings title [CHAR LIMIT=30] -->









    <string name="display_white_balance_title">Display white balance</string>









    <!-- Display settings screen, display white balance settings summary [CHAR LIMIT=NONE] -->









    <string name="display_white_balance_summary"></string>









    <!-- Display settings screen, setting option name to enable adaptive sleep [CHAR LIMIT=30] -->









    <string name="adaptive_sleep_title">Screen attention</string>









    <!-- Setting option summary when adaptive sleep is on [CHAR LIMIT=NONE] -->
































res/xml/display_settings.xml



+1
−0






























Original line number
Diff line number
Diff line







@@ -93,6 +93,7 @@







    <SwitchPreference









        android:key="display_white_balance"









        android:title="@string/display_white_balance_title"









        android:summary="@string/display_white_balance_summary"









        settings:controller="com.android.settings.display.DisplayWhiteBalancePreferenceController" />



















    <Preference