PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge "Use TaskbarAllAppsButtonContainer and TaskbarDividerContainer in TaskbarView" into main

Browse Source
This commit is contained in:
Jagrut Desai
2024-08-29 21:44:04 +00:00
committed by Android (Google) Code Review
parent 9025fe918b 6060db4970
commit bc98db6820
7 changed files with 148 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
+6 -12
View File
@@ -29,7 +29,6 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_ON_BOARD_POPUP;
import static com.android.launcher3.AbstractFloatingView.TYPE_REBIND_SAFE;
import static com.android.launcher3.AbstractFloatingView.TYPE_TASKBAR_OVERLAY_PROXY;
import static com.android.launcher3.Flags.enableCursorHoverStates;
import static com.android.launcher3.Flags.enableTaskbarCustomization;
import static com.android.launcher3.Utilities.calculateTextHeight;
import static com.android.launcher3.Utilities.isRunningInTestHarness;
import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_NAVBAR_UNIFICATION;
@@ -230,15 +229,12 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
mNavigationBarPanelContext = navigationBarPanelContext;
applyDeviceProfile(launcherDp);
final Resources resources = getResources();
if (enableTaskbarCustomization()) {
mTaskbarFeatureEvaluator = TaskbarFeatureEvaluator.getInstance(this);
mTaskbarSpecsEvaluator = new TaskbarSpecsEvaluator(
this,
mTaskbarFeatureEvaluator,
mDeviceProfile.inv.numRows,
mDeviceProfile.inv.numColumns);
}
mTaskbarFeatureEvaluator = TaskbarFeatureEvaluator.getInstance(this);
mTaskbarSpecsEvaluator = new TaskbarSpecsEvaluator(
this,
mTaskbarFeatureEvaluator,
mDeviceProfile.inv.numRows,
mDeviceProfile.inv.numColumns);
mImeDrawsImeNavBar = getBoolByName(IME_DRAWS_IME_NAV_BAR_RES_NAME, resources, false);
mIsSafeModeEnabled = TraceHelper.allowIpcs("isSafeMode",
@@ -1761,12 +1757,10 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
return mControllers.taskbarStashController.isInStashedLauncherState();
}
@Nullable
public TaskbarFeatureEvaluator getTaskbarFeatureEvaluator() {
return mTaskbarFeatureEvaluator;
}
@Nullable
public TaskbarSpecsEvaluator getTaskbarSpecsEvaluator() {
return mTaskbarSpecsEvaluator;
}