Merge "Shift transient taskbar to ensure 12dp distance with the bubble bar." into main

This commit is contained in:
Mykola Podolian authored and Android (Google) Code Review committed 2025-01-13 12:52:21 -08:00
commit fc8db9afc3
9 files changed
+193 -47

No files matched your search

@@ -271,8 +271,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
mWindowManager = c.getSystemService(WindowManager.class);
// Inflate views.
final boolean isTransientTaskbar = DisplayController.isTransientTaskbar(this)
&& !isPhoneMode();
boolean isTransientTaskbar = isTransientTaskbar();
int taskbarLayout = isTransientTaskbar ? R.layout.transient_taskbar : R.layout.taskbar;
mDragLayer = (TaskbarDragLayer) mLayoutInflater.inflate(taskbarLayout, null, false);
TaskbarView taskbarView = mDragLayer.findViewById(R.id.taskbar_view);
@@ -385,6 +384,11 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
dispatchDeviceProfileChanged();
}
/** Returns whether current taskbar is transient. */
public boolean isTransientTaskbar() {
return DisplayController.isTransientTaskbar(this) && !isPhoneMode();
}
/**
* Copy the original DeviceProfile, match the number of hotseat icons and qsb width and update
* the icon size