diff options
author | Chris Craik <ccraik@google.com> | 2014-02-19 18:11:46 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-19 18:11:46 +0000 |
commit | 66d792b6631a8dfd0dd0b7abc75077760fa083cc (patch) | |
tree | 3d444a47d61f51b180a4261270ba8205b7fd0c3e /core/res | |
parent | a269eca8463ffc495b6b3cddf5d61833467dc49b (diff) | |
parent | e9b8817bd720cd2a294126074eb533f943a9348f (diff) | |
download | frameworks_base-66d792b6631a8dfd0dd0b7abc75077760fa083cc.zip frameworks_base-66d792b6631a8dfd0dd0b7abc75077760fa083cc.tar.gz frameworks_base-66d792b6631a8dfd0dd0b7abc75077760fa083cc.tar.bz2 |
Merge "Make outline and shadow APIs public"
Diffstat (limited to 'core/res')
-rw-r--r-- | core/res/res/values/attrs.xml | 4 | ||||
-rw-r--r-- | core/res/res/values/public.xml | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 2d9c959..c5524d7 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -2123,6 +2123,10 @@ <!-- scale of the view in the y direction. --> <attr name="scaleY" format="float" /> + <!-- Defines whether the View casts a shadow when it has a 3D rotation or Z + translation.--> + <attr name="castsShadow" format="boolean" /> + <!-- Determines which side the vertical scroll bar should be placed on. --> <attr name="verticalScrollbarPosition"> <!-- Place the scroll bar wherever the system default determines. --> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 722f965..794d6a5 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2108,6 +2108,7 @@ <public type="attr" name="toSceneName" /> <public type="attr" name="sharedElementName" /> <public type="attr" name="transitionGroup" /> + <public type="attr" name="castsShadow" /> <public type="id" name="shared_element_name" /> |