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

Commit 9b3bb590 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "silkfx-e2e" into main 

* changes:
  SilkFX: Migrate layouts to display edge-to-edge
  Migrate off edge-to-edge opt out flag
parents 3a99294c 3c2cb40a

tests/graphics/SilkFX/AndroidManifest.xml

+2 −3
Original line number Original line Diff line number Diff line
@@ -23,13 +23,12 @@ 
    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />





    <application android:label="SilkFX"

    <application android:label="SilkFX"

         android:theme="@style/Theme.UsefulDefault">

         android:theme="@android:style/Theme.Material">





        <activity android:name=".Main"

        <activity android:name=".Main"

             android:label="SilkFX Demos"

             android:label="SilkFX Demos"

             android:banner="@drawable/background1"

             android:banner="@drawable/background1"

             android:exported="true"

             android:exported="true">

             android:theme="@style/Theme.UsefulDefault">

            <intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

                <action android:name="android.intent.action.MAIN"/>

                <category android:name="android.intent.category.DEFAULT"/>

                <category android:name="android.intent.category.DEFAULT"/>

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

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

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  ~ 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:app="http://schemas.android.com/apk/res-auto"

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

    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:id="@+id/background"

        android:layout_width="390dp"

        android:layout_width="390dp"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:layout_gravity="center"

        android:padding="15dp"

        android:padding="15dp"

    android:orientation="vertical"

        android:orientation="vertical">

    tools:context=".materials.BackgroundBlurActivity">





        <TextView

        <TextView

            android:layout_width="match_parent"

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

        <requestFocus/>





    </LinearLayout>

    </LinearLayout>

</FrameLayout>

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

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

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

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true"

    tools:context=".MainActivity">

    tools:context=".MainActivity">





    <ImageView

    <ImageView

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

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

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

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:layout_margin="8dp"

    android:orientation="vertical">

    android:orientation="vertical">





    <TextView

    <TextView

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

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

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

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true"

    android:orientation="vertical">

    android:orientation="vertical">





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

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