summaryrefslogtreecommitdiff
path: root/data/res/values/attrs.xml
diff options
context:
space:
mode:
authorJustin Klaassen <justinklaassen@google.com>2017-11-17 16:36:15 -0500
committerJustin Klaassen <justinklaassen@google.com>2017-11-17 16:36:15 -0500
commiteadb714b4252bb6b357bae6d5cb79662893505ba (patch)
tree753741fad6faec619d9bb3eb9d5dc9a0e01d880a /data/res/values/attrs.xml
parent846f26f802e26e5c23206a086d7942f2de3dceaa (diff)
downloadandroid-28-eadb714b4252bb6b357bae6d5cb79662893505ba.tar.gz
Import Android SDK Platform P [4456821]
/google/data/ro/projects/android/fetch_artifact \ --bid 4456821 \ --target sdk_phone_armv7-win_sdk \ sdk-repo-linux-platforms-4456821.zip AndroidVersion.ApiLevel has been modified to appear as 28 Change-Id: Ic76862e378365b62f4520ad9c45261ab5a8cb677
Diffstat (limited to 'data/res/values/attrs.xml')
-rw-r--r--data/res/values/attrs.xml19
1 files changed, 17 insertions, 2 deletions
diff --git a/data/res/values/attrs.xml b/data/res/values/attrs.xml
index f5b391ec..0eefec91 100644
--- a/data/res/values/attrs.xml
+++ b/data/res/values/attrs.xml
@@ -984,6 +984,8 @@
<attr name="dialogTitleDecorLayout" format="reference" />
<!-- Preferred padding for dialog content. -->
<attr name="dialogPreferredPadding" format="dimension" />
+ <!-- Corner radius of dialogs. -->
+ <attr name="dialogCornerRadius" format="dimension" />
<!-- Theme to use for alert dialogs spawned from this theme. -->
<attr name="alertDialogTheme" format="reference" />
@@ -4530,7 +4532,7 @@
<attr name="maxHeight" />
<!-- Makes the TextView be exactly this many lines tall. -->
<attr name="lines" format="integer" min="0" />
- <!-- Makes the TextView be exactly this many pixels tall.
+ <!-- Makes the TextView be exactly this tall.
You could get the same effect by specifying this number in the
layout parameters. -->
<attr name="height" format="dimension" />
@@ -4547,7 +4549,7 @@
<attr name="maxWidth" />
<!-- Makes the TextView be exactly this many ems wide. -->
<attr name="ems" format="integer" min="0" />
- <!-- Makes the TextView be exactly this many pixels wide.
+ <!-- Makes the TextView be exactly this wide.
You could get the same effect by specifying this number in the
layout parameters. -->
<attr name="width" format="dimension" />
@@ -8673,6 +8675,11 @@
<!-- The index of the font in the tcc font file. If the font file referenced is not in the
tcc format, this attribute needs not be specified. -->
<attr name="ttcIndex" format="integer" />
+ <!-- The variation settings to be applied to the font. The string should be in the following
+ format: "'tag1' value1, 'tag2' value2, ...". If the default variation settings should be
+ used, or the font used does not support variation settings, this attribute needs not be
+ specified. -->
+ <attr name="fontVariationSettings" format="string" />
</declare-styleable>
<!-- Attributes that are read when parsing a <fontfamily> tag. -->
@@ -8708,6 +8715,14 @@
<attr name="notificationHeaderStyle" format="reference" />
<attr name="notificationHeaderTextAppearance" format="reference" />
<attr name="notificationHeaderIconSize" format="dimension" />
+ <attr name="notificationHeaderAppNameVisibility" format="enum">
+ <!-- Visible on screen; the default value. -->
+ <enum name="visible" value="0" />
+ <!-- Not displayed, but taken into account during layout (space is left for it). -->
+ <enum name="invisible" value="1" />
+ <!-- Completely hidden, as if the view had not been added. -->
+ <enum name="gone" value="2" />
+ </attr>
</declare-styleable>
<attr name="lockPatternStyle" format="reference" />