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

Commit 158b20c5 authored by Alina Zaidi's avatar Alina Zaidi Committed by Android (Google) Code Review
Browse files

Merge "[dev_option] Move DestopModeFlags out of android.windows.flags" into main

parents 202605ec c99c4ce2

core/java/android/view/InsetsState.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE; 
import static android.view.WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST;

import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ERROR;

import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER;

import static android.window.flags.DesktopModeFlags.ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION_ALWAYS;

import static android.window.DesktopModeFlags.ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION_ALWAYS;



import android.annotation.NonNull;

import android.annotation.Nullable;

core/java/android/view/ViewRootImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ import static android.view.flags.Flags.toolkitMetricsForFrameRateDecision; 
import static android.view.flags.Flags.toolkitSetFrameRateReadOnly;

import static android.view.inputmethod.InputMethodEditorTraceProto.InputMethodClientsTraceProto.ClientSideProto.IME_FOCUS_CONTROLLER;

import static android.view.inputmethod.InputMethodEditorTraceProto.InputMethodClientsTraceProto.ClientSideProto.INSETS_CONTROLLER;

import static android.window.flags.DesktopModeFlags.ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION;

import static android.window.DesktopModeFlags.ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION;















import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE;















import static com.android.text.flags.Flags.disableHandwritingInitiatorForIme;

































core/java/android/window/flags/DesktopModeFlags.java→core/java/android/window/DesktopModeFlags.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -14,7 +14,7 @@













 * limitations under the License.















 */





























package android.window.flags;













package android.window;































import android.annotation.Nullable;















import android.app.ActivityThread;

































core/java/com/android/internal/policy/DecorView.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -38,8 +38,8 @@ import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATIO













import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;















import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;















import static android.view.flags.Flags.customizableWindowHeaders;













import static android.window.flags.DesktopModeFlags.ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION;













import static android.window.flags.DesktopModeFlags.ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION_ALWAYS;













import static android.window.DesktopModeFlags.ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION;













import static android.window.DesktopModeFlags.ENABLE_CAPTION_COMPAT_INSET_FORCE_CONSUMPTION_ALWAYS;































import static com.android.internal.policy.PhoneWindow.FEATURE_OPTIONS_PANEL;

















































core/tests/coretests/src/android/window/flags/DesktopModeFlagsTest.java→core/tests/coretests/src/android/window/DesktopModeFlagsTest.java



+27
−20




























Original line number
Diff line number
Diff line








@@ -14,13 +14,14 @@













 * limitations under the License.















 */





























package android.window.flags;













package android.window;





























import static android.window.flags.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_MODE;













import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF;













import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_ON;













import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET;













import static android.window.flags.DesktopModeFlags.ToggleOverride.fromSetting;













import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_MODE;













import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF;













import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_ON;













import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET;













import static android.window.DesktopModeFlags.ToggleOverride.fromSetting;













import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS;































import static com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE;















import static com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_TRANSITIONS;









@@ -40,6 +41,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;













import androidx.test.filters.SmallTest;















import androidx.test.platform.app.InstrumentationRegistry;





























import org.junit.After;















import org.junit.Before;















import org.junit.Rule;















import org.junit.Test;









@@ -48,7 +50,7 @@ import org.junit.runner.RunWith;













import java.lang.reflect.Field;































/**













 * Test class for {@link DesktopModeFlags}













 * Test class for {@link android.window.DesktopModeFlags}















 *















 * Build/Install/Run:















 * atest FrameworksCoreTests:DesktopModeFlagsTest









@@ -68,8 +70,12 @@ public class DesktopModeFlagsTest {













    private static final int OVERRIDE_UNSET_SETTING = -1;































    @Before













    public void setUp() throws Exception {













    public void setUp() {















        mContext = InstrumentationRegistry.getInstrumentation().getTargetContext();













    }



























    @After













    public void tearDown() throws Exception {















        resetCache();















    }


























@@ -203,7 +209,7 @@ public class DesktopModeFlagsTest {













        setOverride(OVERRIDE_UNSET_SETTING);































        // For unset overrides, follow flag













        assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isTrue();













        assertThat(ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isTrue();















    }































    @Test









@@ -212,7 +218,7 @@ public class DesktopModeFlagsTest {













    public void isTrue_dwFlagOn_overrideUnset_featureFlagOff_returnsFalse() {















        setOverride(OVERRIDE_UNSET_SETTING);















        // For unset overrides, follow flag













        assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isFalse();













        assertThat(ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isFalse();















    }































    @Test









@@ -225,7 +231,7 @@ public class DesktopModeFlagsTest {













        setOverride(OVERRIDE_ON_SETTING);































        // When toggle override matches its default state (dw flag), don't override flags













        assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isTrue();













        assertThat(ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isTrue();















    }































    @Test









@@ -235,7 +241,7 @@ public class DesktopModeFlagsTest {













        setOverride(OVERRIDE_ON_SETTING);































        // When toggle override matches its default state (dw flag), don't override flags













        assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isFalse();













        assertThat(ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isFalse();















    }































    @Test









@@ -248,7 +254,7 @@ public class DesktopModeFlagsTest {













        setOverride(OVERRIDE_OFF_SETTING);































        // Follow override if they exist, and is not equal to default toggle state (dw flag)













        assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isTrue();













        assertThat(ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isTrue();















    }































    @Test









@@ -258,7 +264,7 @@ public class DesktopModeFlagsTest {













        setOverride(OVERRIDE_OFF_SETTING);































        // Follow override if they exist, and is not equal to default toggle state (dw flag)













        assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isFalse();













        assertThat(ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isFalse();















    }































    @Test









@@ -271,7 +277,7 @@ public class DesktopModeFlagsTest {













        setOverride(OVERRIDE_UNSET_SETTING);































        // For unset overrides, follow flag













        assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isTrue();













        assertThat(ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isTrue();















    }































    @Test









@@ -284,7 +290,7 @@ public class DesktopModeFlagsTest {













        setOverride(OVERRIDE_UNSET_SETTING);































        // For unset overrides, follow flag













        assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isFalse();













        assertThat(ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isFalse();















    }































    @Test









@@ -297,7 +303,7 @@ public class DesktopModeFlagsTest {













        setOverride(OVERRIDE_ON_SETTING);































        // Follow override if they exist, and is not equal to default toggle state (dw flag)













        assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isTrue();













        assertThat(ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isTrue();















    }































    @Test









@@ -310,7 +316,7 @@ public class DesktopModeFlagsTest {













        setOverride(OVERRIDE_ON_SETTING);































        // Follow override if they exist, and is not equal to default toggle state (dw flag)













        assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isFalse();













        assertThat(ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isFalse();















    }































    @Test









@@ -323,7 +329,7 @@ public class DesktopModeFlagsTest {













        setOverride(OVERRIDE_OFF_SETTING);































        // When toggle override matches its default state (dw flag), don't override flags













        assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isTrue();













        assertThat(ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isTrue();















    }































    @Test









@@ -336,7 +342,7 @@ public class DesktopModeFlagsTest {













        setOverride(OVERRIDE_OFF_SETTING);































        // When toggle override matches its default state (dw flag), don't override flags













        assertThat(DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isFalse();













        assertThat(ENABLE_DESKTOP_WINDOWING_TRANSITIONS.isTrue()).isFalse();















    }































    @Test










@@ -375,5 +381,6 @@ public class DesktopModeFlagsTest {













                "sCachedToggleOverride");















        cachedToggleOverride.setAccessible(true);















        cachedToggleOverride.set(null, null);













        setOverride(OVERRIDE_UNSET_SETTING);















    }















}