From 6fb959d8cce1be2a0609a20fece9a6a4679afe03 Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Fri, 20 Mar 2020 13:21:01 -0700 Subject: [PATCH] Highlight personal tab on work profile reinstallation Bug: 145595763 Test: Manual Change-Id: I4da5e03c3aa66b324bc375d328e7b81278d58aca --- .../launcher3/allapps/AllAppsContainerView.java | 13 ++++++------- .../allapps/PersonalWorkSlidingTabStrip.java | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index 10a3060f5e..7fefcbb88b 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -405,6 +405,11 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo setupWorkToggle(); mAH[AdapterHolder.MAIN].setup(mViewPager.getChildAt(0), mPersonalMatcher); mAH[AdapterHolder.WORK].setup(mViewPager.getChildAt(1), mWorkMatcher); + mViewPager.getPageIndicator().setActiveMarker(AdapterHolder.MAIN); + findViewById(R.id.tab_personal) + .setOnClickListener((View view) -> mViewPager.snapToPage(AdapterHolder.MAIN)); + findViewById(R.id.tab_work) + .setOnClickListener((View view) -> mViewPager.snapToPage(AdapterHolder.WORK)); onTabChanged(mViewPager.getNextPage()); } else { mAH[AdapterHolder.MAIN].setup(findViewById(R.id.apps_list_view), null); @@ -455,16 +460,10 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo public void onTabChanged(int pos) { mHeader.setMainActive(pos == 0); - reset(true /* animate */); - mViewPager.getPageIndicator().updateTabTextColor(pos); if (mAH[pos].recyclerView != null) { mAH[pos].recyclerView.bindFastScrollbar(); - - findViewById(R.id.tab_personal) - .setOnClickListener((View view) -> mViewPager.snapToPage(AdapterHolder.MAIN)); - findViewById(R.id.tab_work) - .setOnClickListener((View view) -> mViewPager.snapToPage(AdapterHolder.WORK)); } + reset(true /* animate */); if (mWorkModeSwitch != null) { mWorkModeSwitch.setWorkTabVisible(pos == AdapterHolder.WORK); } diff --git a/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java b/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java index 3e40392438..2515c248c1 100644 --- a/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java +++ b/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java @@ -135,6 +135,7 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd @Override public void setActiveMarker(int activePage) { updateTabTextColor(activePage); + updateIndicatorPosition(activePage); if (mContainerView != null && mLastActivePage != activePage) { mContainerView.onTabChanged(activePage); }