diff --git a/packages/SystemUI/res/anim/car_user_switcher_close_icon_animation.xml b/packages/SystemUI/res/anim/car_user_switcher_close_icon_animation.xml new file mode 100644 index 0000000000000..227c981cb72a6 --- /dev/null +++ b/packages/SystemUI/res/anim/car_user_switcher_close_icon_animation.xml @@ -0,0 +1,24 @@ + + + + + \ No newline at end of file diff --git a/packages/SystemUI/res/anim/car_user_switcher_open_icon_animation.xml b/packages/SystemUI/res/anim/car_user_switcher_open_icon_animation.xml new file mode 100644 index 0000000000000..06ac9e359b578 --- /dev/null +++ b/packages/SystemUI/res/anim/car_user_switcher_open_icon_animation.xml @@ -0,0 +1,24 @@ + + + + + \ No newline at end of file diff --git a/packages/SystemUI/res/drawable/car_ic_arrow.xml b/packages/SystemUI/res/drawable/car_ic_arrow.xml index 2c5ad27fe292a..d400ed8c7707e 100644 --- a/packages/SystemUI/res/drawable/car_ic_arrow.xml +++ b/packages/SystemUI/res/drawable/car_ic_arrow.xml @@ -1,5 +1,5 @@ + + + diff --git a/packages/SystemUI/res/layout/car_qs_footer.xml b/packages/SystemUI/res/layout/car_qs_footer.xml index 044090be9f5d2..3afd4ea33039b 100644 --- a/packages/SystemUI/res/layout/car_qs_footer.xml +++ b/packages/SystemUI/res/layout/car_qs_footer.xml @@ -35,7 +35,6 @@ android:layout_centerVertical="true" android:layout_width="@dimen/car_qs_footer_icon_width" android:layout_height="@dimen/car_qs_footer_icon_height" - android:layout_marginRight="@dimen/car_qs_footer_user_switch_margin_right" android:background="@drawable/ripple_drawable" android:focusable="true"> @@ -47,6 +46,18 @@ android:scaleType="fitCenter"/> + + + + android:layout_toEndOf="@id/user_switch_expand_icon" /> 46dp 56dp 56dp - 46dp + 5dp + 36dp @dimen/car_body2_size 420dp diff --git a/packages/SystemUI/src/com/android/systemui/qs/car/CarQSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/car/CarQSFragment.java index 9cb35d9af5ded..d1bd2f635ce8e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/car/CarQSFragment.java +++ b/packages/SystemUI/src/com/android/systemui/qs/car/CarQSFragment.java @@ -50,6 +50,7 @@ public class CarQSFragment extends Fragment implements QS { private View mUserSwitcherContainer; private CarQSFooter mFooter; private View mFooterUserName; + private View mFooterExpandIcon; private UserGridView mUserGridView; private PageIndicator mPageIndicator; private AnimatorSet mAnimatorSet; @@ -67,6 +68,7 @@ public class CarQSFragment extends Fragment implements QS { mHeader = view.findViewById(R.id.header); mFooter = view.findViewById(R.id.qs_footer); mFooterUserName = mFooter.findViewById(R.id.user_name); + mFooterExpandIcon = mFooter.findViewById(R.id.user_switch_expand_icon); mUserSwitcherContainer = view.findViewById(R.id.user_switcher_container); @@ -261,6 +263,12 @@ public class CarQSFragment extends Fragment implements QS { nameAnimator.setTarget(mFooterUserName); allAnimators.add(nameAnimator); + Animator iconAnimator = AnimatorInflater.loadAnimator(getContext(), + opening ? R.anim.car_user_switcher_open_icon_animation + : R.anim.car_user_switcher_close_icon_animation); + iconAnimator.setTarget(mFooterExpandIcon); + allAnimators.add(iconAnimator); + Animator pageAnimator = AnimatorInflater.loadAnimator(getContext(), opening ? R.anim.car_user_switcher_open_pages_animation : R.anim.car_user_switcher_close_pages_animation);