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

Commit 3c2cb40a authored by Robin Lee's avatar Robin Lee
Browse files

SilkFX: Migrate layouts to display edge-to-edge 

Bug: 309578419
Test: Manual (open each of the screens and check layout hierarchy)
Flag: com.android.window.flags.disable_opt_out_edge_to_edge
Change-Id: Ie4736d2602d0588199252e28055a42fba212fc2a
parent 4ce8e7bc

tests/graphics/SilkFX/res/layout/activity_background_blur.xml

+142 −135
Original line number Diff line number Diff line
@@ -14,16 +14,22 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

-->

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

<FrameLayout

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

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

    xmlns:tools="http://schemas.android.com/tools"

    android:fitsSystemWindows="true"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    tools:context=".materials.BackgroundBlurActivity">



    <LinearLayout

        android:id="@+id/background"

        android:layout_width="390dp"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:padding="15dp"

    android:orientation="vertical"

    tools:context=".materials.BackgroundBlurActivity">

        android:orientation="vertical">



        <TextView

            android:layout_width="match_parent"
@@ -171,3 +177,4 @@ 
        <requestFocus/>



    </LinearLayout>

</FrameLayout>

tests/graphics/SilkFX/res/layout/activity_glass.xml

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true"

    tools:context=".MainActivity">



    <ImageView

tests/graphics/SilkFX/res/layout/color_mode_controls.xml

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_margin="8dp"

    android:orientation="vertical">



    <TextView

tests/graphics/SilkFX/res/layout/common_base.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true"

    android:orientation="vertical">



    <include layout="@layout/color_mode_controls" />

tests/graphics/SilkFX/res/layout/hdr_glows.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true"

    android:orientation="vertical">



    <include layout="@layout/color_mode_controls" />