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

Commit 8b0adec7 authored by George Lin's avatar George Lin Committed by Android (Google) Code Review
Browse files

Merge "Shape tab" into main

parents 29cb2796 66db6b86

res/drawable/ic_apps_filled_24px.xml

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

  ~ Copyright (C) 2024 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.

  ~

  -->



<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" android:tint="?attr/colorControlNormal">

    <path android:fillColor="@android:color/white" android:pathData="M240,800Q207,800 183.5,776.5Q160,753 160,720Q160,687 183.5,663.5Q207,640 240,640Q273,640 296.5,663.5Q320,687 320,720Q320,753 296.5,776.5Q273,800 240,800ZM480,800Q447,800 423.5,776.5Q400,753 400,720Q400,687 423.5,663.5Q447,640 480,640Q513,640 536.5,663.5Q560,687 560,720Q560,753 536.5,776.5Q513,800 480,800ZM720,800Q687,800 663.5,776.5Q640,753 640,720Q640,687 663.5,663.5Q687,640 720,640Q753,640 776.5,663.5Q800,687 800,720Q800,753 776.5,776.5Q753,800 720,800ZM240,560Q207,560 183.5,536.5Q160,513 160,480Q160,447 183.5,423.5Q207,400 240,400Q273,400 296.5,423.5Q320,447 320,480Q320,513 296.5,536.5Q273,560 240,560ZM480,560Q447,560 423.5,536.5Q400,513 400,480Q400,447 423.5,423.5Q447,400 480,400Q513,400 536.5,423.5Q560,447 560,480Q560,513 536.5,536.5Q513,560 480,560ZM720,560Q687,560 663.5,536.5Q640,513 640,480Q640,447 663.5,423.5Q687,400 720,400Q753,400 776.5,423.5Q800,447 800,480Q800,513 776.5,536.5Q753,560 720,560ZM240,320Q207,320 183.5,296.5Q160,273 160,240Q160,207 183.5,183.5Q207,160 240,160Q273,160 296.5,183.5Q320,207 320,240Q320,273 296.5,296.5Q273,320 240,320ZM480,320Q447,320 423.5,296.5Q400,273 400,240Q400,207 423.5,183.5Q447,160 480,160Q513,160 536.5,183.5Q560,207 560,240Q560,273 536.5,296.5Q513,320 480,320ZM720,320Q687,320 663.5,296.5Q640,273 640,240Q640,207 663.5,183.5Q687,160 720,160Q753,160 776.5,183.5Q800,207 800,240Q800,273 776.5,296.5Q753,320 720,320Z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_category_filled_24px.xml

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

  ~ Copyright (C) 2024 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.

  ~

  -->



<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" android:tint="?attr/colorControlNormal">

    <path android:fillColor="@android:color/white" android:pathData="M260,440L480,80L700,440L260,440ZM700,880Q625,880 572.5,827.5Q520,775 520,700Q520,625 572.5,572.5Q625,520 700,520Q775,520 827.5,572.5Q880,625 880,700Q880,775 827.5,827.5Q775,880 700,880ZM120,860L120,540L440,540L440,860L120,860Z"/>

</vector>
 
 No newline at end of file

res/layout/floating_sheet_shape_grid.xml

+68 −19
Original line number Diff line number Diff line
@@ -21,10 +21,50 @@ 
    android:orientation="vertical">



    <FrameLayout

        android:id="@+id/shape_grid_floating_sheet_content_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingVertical="@dimen/floating_sheet_content_vertical_padding"

        android:background="@drawable/floating_sheet_content_background"

        android:paddingVertical="@dimen/floating_sheet_content_vertical_padding"

        android:orientation="vertical"

        android:clipToPadding="false"

        android:clipChildren="false">



        <FrameLayout

            android:id="@+id/app_shape_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:clipToPadding="false"

            android:clipChildren="false">



            <!--

            This is just an invisible placeholder put in place so that the parent keeps its height

            stable as the RecyclerView updates from 0 items to N items. Keeping it stable allows the

            layout logic to keep the size of the preview container stable as well, which bodes well

            for setting up the SurfaceView for remote rendering without changing its size after the

            content is loaded into the RecyclerView.



            It's critical for any TextViews inside the included layout to have text.

            -->

            <include

                layout="@layout/shape_option"

                android:layout_width="64dp"

                android:layout_height="64dp"

                android:visibility="invisible" />



            <androidx.recyclerview.widget.RecyclerView

                android:id="@+id/shape_options"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal"

                android:clipToPadding="false"

                android:clipChildren="false" />

        </FrameLayout>



        <FrameLayout

            android:id="@+id/app_grid_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:clipToPadding="false"

            android:clipChildren="false">
@@ -39,16 +79,25 @@ 
            -->

            <include

                layout="@layout/grid_option"

                android:id="@+id/invisible_grid_option"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:visibility="invisible"/>



            <androidx.recyclerview.widget.RecyclerView

            android:id="@id/options"

                android:id="@+id/grid_options"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

                android:clipToPadding="false"

            android:clipChildren="false" />

                android:clipChildren="false"

                android:layout_gravity="center_horizontal" />

        </FrameLayout>

    </FrameLayout>



    <com.android.wallpaper.picker.customization.ui.view.FloatingToolbar

        android:id="@+id/floating_toolbar"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_horizontal"

        android:layout_marginVertical="@dimen/floating_sheet_tab_toolbar_vertical_margin" />

</LinearLayout>
 
 No newline at end of file

res/layout/shape_option.xml

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

<!--

  ~ Copyright (C) 2024 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.

  ~

  -->

<FrameLayout

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

    android:layout_width="64dp"

    android:layout_height="64dp"

    android:clipChildren="false">



    <ImageView

        android:id="@id/background"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@drawable/option_item_background"

        android:importantForAccessibility="no" />



    <ImageView

        android:id="@id/foreground"

        android:layout_width="40dp"

        android:layout_height="40dp"

        android:layout_gravity="center" />

</FrameLayout>

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -104,6 +104,10 @@ 
        grid layouts for the home screen. [CHAR LIMIT=15] -->

    <string name="shape_and_grid_title">App shape &amp; layout</string>



    <!-- Tab title that switch to app grid customization section, where people can customization

        the grid layout of the apps -->

    <string name="grid_layout">Layout</string>



    <!-- Label for a button that allows the user to apply the currently selected Theme.

        [CHAR LIMIT=20] -->

    <string name="apply_theme_btn">Apply</string>