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

Commit 59355d70 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12651823 from f95488b1 to 25Q1-release 

Change-Id: If9760ab62fce833402b10cec1a30d8e043d208b5
parents 6eb31155 f95488b1

res/layout/clock_font_axis_name.xml

deleted100644 → 0
+0 −21
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.

  -->



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

    android:id="@+id/clock_axis_name"

    android:layout_width="@dimen/clock_font_axis_name_width"

    android:layout_height="wrap_content"

    android:layout_gravity="center_vertical" />
 
 No newline at end of file

res/layout/clock_font_axis_switch.xml

deleted100644 → 0
+0 −22
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.

  -->



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

    android:id="@+id/clock_axis_switch"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:paddingStart="@dimen/clock_axis_control_padding_start"

    style="@style/Switch.SettingsLib" />
 
 No newline at end of file

res/layout/clock_font_axis_switch_row.xml

deleted100644 → 0
+0 −49
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.

  -->



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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingVertical="@dimen/clock_axis_control_row_vertical_padding"

    android:orientation="horizontal">

    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:id="@+id/clock_switch_one"

        android:orientation="horizontal">



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

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

    </LinearLayout>



    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:id="@+id/clock_switch_two"

        android:orientation="horizontal"

        android:visibility="gone">



        <ImageView

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:src="@drawable/clock_font_switch_divider"

            android:layout_marginHorizontal="@dimen/clock_font_control_switch_padding_horizontal"

            android:layout_gravity="center_vertical"/>



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

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

    </LinearLayout>

</LinearLayout>
 
 No newline at end of file

res/layout/floating_sheet_clock.xml

+44 −165
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

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

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

    android:paddingHorizontal="@dimen/floating_sheet_horizontal_padding"

    android:orientation="vertical">
@@ -31,171 +29,51 @@ 
        android:clipToPadding="false"

        android:clipChildren="false">



        <androidx.constraintlayout.widget.ConstraintLayout

        <include

            layout="@layout/floating_sheet_clock_style_content"

            android:id="@+id/clock_floating_sheet_style_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:clipToPadding="false"

            android:clipChildren="false">



            <FrameLayout

                android:id="@+id/clock_style_list_container"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintTop_toTopOf="parent"

                app:layout_constraintBottom_toTopOf="@+id/clock_style_clock_size_title"

                android:layout_marginBottom="8dp"

                android:clipToPadding="false"

                android:clipChildren="false">

            android:layout_height="wrap_content" />



                <!--

                This is 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/clock_style_option"

                    android:layout_width="@dimen/floating_sheet_clock_style_option_size"

                    android:layout_height="@dimen/floating_sheet_clock_style_option_size"

                    android:visibility="invisible" />



                <!--

                TODO (b/377528523): We intentionally disable over scroll mode since it will clip the

                  edit icon when in over scroll.

                -->

                <androidx.recyclerview.widget.RecyclerView

                    android:id="@+id/clock_style_list"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:overScrollMode="never"

                    android:clipChildren="false"

                    android:clipToPadding="false"/>

            </FrameLayout>



            <TextView

                android:id="@+id/clock_style_clock_size_title"

                style="@style/CustomizationOptionEntryTitleTextStyle"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:text="@string/clock_size_large"

                android:layout_marginStart="@dimen/floating_sheet_content_horizontal_padding"

                android:layout_marginEnd="@dimen/floating_sheet_clock_style_clock_size_text_margin_end"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintEnd_toStartOf="@+id/clock_style_clock_size_switch"

                app:layout_constraintTop_toBottomOf="@+id/clock_style_list_container"

                app:layout_constraintBottom_toTopOf="@+id/clock_style_clock_size_description" />



            <TextView

                android:id="@+id/clock_style_clock_size_description"

                style="@style/CustomizationOptionEntrySubtitleTextStyle"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_marginStart="@dimen/floating_sheet_content_horizontal_padding"

                android:layout_marginEnd="@dimen/floating_sheet_clock_style_clock_size_text_margin_end"

                android:text="@string/clock_size_dynamic_description"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintEnd_toStartOf="@+id/clock_style_clock_size_switch"

                app:layout_constraintTop_toBottomOf="@+id/clock_style_clock_size_title"

                app:layout_constraintBottom_toBottomOf="parent" />



            <Switch

                android:id="@+id/clock_style_clock_size_switch"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginEnd="@dimen/floating_sheet_content_horizontal_padding"

                app:layout_constraintTop_toTopOf="@+id/clock_style_clock_size_title"

                app:layout_constraintBottom_toBottomOf="@+id/clock_style_clock_size_description"

                app:layout_constraintEnd_toEndOf="parent"

                style="@style/Switch.SettingsLib"

                tools:ignore="UseSwitchCompatOrMaterialXml" />

        </androidx.constraintlayout.widget.ConstraintLayout>



        <LinearLayout

            layout="@layout/floating_sheet_clock_color_content"

            android:id="@+id/clock_floating_sheet_color_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:clipToPadding="false"

            android:clipChildren="false">



            <FrameLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:clipToPadding="false"

                android:clipChildren="false"

                android:layout_marginBottom="12dp">

            android:layout_height="wrap_content" />



                <!--

                This is 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/color_option"

                    android:layout_width="@dimen/option_item_size"

                    android:layout_height="@dimen/option_item_size"

                    android:visibility="invisible" />



                <androidx.recyclerview.widget.RecyclerView

                    android:id="@+id/clock_color_list"

            layout="@layout/floating_sheet_clock_font_content"

            android:id="@+id/clock_floating_sheet_font_content"

            android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:clipChildren="false"

                    android:clipToPadding="false" />

            android:layout_height="wrap_content" />

    </FrameLayout>



            <SeekBar

                android:id="@+id/clock_color_slider"

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

                android:layout_gravity="center_vertical"

                android:paddingHorizontal="@dimen/floating_sheet_content_horizontal_padding"

                android:minHeight="@dimen/touch_target_min_height"

                android:thumb="@null"

                android:contentDescription="@string/accessibility_clock_slider_description"

                android:background="@null"

                android:progressDrawable="@drawable/saturation_progress_drawable"

                android:splitTrack="false" />

        </LinearLayout>

        android:layout_marginVertical="@dimen/floating_sheet_tab_toolbar_vertical_margin">



        <LinearLayout

            android:id="@+id/clock_floating_sheet_font_content"

            android:layout_width="match_parent"

        <!-- Invisible placeholder to make sure the view does not shrink in height when the floating

         toolbar visibility is gone -->

        <include

            layout="@layout/floating_toolbar_tab"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingHorizontal="@dimen/floating_sheet_content_horizontal_padding"

            android:orientation="vertical"

            android:clipToPadding="false"

            android:clipChildren="false">



            <!-- Populated dynamically w/ clock axis information -->

        </LinearLayout>

    </FrameLayout>

            android:layout_marginVertical="@dimen/floating_tab_toolbar_padding_vertical"

            android:visibility="invisible" />



        <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" />

            android:layout_gravity="center" />



        <LinearLayout

            android:id="@+id/clock_font_toolbar"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

        android:layout_gravity="center_horizontal"

        android:layout_marginTop="@dimen/floating_sheet_tab_clock_font_toolbar_top_margin"

        android:layout_marginBottom="@dimen/floating_sheet_tab_clock_font_toolbar_bottom_margin">

            android:layout_gravity="center_horizontal">



            <ImageView

                android:id="@+id/clock_font_revert"
