diff options
| author | 2015-12-07 22:37:02 +0000 | |
|---|---|---|
| committer | 2015-12-07 22:37:02 +0000 | |
| commit | 152ffc2c7533a1c05febf08447005e4def3dd20b (patch) | |
| tree | a7cc083d062c3bdadecbd17ab1d718e7a1ad0e24 | |
| parent | f4b4bf633d6a2a79c4804ac3395d5578d08e65f4 (diff) | |
| parent | 7b79b1e13def819704cfbcfc92c028c37ece5d4d (diff) | |
Merge "Fix round rect in divider handle"
4 files changed, 5 insertions, 3 deletions
diff --git a/packages/SystemUI/res/drawable/docked_divider_handle.xml b/packages/SystemUI/res/drawable/docked_divider_handle.xml index ea32548b78cc..84c0343185ac 100644 --- a/packages/SystemUI/res/drawable/docked_divider_handle.xml +++ b/packages/SystemUI/res/drawable/docked_divider_handle.xml @@ -17,6 +17,6 @@ Copyright (C) 2015 The Android Open Source Project 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 diff --git a/packages/SystemUI/res/layout/docked_stack_divider.xml b/packages/SystemUI/res/layout/docked_stack_divider.xml index 5f42856b5929..22ed216de570 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"/> diff --git a/packages/SystemUI/res/values-land/styles.xml b/packages/SystemUI/res/values-land/styles.xml index dd396d921638..96d8fb8a02dd 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> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 2fd0fe521df5..47ad6dc2a8ad 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> |