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

Commit 5e1fc317 authored by Lucas Silva's avatar Lucas Silva Committed by Android (Google) Code Review
Browse files

Merge changes from topics "dreams-phone", "dreams-preview-placeholder" 

* changes:
  Add default placeholder when a dream doesn't provide a preview image.
  Update default dream settings dimens for phones.
  Update dream settings UX to match latest mocks.
parents 382cebc1 1bce5eb5

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_selected="true" android:color="?androidprv:attr/colorSurfaceVariant"/>

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

    <item android:state_selected="true" android:color="?androidprv:attr/colorAccentPrimary"/>

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

</selector>
 
 No newline at end of file

res/color/dream_card_text_color_state_list.xml

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

<!--

  ~ 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.

  -->



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

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

    <item android:state_selected="true" android:color="?androidprv:attr/textColorOnAccent"/>

    <item android:color="?android:attr/textColorPrimary"/>

</selector>
 
 No newline at end of file

res/drawable/dream_default_preview_icon.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="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24">

    <path android:fillColor="?android:attr/textColorSecondary"

          android:pathData="M3,19Q2.175,19 1.588,18.413Q1,17.825 1,17V7Q1,6.175 1.588,5.588Q2.175,5 3,5H13Q13.825,5 14.413,5.588Q15,6.175 15,7V17Q15,17.825 14.413,18.413Q13.825,19 13,19ZM3,17H13Q13,17 13,17Q13,17 13,17V7Q13,7 13,7Q13,7 13,7H3Q3,7 3,7Q3,7 3,7V17Q3,17 3,17Q3,17 3,17ZM17,19V5H19V19ZM21,19V5H23V19ZM4,15H12L9.4,11.5L7.5,14L6.1,12.15ZM3,7Q3,7 3,7Q3,7 3,7V17Q3,17 3,17Q3,17 3,17Q3,17 3,17Q3,17 3,17V7Q3,7 3,7Q3,7 3,7Z"/>

</vector>
 
 No newline at end of file

res/drawable/dream_preview_rounded_bg.xml

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

  -->



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

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

       android:shape="rectangle">

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

    <corners android:radius="@dimen/dream_item_corner_radius"/>

</shape>
 
 No newline at end of file

res/layout/dream_picker_layout.xml

+16 −23
Original line number Diff line number Diff line
@@ -15,19 +15,10 @@ 
    limitations under the License.

-->



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

        style="@style/DreamPickerBackgroundStyle">



<androidx.constraintlayout.widget.ConstraintLayout

    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">
@@ -37,10 +28,12 @@ 
        android:layout_height="wrap_content"

        android:clipToPadding="true"

        android:nestedScrollingEnabled="false"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

        android:paddingBottom="@dimen/dream_preference_card_padding"

        app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintEnd_toEndOf="parent"/>

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"/>



</androidx.constraintlayout.widget.ConstraintLayout>
 
 No newline at end of file
 


    </androidx.cardview.widget.CardView>

</LinearLayout>