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

Commit 32e34b84 authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "Allow LauncherOverlay to access and manage insets" into ub-now-queens

parents d8cec094 a6d0492e

res/layout-land/launcher.xml

+5 −5
Original line number Diff line number Diff line
@@ -15,20 +15,20 @@ 
-->



<!-- Full screen view projects under the status bar and contains the background -->

<FrameLayout

<com.android.launcher3.LauncherRootView

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

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



    android:id="@+id/launcher"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@drawable/workspace_bg">

    android:background="@drawable/workspace_bg"

    android:fitsSystemWindows="true">



    <com.android.launcher3.DragLayer

        android:id="@+id/drag_layer"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:fitsSystemWindows="true">

        android:layout_height="match_parent">



        <com.android.launcher3.FocusIndicatorView

            android:id="@+id/focus_indicator"
@@ -70,4 +70,4 @@ 
        android:layout_height="match_parent"

        android:inflatedId="@+id/launcher_overlay"

        android:layout="@layout/launcher_overlay" />

</FrameLayout>
 
</com.android.launcher3.LauncherRootView>

res/layout-port/launcher.xml

+4 −3
Original line number Diff line number Diff line
@@ -15,14 +15,15 @@ 
-->



<!-- Full screen view projects under the status bar and contains the background -->

<FrameLayout

<com.android.launcher3.LauncherRootView

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

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



    android:id="@+id/launcher"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@drawable/workspace_bg">

    android:background="@drawable/workspace_bg"

    android:fitsSystemWindows="true">



    <com.android.launcher3.DragLayer

        android:id="@+id/drag_layer"
@@ -90,4 +91,4 @@ 
        android:layout_height="match_parent"

        android:inflatedId="@+id/launcher_overlay"

        android:layout="@layout/launcher_overlay" />

</FrameLayout>
 
</com.android.launcher3.LauncherRootView>

res/layout-sw720dp/launcher.xml

+5 −5
Original line number Diff line number Diff line
@@ -15,20 +15,20 @@ 
-->



<!-- Full screen view projects under the status bar and contains the background -->

<FrameLayout

<com.android.launcher3.LauncherRootView

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

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



    android:id="@+id/launcher"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@drawable/workspace_bg">

    android:background="@drawable/workspace_bg"

    android:fitsSystemWindows="true">



    <com.android.launcher3.DragLayer

        android:id="@+id/drag_layer"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:fitsSystemWindows="true">

        android:layout_height="match_parent">



        <com.android.launcher3.FocusIndicatorView

            android:id="@+id/focus_indicator"
@@ -90,4 +90,4 @@ 
        android:inflatedId="@+id/launcher_overlay"

        android:layout="@layout/launcher_overlay" />



</FrameLayout>
 
</com.android.launcher3.LauncherRootView>

res/layout/launcher_overlay.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     limitations under the License.

-->



<FrameLayout

<com.android.launcher3.InsettableFrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent" />

res/layout/launcher_overlay_example.xml

+4 −4
Original line number Diff line number Diff line
@@ -14,19 +14,19 @@ 
     limitations under the License.

-->



<FrameLayout

<com.android.launcher3.InsettableFrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <FrameLayout

    <com.android.launcher3.InsettableFrameLayout

        android:id="@+id/search_overlay"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="#ff00ff00"

        android:visibility="invisible" />



    <FrameLayout

    <com.android.launcher3.InsettableFrameLayout

        android:id="@+id/search_box"

        android:layout_width="match_parent"

        android:layout_height="48dp"
@@ -34,4 +34,4 @@ 
        android:layout_marginRight="8dp"

        android:layout_marginTop="36dp"

        android:background="#ffff0000" />

</FrameLayout>
 
</com.android.launcher3.InsettableFrameLayout>