Merge "Adds a new config flag, config_magnification_area" into sc-dev

This commit is contained in:
Minche Li
2021-02-19 05:17:45 +00:00
committed by Android (Google) Code Review
2 changed files with 6 additions and 0 deletions

View File

@@ -3205,6 +3205,10 @@
panning to scaling the magnification viewport. --> panning to scaling the magnification viewport. -->
<item name="config_screen_magnification_scaling_threshold" format="float" type="dimen">0.3</item> <item name="config_screen_magnification_scaling_threshold" format="float" type="dimen">0.3</item>
<!-- Whether to support magnification area. If not enabled, it would hide the entry in
magnification settings and adjust the default magnification capability. -->
<bool name="config_magnification_area">true</bool>
<!-- If true, the display will be shifted around in ambient mode. --> <!-- If true, the display will be shifted around in ambient mode. -->
<bool name="config_enableBurnInProtection">false</bool> <bool name="config_enableBurnInProtection">false</bool>

View File

@@ -4174,6 +4174,8 @@
<java-symbol type="string" name="turn_on_magnification_settings_action" /> <java-symbol type="string" name="turn_on_magnification_settings_action" />
<java-symbol type="string" name="dismiss_action" /> <java-symbol type="string" name="dismiss_action" />
<java-symbol type="bool" name="config_magnification_area" />
<java-symbol type="bool" name="config_trackerAppNeedsPermissions"/> <java-symbol type="bool" name="config_trackerAppNeedsPermissions"/>
<!-- Package with global data query permissions for AppSearch --> <!-- Package with global data query permissions for AppSearch -->