Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f

Change-Id: Ife2360ddac1e760471c0ab22f588f344e0d6723d
This commit is contained in:
Amy Hsu
2020-05-20 08:51:01 +00:00
committed by Automerger Merge Worker
7 changed files with 333 additions and 0 deletions

View File

@@ -459,4 +459,7 @@
<!-- Whether to show Enhanced Connectivity switch in Developer Options -->
<bool name="config_show_enhanced_connectivity">false</bool>
<!-- Whether to show Smooth Display feature in Settings Options -->
<bool name="config_show_smooth_display">false</bool>
</resources>

View File

@@ -2746,6 +2746,10 @@
<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, peak refresh rate settings title [CHAR LIMIT=30] -->
<string name="peak_refresh_rate_title">Smooth Display</string>
<!-- Display settings screen, peak refresh rate settings summary [CHAR LIMIT=NONE] -->
<string name="peak_refresh_rate_summary">Automatically raises the refresh rate from 60 to 90 Hz for some content. Increases battery usage.</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] -->

View File

@@ -97,6 +97,12 @@
android:summary="@string/display_white_balance_summary"
settings:controller="com.android.settings.display.DisplayWhiteBalancePreferenceController" />
<SwitchPreference
android:key="peak_refresh_rate"
android:title="@string/peak_refresh_rate_title"
android:summary="@string/peak_refresh_rate_summary"
settings:controller="com.android.settings.display.PeakRefreshRatePreferenceController" />
<Preference
android:key="font_size"
android:title="@string/title_font_size"