Revert "Revert "Moving DeviceProfile properties into DevicePrope..."
Revert submission 33716851-revert-33672643-DataDeviceProfile1-XHYRAPLEBK Reason for revert: Error is fixed Reverted changes: /q/submissionid:33716851-revert-33672643-DataDeviceProfile1-XHYRAPLEBK Change-Id: Ib86824134955903c11e51e52dbfd6368aba1cd50
This commit is contained in:
1 parent
1bec329180
commit
e1d31e5406
128 files changed
+727
-597
No files matched your search
@@ -99,7 +99,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);
|
||||
}
|
||||
|
||||
@@ -121,7 +121,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);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user