summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2014-04-01 20:40:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-04-01 20:40:35 +0000
commit17bbd976c0971f25447b2ce66117f08029dc2fa9 (patch)
treec514f7f21d75e08219a29f69a9b77a8f165e722e /core
parentf425e5ea05bf445ab97176fe4a79e54f976d22b8 (diff)
parent5de886a158e449912b21fb27f02bdf67c0c95010 (diff)
downloadframeworks_base-17bbd976c0971f25447b2ce66117f08029dc2fa9.zip
frameworks_base-17bbd976c0971f25447b2ce66117f08029dc2fa9.tar.gz
frameworks_base-17bbd976c0971f25447b2ce66117f08029dc2fa9.tar.bz2
Merge "Add outset to decor view measuring" into klp-modular-dev
Diffstat (limited to 'core')
-rw-r--r--core/res/res/values/attrs.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 1dda8bf..91d502b 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -1639,6 +1639,7 @@
that is, when in portrait. Can be either an absolute dimension
or a fraction of the screen size in that dimension. -->
<attr name="windowFixedHeightMajor" format="dimension|fraction" />
+ <attr name="windowOutsetBottom" format="dimension" />
</declare-styleable>
<!-- The set of attributes that describe a AlertDialog's theme. -->