diff options
| author | 2018-03-01 16:56:31 +0000 | |
|---|---|---|
| committer | 2018-03-01 16:56:31 +0000 | |
| commit | c6245e58d51618f9b9b7d2b764e910a1d25b0025 (patch) | |
| tree | 48243484e4f628ef9ab87cd92215fdd0a4ef6756 | |
| parent | ec374b371aa362af686e54f304afd974a7b8144f (diff) | |
| parent | a6636e8d6ef990192a799cc44c0e846dfed0d341 (diff) | |
Merge "Only animate drag handle alpha, not translation."
| -rw-r--r-- | packages/SystemUI/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index ca4ea9e1578c..7b1a9e193b05 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -353,8 +353,6 @@ <dimen name="qs_footer_padding_start">16dp</dimen> <dimen name="qs_footer_padding_end">24dp</dimen> <dimen name="qs_footer_icon_size">16dp</dimen> - <!-- Difference between drag handle margin in QQS and expanded QS --> - <dimen name="qs_footer_drag_handle_offset">10dp</dimen> <dimen name="qs_notif_collapsed_space">64dp</dimen> diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java index 7b48e021b715..e9888df74f74 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java @@ -86,14 +86,9 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, private View mActionsContainer; private View mDragHandle; - private final int mDragHandleExpandOffset; public QSFooterImpl(Context context, AttributeSet attrs) { super(context, attrs); - - mDragHandleExpandOffset = getResources(). - getDimensionPixelSize(R.dimen.qs_footer_drag_handle_offset); - } @Override @@ -171,7 +166,6 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, .addFloat(mDivider, "alpha", 0, 1) .addFloat(mCarrierText, "alpha", 0, 0, 1) .addFloat(mActionsContainer, "alpha", 0, 1) - .addFloat(mDragHandle, "translationY", mDragHandleExpandOffset, 0) .addFloat(mDragHandle, "alpha", 1, 0, 0) .setStartDelay(0.15f) .build(); |