commit 152ffc2c7533a1c05febf08447005e4def3dd20b
author Jorim Jaggi <jjaggi@google.com> Mon Dec 07 22:37:02 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 07 22:37:02 2015 +0000
tree a7cc083d062c3bdadecbd17ab1d718e7a1ad0e24
parent f4b4bf633d6a2a79c4804ac3395d5578d08e65f4
parent 7b79b1e13def819704cfbcfc92c028c37ece5d4d

Merge "Fix round rect in divider handle"

packages/SystemUI/res/drawable/docked_divider_handle.xml

diff --git a/packages/SystemUI/res/drawable/docked_divider_handle.xml b/packages/SystemUI/res/drawable/docked_divider_handle.xml
index ea32548..84c0343 100644
--- a/packages/SystemUI/res/drawable/docked_divider_handle.xml
+++ b/packages/SystemUI/res/drawable/docked_divider_handle.xml
@@ -17,6 +17,6 @@
         android:shape="rectangle">
     <size android:height="@dimen/docked_divider_handle_height"
         android:width="@dimen/docked_divider_handle_width" />
-    <corners radius="1dp" />
+    <corners android:radius="1dp" />
     <solid android:color="@color/docked_divider_handle" />
 </shape>
\ No newline at end of file

packages/SystemUI/res/layout/docked_stack_divider.xml

diff --git a/packages/SystemUI/res/layout/docked_stack_divider.xml b/packages/SystemUI/res/layout/docked_stack_divider.xml
index 5f42856..22ed216 100644
--- a/packages/SystemUI/res/layout/docked_stack_divider.xml
+++ b/packages/SystemUI/res/layout/docked_stack_divider.xml
@@ -27,8 +27,6 @@
     <ImageButton
         style="@style/DockedDividerHandle"
         android:id="@+id/docked_divider_handle"
-        android:layout_height="48dp"
-        android:layout_width="48dp"
         android:background="@null"
         android:src="@drawable/docked_divider_handle"/>
 

packages/SystemUI/res/values-land/styles.xml

diff --git a/packages/SystemUI/res/values-land/styles.xml b/packages/SystemUI/res/values-land/styles.xml
index dd396d9..96d8fb8 100644
--- a/packages/SystemUI/res/values-land/styles.xml
+++ b/packages/SystemUI/res/values-land/styles.xml
@@ -27,6 +27,8 @@
 
     <style name="DockedDividerHandle">
         <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:layout_width">48dp</item>
+        <item name="android:layout_height">64dp</item>
     </style>
 
 </resources>

packages/SystemUI/res/values/styles.xml

diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 2fd0fe5..47ad6dc 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -311,6 +311,8 @@
 
     <style name="DockedDividerHandle">
         <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:layout_width">64dp</item>
+        <item name="android:layout_height">48dp</item>
     </style>
 
 </resources>