diff options
| author | 2021-02-19 05:17:45 +0000 | |
|---|---|---|
| committer | 2021-02-19 05:17:45 +0000 | |
| commit | be1859ed5e0c603136c20650f0e4e19f5f870c7c (patch) | |
| tree | 7396ce0b27055402961963b4d29b4320908ff477 | |
| parent | 966a1b152fb323abcba05bc2a0c3f8ad42149759 (diff) | |
| parent | ab72f7bb7beb1e045c6fa8b343f1fa42d19cc3f3 (diff) | |
Merge "Adds a new config flag, config_magnification_area" into sc-dev
| -rw-r--r-- | core/res/res/values/config.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index faa2157be302..59285d794045 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3205,6 +3205,10 @@ panning to scaling the magnification viewport. --> <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. --> <bool name="config_enableBurnInProtection">false</bool> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index f66d33b02b69..50809140f66a 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -4174,6 +4174,8 @@ <java-symbol type="string" name="turn_on_magnification_settings_action" /> <java-symbol type="string" name="dismiss_action" /> + <java-symbol type="bool" name="config_magnification_area" /> + <java-symbol type="bool" name="config_trackerAppNeedsPermissions"/> <!-- Package with global data query permissions for AppSearch --> |