summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author mincheli <mincheli@google.com> 2021-01-20 15:06:06 +0800
committer Minche Li <mincheli@google.com> 2021-02-05 07:42:59 +0000
commitab72f7bb7beb1e045c6fa8b343f1fa42d19cc3f3 (patch)
tree5fe5ab0fa7ffd56e5badf7d6a4f06d0b6af64be4
parentf15709a8e2b7948070d626fd37ea21b48c94d48d (diff)
Adds a new config flag, config_magnification_area
We adds a new config flag to control whether to enable "magnification area" of the window magnifier. If "magnification area" is not enabled, we would hide the settings entry in magnification settings and adjust both the magnifcation capability settings and the promt settings. Bug: 177371954 Test: none Change-Id: Ib14dc6f48d5695c5729b2552cac72ac603db0436 (cherry picked from commit 0b488920eab844c8e181fa0776f158fe8d81ea15) Merged-In: Ib14dc6f48d5695c5729b2552cac72ac603db0436
-rw-r--r--core/res/res/values/config.xml4
-rw-r--r--core/res/res/values/symbols.xml2
2 files changed, 6 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 5e0cda69911b..afd6444518e7 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -3202,6 +3202,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 dfccdf4bd9a5..01c93894e4d7 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -4142,6 +4142,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 -->