Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc325785 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9454839 from 50b82f88 to tm-qpr2-release

Change-Id: I6b63ae42a804348f360a97cbd9ba05bdd96e45c4
parents 5ec34339 50b82f88
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -268,8 +268,8 @@ public class SettingsActivity extends FragmentActivity
                    return !WidgetsModel.GO_DISABLE_NOTIFICATION_DOTS;
                    return !WidgetsModel.GO_DISABLE_NOTIFICATION_DOTS;


                case ALLOW_ROTATION_PREFERENCE_KEY:
                case ALLOW_ROTATION_PREFERENCE_KEY:
                    DisplayController.Info info = InvariantDeviceProfile.INSTANCE.get(
                    DisplayController.Info info =
                            getContext()).getDeviceProfile(getContext()).getDisplayInfo();
                            DisplayController.INSTANCE.get(getContext()).getInfo();
                    if (info.isTablet(info.realBounds)) {
                    if (info.isTablet(info.realBounds)) {
                        // Launcher supports rotation by default. No need to show this setting.
                        // Launcher supports rotation by default. No need to show this setting.
                        return false;
                        return false;
+2 −0
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ import com.android.launcher3.tapl.LauncherInstrumentation;


import org.junit.After;
import org.junit.After;
import org.junit.Before;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.Test;


import java.util.Objects;
import java.util.Objects;
@@ -118,6 +119,7 @@ public class WorkProfileTest extends AbstractLauncherUiTest {
    }
    }


    @Test
    @Test
    @Ignore("b/243855320")
    public void toggleWorks() {
    public void toggleWorks() {
        assumeTrue(mWorkProfileSetupSuccessful);
        assumeTrue(mWorkProfileSetupSuccessful);
        waitForWorkTabSetup();
        waitForWorkTabSetup();