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

Commit 21e41eee authored by Justin Weir's avatar Justin Weir Committed by Android (Google) Code Review
Browse files

Merge changes I09362df8,I25d1dfc9 into udc-qpr-dev 

* changes:
  Wrap NotificationShadeWindowView in a new window root view
  Add flag for Flexiglass
parents 7c1e1a89 feda4df6

packages/SystemUI/res/layout/scene_window_root.xml

0 → 100644
+32 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

**

** Copyright 2023, 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.

*/

-->



<!-- The root view of the scene window. -->

<com.android.systemui.scene.ui.view.SceneWindowRootView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:sysui="http://schemas.android.com/apk/res-auto"

    android:id="@+id/scene_window_root"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true">



    <include layout="@layout/super_notification_shade"

        android:layout_width="match_parent"

        android:layout_height="match_parent"/>

</com.android.systemui.scene.ui.view.SceneWindowRootView>

packages/SystemUI/res/layout/super_notification_shade.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ 
<com.android.systemui.shade.NotificationShadeWindowView

<com.android.systemui.shade.NotificationShadeWindowView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:sysui="http://schemas.android.com/apk/res-auto"

    xmlns:sysui="http://schemas.android.com/apk/res-auto"

    android:id="@+id/legacy_window_root"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true">

    android:fitsSystemWindows="true">

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+3 −0
Original line number Original line Diff line number Diff line
@@ -628,6 +628,9 @@ object Flags { 
    // TODO(b/265944639): Tracking Bug

    // TODO(b/265944639): Tracking Bug

    @JvmField val DUAL_SHADE = unreleasedFlag(1801, "dual_shade")

    @JvmField val DUAL_SHADE = unreleasedFlag(1801, "dual_shade")





    // TODO(b/283300105): Tracking Bug

    @JvmField val SCENE_CONTAINER = unreleasedFlag(1802, "scene_container")



    // 1900

    // 1900

    @JvmField val NOTE_TASKS = releasedFlag(1900, "keycode_flag")

    @JvmField val NOTE_TASKS = releasedFlag(1900, "keycode_flag")

packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootView.kt

0 → 100644
+7 −0
Original line number Original line Diff line number Diff line 
package com.android.systemui.scene.ui.view



import android.content.Context

import android.util.AttributeSet



/** A root view of the main SysUI window that supports scenes. */

class SceneWindowRootView(context: Context?, attrs: AttributeSet?) : WindowRootView(context, attrs)
 
 No newline at end of file

packages/SystemUI/src/com/android/systemui/scene/ui/view/WindowRootView.kt

0 → 100644
+8 −0
Original line number Original line Diff line number Diff line 
package com.android.systemui.scene.ui.view



import android.content.Context

import android.util.AttributeSet

import android.widget.FrameLayout



/** A view that can serve as the root of the main SysUI window.  */

open class WindowRootView(context: Context?, attrs: AttributeSet?) : FrameLayout(context, attrs)
 
 No newline at end of file