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

Commit 80e15c83 authored by George Lin's avatar George Lin
Browse files

Fix clock edit button cropped when overscroll 

Fixed by leaving top space for the edit button

Test: Manually tested see bug
Fixes: 377528523
Flag: com.android.systemui.shared.new_customization_picker_ui
Change-Id: Ib3bfd8460e40382f0615603ad9e6b8883f6f5ed3
parent 47347ecd

res/layout/clock_style_option.xml

+33 −37
Original line number Diff line number Diff line
@@ -14,47 +14,43 @@ 
     limitations under the License.

-->

<!-- Content description is set programmatically on the parent FrameLayout -->

<FrameLayout

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

    android:layout_width="@dimen/floating_sheet_clock_style_option_size"

    android:layout_height="@dimen/floating_sheet_clock_style_option_size"

<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="@dimen/floating_sheet_clock_style_option_width"

    android:layout_height="@dimen/floating_sheet_clock_style_option_height"

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

    android:clipToPadding="false"

    android:clipChildren="false">



    <ImageView

        android:id="@id/selection_border"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@drawable/option_item_border"

        android:alpha="0"

        android:importantForAccessibility="no" />



    <ImageView

    <com.android.wallpaper.picker.option.ui.view.OptionItemBackground

        android:id="@id/background"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@drawable/option_item_background"

        android:importantForAccessibility="no" />

        android:layout_width="@dimen/floating_sheet_clock_style_option_background_size"

        android:layout_height="@dimen/floating_sheet_clock_style_option_background_size"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        android:importantForAccessibility="no"

        android:layout_gravity="bottom" />



    <FrameLayout

        android:id="@+id/foreground"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



    <ImageView

            android:id="@+id/clock_icon"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_margin="@dimen/floating_sheet_clock_style_thumbnail_margin"

        android:id="@+id/foreground"

        android:layout_width="@dimen/floating_sheet_clock_style_option_thumbnail_size"

        android:layout_height="@dimen/floating_sheet_clock_style_option_thumbnail_size"

        android:layout_marginBottom="@dimen/floating_sheet_clock_style_thumbnail_margin_bottom"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        android:src="@drawable/ic_clock_24px" />



    <ImageView

        android:id="@+id/edit_icon"

        android:layout_width="@dimen/floating_sheet_clock_edit_icon_size"

        android:layout_height="@dimen/floating_sheet_clock_edit_icon_size"

            android:layout_marginTop="-16dp"

            android:layout_marginLeft="50dp"

            android:src="@drawable/edit_icon"/>



    </FrameLayout>

</FrameLayout>

        android:layout_marginTop="@dimen/floating_sheet_clock_edit_icon_margin"

        android:layout_marginEnd="@dimen/floating_sheet_clock_edit_icon_margin"

        android:src="@drawable/edit_icon"

        app:layout_constraintEnd_toEndOf="@+id/background"

        app:layout_constraintTop_toTopOf="@+id/background"

        android:importantForAccessibility="no" />

</androidx.constraintlayout.widget.ConstraintLayout>

res/layout/clock_style_option2.xml

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

-->

<!-- Content description is set programmatically on the parent FrameLayout -->

<FrameLayout

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

    android:layout_width="80dp"

    android:layout_height="80dp"

    android:clipToPadding="false"

    android:clipChildren="false">



    <com.android.wallpaper.picker.option.ui.view.OptionItemBackground

        android:id="@id/background"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:importantForAccessibility="no" />



    <ImageView

        android:id="@+id/foreground"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_margin="@dimen/floating_sheet_clock_style_thumbnail_margin"

        android:src="@drawable/ic_clock_24px" />



    <ImageView

        android:id="@+id/edit_icon"

        android:layout_width="@dimen/floating_sheet_clock_edit_icon_size"

        android:layout_height="@dimen/floating_sheet_clock_edit_icon_size"

        android:layout_marginTop="-16dp"

        android:layout_marginStart="50dp"

        android:src="@drawable/edit_icon"

        android:importantForAccessibility="no" />

</FrameLayout>

res/layout/floating_sheet_clock.xml

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
        android:id="@+id/clock_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:clipToPadding="false"

        android:clipChildren="false">

res/layout/floating_sheet_clock_color_content.xml

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingVertical="@dimen/floating_sheet_content_vertical_padding"

    android:orientation="vertical"

    android:clipToPadding="false"

    android:clipChildren="false">

res/layout/floating_sheet_clock_font_content.xml

+3 −2
Original line number Diff line number Diff line
@@ -20,9 +20,10 @@ 
    android:id="@+id/clock_floating_sheet_font_content"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingVertical="@dimen/floating_sheet_content_vertical_padding"

    android:paddingHorizontal="@dimen/floating_sheet_content_horizontal_padding"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:paddingHorizontal="@dimen/floating_sheet_content_horizontal_padding">

    android:clipToPadding="false">



    <TextView

        android:id="@+id/clock_axis_slider_name1"