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

@@ -100,7 +100,7 @@ public class LauncherAllAppsContainerView extends ActivityAllAppsContainerView<L
// Special case to not expand the search bar when exiting All Apps on phones.
if (stateManager.getCurrentStableState() == LauncherState.ALL_APPS
&& mActivityContext.getDeviceProfile().isPhone) {
&& mActivityContext.getDeviceProfile().getDeviceProperties().isPhone()) {
return LauncherState.ALL_APPS.getFloatingSearchBarRestingMarginStart(mActivityContext);
}
@@ -122,7 +122,7 @@ public class LauncherAllAppsContainerView extends ActivityAllAppsContainerView<L
// Special case to not expand the search bar when exiting All Apps on phones.
if (stateManager.getCurrentStableState() == LauncherState.ALL_APPS
&& mActivityContext.getDeviceProfile().isPhone) {
&& mActivityContext.getDeviceProfile().getDeviceProperties().isPhone()) {
return LauncherState.ALL_APPS.getFloatingSearchBarRestingMarginEnd(mActivityContext);
}