resolve merge conflicts of 9311387 to ub-launcher3-master

Change-Id: I449cd2c91c2906f04ebf844eab2d02befaeb2f4d

diff --cc res/values/dimens.xml
index 8f0f056,c112949..47edadd
--- 1/res/values/dimens.xml
--- 2/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@@ -182,6 -182,8 +182,11 @@@
           also happens to equal 19dp-->
      <dimen name="deep_shortcuts_arrow_horizontal_offset">19dp</dimen>
  
 +<!-- 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>

diff --cc src/com/android/launcher3/Launcher.java
Simple merge

diff --cc src/com/android/launcher3/allapps/AllAppsTransitionController.java
Simple merge