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

Commit bbdbf7bb authored by Catherine Liang's avatar Catherine Liang
Browse files

Clock UX Polish & code cleanup 

Adjusted header color & title, and removed unused files.

Bug: 275565313
Test: manually verified, see comment
Change-Id: Ibf0b61a99c1ecf753e2dc9d9c34a16b30bd98ee1
parent 53fad236

res/layout/clock_color_option.xml

+1 −65
Original line number Diff line number Diff line
@@ -21,72 +21,8 @@ 
    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:clipChildren="false">

    <FrameLayout

        android:id="@+id/icon_container"

        android:layout_width="@dimen/option_item_size"

        android:layout_height="@dimen/option_item_size"

        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

            android:id="@id/background"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:background="@drawable/option_item_background"

            android:importantForAccessibility="no" />



        <FrameLayout

            android:id="@id/foreground"

            android:layout_width="match_parent"

            android:layout_height="match_parent">

            <ImageView

                android:id="@+id/color_preview_0"

                android:layout_width="@dimen/component_color_chip_small_radius_default2"

                android:layout_height="@dimen/component_color_chip_small_radius_default2"

                android:layout_gravity="center"

                android:layout_marginRight="@dimen/color_seed_chip_margin2"

                android:layout_marginBottom="@dimen/color_seed_chip_margin2"

                android:src="@drawable/color_chip_seed_filled0"

                android:importantForAccessibility="no"/>



            <ImageView

                android:id="@+id/color_preview_1"

                android:layout_width="@dimen/component_color_chip_small_radius_default2"

                android:layout_height="@dimen/component_color_chip_small_radius_default2"

                android:layout_gravity="center"

                android:layout_marginLeft="@dimen/color_seed_chip_margin2"

                android:layout_marginBottom="@dimen/color_seed_chip_margin2"

                android:src="@drawable/color_chip_seed_filled2"

                android:importantForAccessibility="no"/>



            <ImageView

                android:id="@+id/color_preview_2"

                android:layout_width="@dimen/component_color_chip_small_radius_default2"

                android:layout_height="@dimen/component_color_chip_small_radius_default2"

                android:layout_gravity="center"

                android:layout_marginRight="@dimen/color_seed_chip_margin2"

                android:layout_marginTop="@dimen/color_seed_chip_margin2"

                android:src="@drawable/color_chip_seed_filled1"

                android:importantForAccessibility="no"/>



            <ImageView

                android:id="@+id/color_preview_3"

                android:layout_width="@dimen/component_color_chip_small_radius_default2"

                android:layout_height="@dimen/component_color_chip_small_radius_default2"

                android:layout_gravity="center"

                android:layout_marginLeft="@dimen/color_seed_chip_margin2"

                android:layout_marginTop="@dimen/color_seed_chip_margin2"

                android:src="@drawable/color_chip_seed_filled3"

                android:importantForAccessibility="no" />

        </FrameLayout>

    </FrameLayout>

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



    <TextView

        android:id="@+id/text"

res/layout/color_option_2.xml

+0 −12
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
<!-- Content description is set programmatically on the parent FrameLayout -->

<LinearLayout

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

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

    android:layout_width="@dimen/option_item_size"

    android:layout_height="wrap_content"

    android:orientation="vertical"
@@ -48,16 +47,5 @@ 
            android:layout_height="match_parent"

            android:layout_margin="@dimen/color_seed_chip_margin2"/>

    </FrameLayout>



    <TextView

        android:id="@+id/text"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/option_bottom_margin"

        android:textColor="@color/text_color_primary"

        android:visibility="gone"

        android:gravity="center"

        android:text="Placeholder for stable size calculation, please do not remove."

        tools:ignore="HardcodedText" />

</LinearLayout>

src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ object ClockSettingsBinder { 
                                val item =

                                    LayoutInflater.from(view.context)

                                        .inflate(

                                            R.layout.color_option_2,

                                            R.layout.clock_color_option,

                                            colorOptionContainerListView,

                                            false,

                                        ) as LinearLayout

src/com/android/customization/picker/clock/ui/fragment/ClockSettingsFragment.kt

+5 −1
Original line number Diff line number Diff line
@@ -134,6 +134,10 @@ class ClockSettingsFragment : AppbarFragment() { 
    }



    override fun getDefaultTitle(): CharSequence {

        return requireContext().getString(R.string.clock_settings_title)

        return requireContext().getString(R.string.clock_color_and_size_title)

    }



    override fun getToolbarColorId(): Int {

        return android.R.color.transparent

    }

}

src/com/android/customization/picker/color/ColorPickerFragment.kt

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.

 */

package com.android.customization.picker.color



import android.os.Bundle

import android.view.LayoutInflater

import android.view.View

import android.view.ViewGroup

import com.android.wallpaper.R

import com.android.wallpaper.picker.AppbarFragment



// TODO (b/262924623): Color Picker Fragment

class ColorPickerFragment : AppbarFragment() {

    override fun onCreateView(

        inflater: LayoutInflater,

        container: ViewGroup?,

        savedInstanceState: Bundle?

    ): View {

        val view =

            inflater.inflate(

                R.layout.fragment_color_picker,

                container,

                false,

            )

        setUpToolbar(view)

        return view

    }

}