commit 0bc9e98d78f4a2e4643dd3be4ee0bea806a0ba2d
author Tony Wickham <twickham@google.com> Wed Sep 28 14:40:28 2016 -0700
committer Tony Wickham <twickham@google.com> Wed Sep 28 14:40:28 2016 -0700
tree a0eb1ad9079127a317558716e16c7fdbdfad7cbc
parent 02aa0e4792080bf1b7d88bff4f6e83b569e69a30
parent 9311387a227d7bd894d880b897fb80ca34b39405

resolve merge conflicts of 9311387 to ub-launcher3-master

Change-Id: I449cd2c91c2906f04ebf844eab2d02befaeb2f4d

res/values/dimens.xml

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 8f0f056..47edadd 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -184,4 +184,9 @@
 
 <!-- Touch handling -->
     <dimen name="edge_of_screen_threshold">8dp</dimen>
+
+<!-- Other -->
+    <!-- Approximates the system status bar height. Not guaranteed to be always be correct. -->
+    <dimen name="status_bar_height">24dp</dimen>
+
 </resources>