commit 4835519ccb3037e9566059057f00a2271c6a4a18
author Ikram Gabiyev <gabiyev@google.com> Wed Jan 04 19:41:22 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 04 19:41:22 2023 +0000
tree 0ab964876b37069e49ab2a4ef30ea2ac5ca1783f
parent 50b82f887cc140c2bbdbc621ec9d4b30a6153e73
parent 6d3ad6820d577e1b13aa69e3b59dcca6c61f6556

Merge "Turn off filter ui if flag is off" into tm-qpr-dev

src/com/android/launcher3/settings/SettingsActivity.java

diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index 3e2d051..7ab3013 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -268,8 +268,8 @@
                     return !WidgetsModel.GO_DISABLE_NOTIFICATION_DOTS;
 
                 case ALLOW_ROTATION_PREFERENCE_KEY:
-                    DisplayController.Info info = InvariantDeviceProfile.INSTANCE.get(
-                            getContext()).getDeviceProfile(getContext()).getDisplayInfo();
+                    DisplayController.Info info =
+                            DisplayController.INSTANCE.get(getContext()).getInfo();
                     if (info.isTablet(info.realBounds)) {
                         // Launcher supports rotation by default. No need to show this setting.
                         return false;

tests/src/com/android/launcher3/ui/WorkProfileTest.java

diff --git a/tests/src/com/android/launcher3/ui/WorkProfileTest.java b/tests/src/com/android/launcher3/ui/WorkProfileTest.java
index 302bd2f..c7628cc 100644
--- a/tests/src/com/android/launcher3/ui/WorkProfileTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkProfileTest.java
@@ -38,6 +38,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.Objects;
@@ -118,6 +119,7 @@
     }
 
     @Test
+    @Ignore("b/243855320")
     public void toggleWorks() {
         assumeTrue(mWorkProfileSetupSuccessful);
         waitForWorkTabSetup();