fix: Conflict incoming changes from 15-dev

This commit is contained in:
Pun Butrach committed 2026-01-10 20:49:12 +07:00
1 parent 14e352c827
commit 2e76c99dad
1726 files changed
+146970 -95027

No files matched your search

@@ -167,11 +167,11 @@ public class WorkUtilityView extends LinearLayout implements Insettable,
int bottomMargin = getResources().getDimensionPixelSize(R.dimen.work_fab_margin_bottom);
DeviceProfile dp = ActivityContext.lookupContext(getContext()).getDeviceProfile();
if (mActivityContext.getAppsView().isSearchBarFloating()) {
bottomMargin += dp.hotseatQsbHeight;
bottomMargin += dp.getHotseatProfile().getQsbHeight();
}
if (!dp.isGestureMode && dp.isTaskbarPresent) {
bottomMargin += dp.taskbarHeight;
if (!dp.getDeviceProperties().isGestureMode() && dp.isTaskbarPresent) {
bottomMargin += dp.getTaskbarProfile().getHeight();
}
lp.bottomMargin = bottomMargin;