summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorChing Tzung Lin <ctlin@google.com>2015-11-03 18:39:40 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-11-03 18:39:40 +0000
commit7f54aa1e814527371d54864bcbf9387553822ea7 (patch)
tree5d2043c527cb40730ef94c22afd4035160c144ba /core/res
parent9a13cc69926c90fe75b624a9a781dc56706a6091 (diff)
parentf83d778e10d97d4bf856be3d10b2b23e4804d5f1 (diff)
downloadframeworks_base-7f54aa1e814527371d54864bcbf9387553822ea7.zip
frameworks_base-7f54aa1e814527371d54864bcbf9387553822ea7.tar.gz
frameworks_base-7f54aa1e814527371d54864bcbf9387553822ea7.tar.bz2
Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/values/dimens.xml5
-rw-r--r--core/res/res/values/symbols.xml1
2 files changed, 0 insertions, 6 deletions
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index 3223940..a6342c2 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -364,11 +364,6 @@
<dimen name="resolver_max_width">480dp</dimen>
- <!-- @deprecated Use config_windowOutsetBottom instead.
- Size of the offset applied to the position of the circular mask. This
- is only used on circular displays. In the case where there is no
- "chin", this will default to 0 -->
- <dimen name="circular_display_mask_offset">0px</dimen>
<!-- Amount to reduce the size of the circular mask by (to compensate for
aliasing effects). This is only used on circular displays. -->
<dimen name="circular_display_mask_thickness">1px</dimen>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 7754f86..cbccd19 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -445,7 +445,6 @@
<java-symbol type="dimen" name="notification_large_icon_circle_padding" />
<java-symbol type="dimen" name="notification_badge_size" />
<java-symbol type="dimen" name="immersive_mode_cling_width" />
- <java-symbol type="dimen" name="circular_display_mask_offset" />
<java-symbol type="dimen" name="accessibility_magnification_indicator_width" />
<java-symbol type="dimen" name="circular_display_mask_thickness" />