summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/allapps
diff options
context:
space:
mode:
authorarangelov <arangelov@google.com>2018-08-17 14:46:45 +0100
committerarangelov <arangelov@google.com>2018-08-17 20:28:52 +0100
commitad7830586299906bd0b1f653e0a8ea1128c16a8c (patch)
tree1a56dc36d414b59fdaca0432fb882fed9c74556b /src/com/android/launcher3/allapps
parent58ad76fd62daef166346b49847ce23690252a04a (diff)
downloadandroid_packages_apps_Trebuchet-ad7830586299906bd0b1f653e0a8ea1128c16a8c.tar.gz
android_packages_apps_Trebuchet-ad7830586299906bd0b1f653e0a8ea1128c16a8c.tar.bz2
android_packages_apps_Trebuchet-ad7830586299906bd0b1f653e0a8ea1128c16a8c.zip
Highlight work tab when user already in All Apps after creating WP.
When a user created a work profile and was already in the All Apps view, the work tab was not highlighted, because the logic for that was only in AllAppsContainerView#onScrollUpEnd(). This CL highlights the tab when the user has resumed and the All Apps view is expanded. Bug: 79242814 Test: Manual Change-Id: I40af0d513c95f8084e21f4e276e9f56bcb06555e
Diffstat (limited to 'src/com/android/launcher3/allapps')
-rw-r--r--src/com/android/launcher3/allapps/AllAppsContainerView.java7
-rw-r--r--src/com/android/launcher3/allapps/AllAppsTransitionController.java12
2 files changed, 17 insertions, 2 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 6908ab48a..3d15c757d 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -486,8 +486,13 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
}
public void onScrollUpEnd() {
+ highlightWorkTabIfNecessary();
+ }
+
+ void highlightWorkTabIfNecessary() {
if (mUsingTabs) {
- ((PersonalWorkSlidingTabStrip) findViewById(R.id.tabs)).highlightWorkTabIfNecessary();
+ ((PersonalWorkSlidingTabStrip) findViewById(R.id.tabs))
+ .highlightWorkTabIfNecessary();
}
}
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 24a8d5145..e7313e841 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -249,11 +249,21 @@ public class AllAppsTransitionController implements StateHandler, OnDeviceProfil
if (Float.compare(mProgress, 1f) == 0) {
mAppsView.setVisibility(View.INVISIBLE);
mAppsView.reset(false /* animate */);
- } else if (Float.compare(mProgress, 0f) == 0) {
+ } else if (isAllAppsExpanded()) {
mAppsView.setVisibility(View.VISIBLE);
mAppsView.onScrollUpEnd();
} else {
mAppsView.setVisibility(View.VISIBLE);
}
}
+
+ private boolean isAllAppsExpanded() {
+ return Float.compare(mProgress, 0f) == 0;
+ }
+
+ public void highlightWorkTabIfNecessary() {
+ if (isAllAppsExpanded()) {
+ mAppsView.highlightWorkTabIfNecessary();
+ }
+ }
}