fix: Conflict incoming changes from 15-dev
This commit is contained in:
1 parent
14e352c827
commit
2e76c99dad
1726 files changed
+146970
-95027
No files matched your search
@@ -16,7 +16,7 @@
|
||||
package com.android.launcher3.testing;
|
||||
|
||||
import static com.android.launcher3.Flags.enableFallbackOverviewInWindow;
|
||||
import static com.android.launcher3.Flags.enableGridOnlyOverview;
|
||||
import static com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview;
|
||||
import static com.android.launcher3.Flags.enableLauncherOverviewInWindow;
|
||||
import static com.android.launcher3.allapps.AllAppsStore.DEFER_UPDATES_TEST;
|
||||
import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_NAVBAR_UNIFICATION;
|
||||
@@ -194,7 +194,7 @@ public class TestInformationHandler implements ResourceBasedOverride {
|
||||
|
||||
case TestProtocol.REQUEST_ICON_HEIGHT: {
|
||||
response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD,
|
||||
mDeviceProfile.allAppsCellHeightPx);
|
||||
mDeviceProfile.getAllAppsProfile().getCellHeightPx());
|
||||
return response;
|
||||
}
|
||||
|
||||
@@ -203,7 +203,7 @@ public class TestInformationHandler implements ResourceBasedOverride {
|
||||
return response;
|
||||
|
||||
case TestProtocol.REQUEST_IS_TABLET:
|
||||
response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD, mDeviceProfile.isTablet);
|
||||
response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD, mDeviceProfile.getDeviceProperties().isTablet());
|
||||
return response;
|
||||
case TestProtocol.REQUEST_IS_PREDICTIVE_BACK_SWIPE_ENABLED:
|
||||
response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD,
|
||||
@@ -230,7 +230,7 @@ public class TestInformationHandler implements ResourceBasedOverride {
|
||||
|
||||
case TestProtocol.REQUEST_IS_TWO_PANELS:
|
||||
response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD,
|
||||
FOLDABLE_SINGLE_PAGE.get() ? false : mDeviceProfile.isTwoPanels);
|
||||
FOLDABLE_SINGLE_PAGE.get() ? false : mDeviceProfile.getDeviceProperties().isTwoPanels());
|
||||
return response;
|
||||
|
||||
case TestProtocol.REQUEST_GET_HAD_NONTEST_EVENTS:
|
||||
|
||||
Reference in new issue
Block a user