diff options
7 files changed, 12 insertions, 12 deletions
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index ec24af51ac05..ef6b467ed103 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -47,7 +47,7 @@ <!-- How much the content in the divider is inset from the window bounds when resting. Used to calculate the bounds of the stacks--> - <dimen name="docked_stack_divider_insets">18dp</dimen> + <dimen name="docked_stack_divider_insets">19dp</dimen> <!-- Min width for a tablet device --> <dimen name="min_xlarge_screen_width">800dp</dimen> diff --git a/packages/SystemUI/res/values-land/dimens.xml b/packages/SystemUI/res/values-land/dimens.xml index 456391d61216..c75a89fa4b31 100644 --- a/packages/SystemUI/res/values-land/dimens.xml +++ b/packages/SystemUI/res/values-land/dimens.xml @@ -24,5 +24,5 @@ <integer name="notification_panel_layout_gravity">@integer/standard_notification_panel_layout_gravity</integer> <dimen name="docked_divider_handle_width">2dp</dimen> - <dimen name="docked_divider_handle_height">24dp</dimen> + <dimen name="docked_divider_handle_height">16dp</dimen> </resources> diff --git a/packages/SystemUI/res/values-land/styles.xml b/packages/SystemUI/res/values-land/styles.xml index 96d8fb8a02dd..b711faa30280 100644 --- a/packages/SystemUI/res/values-land/styles.xml +++ b/packages/SystemUI/res/values-land/styles.xml @@ -20,7 +20,7 @@ </style> <style name="DockedDividerBackground"> - <item name="android:layout_width">12dp</item> + <item name="android:layout_width">10dp</item> <item name="android:layout_height">match_parent</item> <item name="android:layout_gravity">center_horizontal</item> </style> @@ -28,7 +28,7 @@ <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> + <item name="android:layout_height">96dp</item> </style> </resources> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 24cc6bf1589a..035f56485287 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -583,9 +583,9 @@ <dimen name="qs_header_neg_padding">-8dp</dimen> <!-- How high we lift the divider when touching --> - <dimen name="docked_stack_divider_lift_elevation">6dp</dimen> + <dimen name="docked_stack_divider_lift_elevation">4dp</dimen> - <dimen name="docked_divider_handle_width">24dp</dimen> + <dimen name="docked_divider_handle_width">16dp</dimen> <dimen name="docked_divider_handle_height">2dp</dimen> </resources> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index a9176e0c393c..3b0ab791f03c 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -299,13 +299,13 @@ <style name="DockedDividerBackground"> <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">12dp</item> + <item name="android:layout_height">10dp</item> <item name="android:layout_gravity">center_vertical</item> </style> <style name="DockedDividerHandle"> <item name="android:layout_gravity">center_horizontal</item> - <item name="android:layout_width">64dp</item> + <item name="android:layout_width">96dp</item> <item name="android:layout_height">48dp</item> </style> diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerSnapAlgorithm.java b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerSnapAlgorithm.java index 69e90cc724f3..5af172c7e59a 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerSnapAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerSnapAlgorithm.java @@ -98,10 +98,10 @@ public class DividerSnapAlgorithm { // TODO: Better calculation targets.add(new SnapTarget(-mDividerSize, SnapTarget.FLAG_DISMISS_START)); - targets.add(new SnapTarget((int) (0.38f * dividerMax) - mDividerSize / 2, + targets.add(new SnapTarget((int) (0.3415f * dividerMax) - mDividerSize / 2, SnapTarget.FLAG_NONE)); targets.add(new SnapTarget(dividerMax / 2 - mDividerSize / 2, SnapTarget.FLAG_NONE)); - targets.add(new SnapTarget((int) (0.62f * dividerMax) - mDividerSize / 2, + targets.add(new SnapTarget((int) (0.6585f * dividerMax) - mDividerSize / 2, SnapTarget.FLAG_NONE)); targets.add(new SnapTarget(dividerMax, SnapTarget.FLAG_DISMISS_END)); return targets; diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java index c01f1703dab6..13642ebddb17 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java @@ -240,9 +240,9 @@ public class DividerView extends FrameLayout implements OnTouchListener, private void liftBackground() { if (isHorizontalDivision()) { - mBackground.animate().scaleY(1.5f); + mBackground.animate().scaleY(1.4f); } else { - mBackground.animate().scaleX(1.5f); + mBackground.animate().scaleX(1.4f); } mBackground.animate() .setInterpolator(mTouchResponseInterpolator) |