Always use Transient Taskbar All apps icon for taskbar pinning

Test: Manual, Visual
Bug: 265436799
Flag: ENABLE_TASKBAR_PINNING
Change-Id: I253f3b7f6b0c1d198ba7c9849e99f6cf4b89a006
This commit is contained in:
Jagrut Desai
2023-10-13 11:21:32 -07:00
parent a96537fa65
commit 6965fdd12a

View File

@@ -19,6 +19,7 @@ import static android.content.pm.PackageManager.FEATURE_PC;
import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED;
import static com.android.launcher3.config.FeatureFlags.ENABLE_ALL_APPS_SEARCH_IN_TASKBAR;
import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_PINNING;
import static com.android.launcher3.config.FeatureFlags.enableCursorHoverStates;
import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;
@@ -172,12 +173,14 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
@DrawableRes
private int getAllAppsButton(boolean isTransientTaskbar) {
boolean shouldSelectTransientIcon = (isTransientTaskbar || ENABLE_TASKBAR_PINNING.get())
&& !mActivityContext.isThreeButtonNav();
if (ENABLE_ALL_APPS_SEARCH_IN_TASKBAR.get()) {
return isTransientTaskbar
return shouldSelectTransientIcon
? R.drawable.ic_transient_taskbar_all_apps_search_button
: R.drawable.ic_taskbar_all_apps_search_button;
} else {
return isTransientTaskbar
return shouldSelectTransientIcon
? R.drawable.ic_transient_taskbar_all_apps_button
: R.drawable.ic_taskbar_all_apps_button;
}