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

Commit 55df7acc authored by Lucas Silva's avatar Lucas Silva
Browse files

Dream settings refactor. 

We will be re-using the grid UI for the dream complication picker, so
this change refactors some of that logic so it can be re-used in the
complication controller.

We also update some of the UI here to match the most recent UX
decisions.

http://screen/BxhAwZwQSVoxUmN.png

Test: locally on device
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.dream.DreamPickerControllerTest"
Bug: 214250590
Bug: 215703483
Change-Id: I9fbfa0f0cd31ae3d119c7cd1a9562d4cdb203d6c
parent 99bd4e45

res/color/dream_card_color_state_list.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 


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

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

    <item android:state_activated="true" android:color="?androidprv:attr/colorSurfaceHighlight"/>

    <item android:color="?androidprv:attr/colorSurface"/>

    <item android:state_activated="true" android:color="?androidprv:attr/colorSurfaceVariant"/>

    <item android:color="?androidprv:attr/colorSurfaceHighlight"/>

</selector>
 
 No newline at end of file

res/drawable/ic_dream_check_circle.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2022 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="@dimen/dream_item_icon_size"

        android:height="@dimen/dream_item_icon_size"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M12.0,2.0C6.48,2.0 2.0,6.48 2.0,12.0s4.48,10.0 10.0,10.0 10.0,-4.48 10.0,-10.0S17.52,2.0 12.0,2.0zm-2.0,15.0l-5.0,-5.0 1.41,-1.41L10.0,14.17l7.59,-7.59L19.0,8.0l-9.0,9.0z"/>

</vector>
 
 No newline at end of file

res/layout/dream_picker_layout.xml

+32 −17
Original line number Diff line number Diff line
@@ -15,28 +15,43 @@ 
    limitations under the License.

-->



<androidx.constraintlayout.widget.ConstraintLayout

<LinearLayout

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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



    <androidx.cardview.widget.CardView

        android:id="@+id/dream_picker_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

    android:padding="@dimen/dream_picker_padding">

        style="@style/DreamPickerBackgroundStyle">



        <androidx.constraintlayout.widget.ConstraintLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content">



            <androidx.recyclerview.widget.RecyclerView

                android:id="@+id/dream_list"

        android:layout_width="match_parent"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:clipToPadding="true"

        android:nestedScrollingEnabled="false"/>

                android:nestedScrollingEnabled="false"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintEnd_toEndOf="parent"/>



            <Button

                android:id="@+id/preview_button"

                style="@style/ActionPrimaryButton"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:visibility="gone"

                android:text="@string/dream_preview_button_title"

                app:layout_constraintTop_toBottomOf="@+id/dream_list"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintEnd_toEndOf="parent"/>



        </androidx.constraintlayout.widget.ConstraintLayout>



    </androidx.cardview.widget.CardView>

</LinearLayout>

res/layout/dream_preference_layout.xml

+12 −25
Original line number Diff line number Diff line
@@ -17,18 +17,17 @@ 


<androidx.cardview.widget.CardView

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

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

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

    android:id="@+id/container"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_margin="10dp"

    style="@style/DreamCardStyle"

    android:clickable="true">



    <androidx.constraintlayout.widget.ConstraintLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_margin="8dp"

        android:minHeight="?android:attr/listPreferredItemHeight">



        <androidx.cardview.widget.CardView
@@ -37,16 +36,14 @@ 
            android:layout_height="0dp"

            app:cardCornerRadius="@dimen/dream_item_corner_radius"

            app:cardElevation="0dp"

            app:layout_constraintDimensionRatio="3:2"

            app:layout_constraintDimensionRatio="1:1"

            app:layout_constraintTop_toTopOf="parent"

            app:layout_constraintStart_toStartOf="parent">



            <ImageView

                android:id="@+id/preview"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:scaleType="centerCrop"/>



        </androidx.cardview.widget.CardView>



        <Button
@@ -63,12 +60,14 @@ 


        <ImageView

            android:id="@+id/icon"

            android:layout_width="18dp"

            android:layout_width="@dimen/dream_item_icon_size"

            android:layout_height="0dp"

            android:layout_marginTop="18dp"

            android:layout_marginStart="10dp"

            android:layout_marginBottom="10dp"

            android:layout_marginTop="@dimen/dream_item_title_margin_top"

            android:layout_marginStart="@dimen/dream_item_icon_margin_start"

            android:layout_marginBottom="@dimen/dream_item_title_margin_bottom"

            android:gravity="center_vertical"

            app:layout_constraintDimensionRatio="1:1"

            app:layout_constraintHorizontal_chainStyle="packed"

            app:layout_constraintTop_toBottomOf="@+id/preview_container"

            app_layout_constraintEnd_toStartOf="@+id/title_text"

            app:layout_constraintStart_toStartOf="parent"/>
@@ -77,9 +76,10 @@ 
            android:id="@+id/title_text"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_marginStart="18dp"

            android:layout_marginTop="16dp"

            android:layout_marginBottom="10dp"

            android:layout_marginTop="@dimen/dream_item_title_margin_top"

            android:layout_marginStart="@dimen/dream_item_title_margin_start"

            android:layout_marginBottom="@dimen/dream_item_title_margin_bottom"

            android:gravity="center_vertical"

            android:maxLines="1"

            android:ellipsize="end"

            android:textAppearance="?android:attr/textAppearanceListItemSmall"
@@ -87,18 +87,5 @@ 
            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintStart_toEndOf="@+id/icon"/>



        <TextView

            android:id="@+id/summary_text"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:textColor="?android:attr/textColorSecondary"

            android:maxLines="2"

            android:layout_marginBottom="8dp"

            android:layout_marginStart="8dp"

            android:layout_marginEnd="8dp"

            app:layout_constraintTop_toBottomOf="@+id/title_text"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintStart_toStartOf="parent"/>



    </androidx.constraintlayout.widget.ConstraintLayout>

</androidx.cardview.widget.CardView>

res/values/dimens.xml

+11 −5
Original line number Diff line number Diff line
@@ -441,11 +441,17 @@ 
    <dimen name="chartview_trapezoid_margin_bottom">2dp</dimen>



    <!-- Dimensions for Dream settings cards -->

    <dimen name="dream_item_min_column_width">230dp</dimen>

    <dimen name="dream_item_corner_radius">@*android:dimen/config_dialogCornerRadius</dimen>

    <dimen name="dream_preference_margin_horizontal">4dp</dimen>

    <dimen name="dream_preference_margin_bottom">8dp</dimen>

    <dimen name="dream_picker_padding">40dp</dimen>

    <dimen name="dream_item_min_column_width">210dp</dimen>

    <dimen name="dream_item_corner_radius">28dp</dimen>

    <dimen name="dream_item_content_padding">8dp</dimen>

    <dimen name="dream_item_icon_size">20dp</dimen>

    <dimen name="dream_item_title_margin_top">18dp</dimen>

    <dimen name="dream_item_title_margin_bottom">8dp</dimen>

    <dimen name="dream_item_title_margin_start">18dp</dimen>

    <dimen name="dream_item_icon_margin_start">10dp</dimen>

    <dimen name="dream_preference_margin_horizontal">10dp</dimen>

    <dimen name="dream_preference_margin_bottom">20dp</dimen>

    <dimen name="dream_picker_margin_horizontal">48dp</dimen>



    <!-- Sims/Data mobile/Calls/SMS select dialog-->

    <dimen name="sims_select_margin_bottom">24dp</dimen>