From 2292031e3df58ec14221bf601434acace62cc15c Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Fri, 23 Feb 2018 14:33:42 +0100 Subject: [PATCH] DisplayCutout: Add xml wrapper for layoutInDisplayCutoutMode Allows native apps to request a layoutInDisplayCutoutMode without having to implement a custom NativeActivity subclass. Change-Id: I0b7fd4624e89fabe177462d615360442f72a1e11 Fixes: 73807928 Test: atest PhoneWindowTest --- api/current.txt | 1 + core/java/android/view/WindowManager.java | 1 + .../android/internal/policy/PhoneWindow.java | 9 ++ core/res/res/values/attrs.xml | 39 +++++++ core/res/res/values/public.xml | 1 + core/tests/coretests/res/values/styles.xml | 12 +++ .../internal/policy/PhoneWindowTest.java | 101 ++++++++++++++++++ 7 files changed, 164 insertions(+) create mode 100644 core/tests/coretests/src/com/android/internal/policy/PhoneWindowTest.java diff --git a/api/current.txt b/api/current.txt index d56d1e2090965..c3d9c5d3255f8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -1549,6 +1549,7 @@ package android { field public static final int windowHideAnimation = 16842935; // 0x10100b7 field public static final int windowIsFloating = 16842839; // 0x1010057 field public static final int windowIsTranslucent = 16842840; // 0x1010058 + field public static final int windowLayoutInDisplayCutoutMode = 16844167; // 0x1010587 field public static final int windowLightNavigationBar = 16844140; // 0x101056c field public static final int windowLightStatusBar = 16844000; // 0x10104e0 field public static final int windowMinWidthMajor = 16843606; // 0x1010356 diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index c0a966602b0ab..e18f37ee52312 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -2234,6 +2234,7 @@ public interface WindowManager extends ViewManager { * @see #LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS * @see #LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER * @see DisplayCutout + * @see android.R.attr#layoutInDisplayCutoutMode */ @LayoutInDisplayCutoutMode public int layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT; diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java index 50c9d6c69ac96..528888fbaab6a 100644 --- a/core/java/com/android/internal/policy/PhoneWindow.java +++ b/core/java/com/android/internal/policy/PhoneWindow.java @@ -2464,6 +2464,15 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { decor.setSystemUiVisibility( decor.getSystemUiVisibility() | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR); } + if (a.hasValue(R.styleable.Window_windowLayoutInDisplayCutoutMode)) { + int mode = a.getInt(R.styleable.Window_windowLayoutInDisplayCutoutMode, -1); + if (mode < LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT + || mode > LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER) { + throw new UnsupportedOperationException("Unknown windowLayoutInDisplayCutoutMode: " + + a.getString(R.styleable.Window_windowLayoutInDisplayCutoutMode)); + } + params.layoutInDisplayCutoutMode = mode; + } if (mAlwaysReadCloseOnTouchAttr || getContext().getApplicationInfo().targetSdkVersion >= android.os.Build.VERSION_CODES.HONEYCOMB) { diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 22ab9c913540c..e977842133f40 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -2113,6 +2113,45 @@ Corresponds to setting {@link android.view.View#SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR} on the decor view. --> + + + + + + + + + + diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index c4006b324569e..7d5d1ba1366b0 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2873,6 +2873,7 @@ + diff --git a/core/tests/coretests/res/values/styles.xml b/core/tests/coretests/res/values/styles.xml index 7a90197c5b663..ef3a481ae26cd 100644 --- a/core/tests/coretests/res/values/styles.xml +++ b/core/tests/coretests/res/values/styles.xml @@ -19,4 +19,16 @@ @null @null + + + + + diff --git a/core/tests/coretests/src/com/android/internal/policy/PhoneWindowTest.java b/core/tests/coretests/src/com/android/internal/policy/PhoneWindowTest.java new file mode 100644 index 0000000000000..c8994ddc457f6 --- /dev/null +++ b/core/tests/coretests/src/com/android/internal/policy/PhoneWindowTest.java @@ -0,0 +1,101 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.internal.policy; + +import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; +import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT; +import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER; + +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; + +import android.content.Context; +import android.platform.test.annotations.Presubmit; +import android.support.test.InstrumentationRegistry; +import android.support.test.filters.FlakyTest; +import android.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; +import android.view.ActionMode; +import android.view.ContextThemeWrapper; + +import com.android.frameworks.coretests.R; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * Tests {@link PhoneWindow}'s {@link ActionMode} related methods. + */ +@SmallTest +@Presubmit +@FlakyTest(detail = "Promote to presubmit once monitored to be stable.") +@RunWith(AndroidJUnit4.class) +public final class PhoneWindowTest { + + private PhoneWindow mPhoneWindow; + private Context mContext; + + @Before + public void setUp() throws Exception { + mContext = InstrumentationRegistry.getContext(); + } + + @Test + public void layoutInDisplayCutoutMode_unset() throws Exception { + createPhoneWindowWithTheme(R.style.LayoutInDisplayCutoutModeUnset); + installDecor(); + + assertThat(mPhoneWindow.getAttributes().layoutInDisplayCutoutMode, + is(LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT)); + } + + @Test + public void layoutInDisplayCutoutMode_default() throws Exception { + createPhoneWindowWithTheme(R.style.LayoutInDisplayCutoutModeDefault); + installDecor(); + + assertThat(mPhoneWindow.getAttributes().layoutInDisplayCutoutMode, + is(LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT)); + } + + @Test + public void layoutInDisplayCutoutMode_always() throws Exception { + createPhoneWindowWithTheme(R.style.LayoutInDisplayCutoutModeAlways); + installDecor(); + + assertThat(mPhoneWindow.getAttributes().layoutInDisplayCutoutMode, + is(LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS)); + } + + @Test + public void layoutInDisplayCutoutMode_never() throws Exception { + createPhoneWindowWithTheme(R.style.LayoutInDisplayCutoutModeNever); + installDecor(); + + assertThat(mPhoneWindow.getAttributes().layoutInDisplayCutoutMode, + is(LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER)); + } + + private void createPhoneWindowWithTheme(int theme) { + mPhoneWindow = new PhoneWindow(new ContextThemeWrapper(mContext, theme)); + } + + private void installDecor() { + mPhoneWindow.getDecorView(); + } +} \ No newline at end of file