@@ -212,4 +90,5 @@ 
                android:src="@drawable/clock_font_apply"

                android:contentDescription="@string/clock_font_editor_apply" />

        </LinearLayout>

    </FrameLayout>

</LinearLayout>

res/layout/clock_font_axis_slider_row.xml→res/layout/floating_sheet_clock_color_content.xml

+67 −0
Original line number Diff line number Diff line
@@ -14,22 +14,54 @@ 
  ~ limitations under the License.

  -->



<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_height="wrap_content"

    android:paddingVertical="@dimen/clock_axis_control_row_vertical_padding"

    android:orientation="horizontal">

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

    android:orientation="vertical"

    android:clipToPadding="false"

    android:clipChildren="false">



    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:clipToPadding="false"

        android:clipChildren="false"

        android:layout_marginBottom="@dimen/floating_sheet_clock_color_option_list_bottom_margin">



        <!--

        This is 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/color_option"

            android:layout_width="@dimen/option_item_size"

            android:layout_height="@dimen/option_item_size"

            android:visibility="invisible" />



        <androidx.recyclerview.widget.RecyclerView

            android:id="@+id/clock_color_list"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:clipChildren="false"

            android:clipToPadding="false" />

    </FrameLayout>



    <SeekBar

        android:id="@+id/clock_axis_slider"

        android:id="@+id/clock_color_slider"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:paddingStart="@dimen/clock_axis_control_padding_start"

        android:paddingHorizontal="@dimen/floating_sheet_content_horizontal_padding"

        android:minHeight="@dimen/touch_target_min_height"

        android:thumb="@null"

        android:contentDescription="@string/accessibility_clock_slider_description"

        android:background="@null"

        android:splitTrack="false"

        android:progressDrawable="@drawable/saturation_progress_drawable" />

        android:progressDrawable="@drawable/saturation_progress_drawable"

        android:splitTrack="false" />

</LinearLayout>
 
 No newline at end of file