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

Commit ee71b6a6 authored by Pinyao Ting's avatar Pinyao Ting Committed by Automerger Merge Worker
Browse files

Merging from ub-launcher3-master @ build 6586492 am: 616b7223

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/11856215

Change-Id: I2ccd348db2ec1d6589d3c12b3550cef3324cabb1
parents 4679a838 616b7223
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -20,5 +20,5 @@
        android:color="?android:colorAccent" />
    <item
        android:state_checked="false"
        android:color="@color/material_grey500" />
        android:color="@color/bottom_bar_icon_unchecked_color" />
</selector>
 No newline at end of file

res/drawable/color_chip.xml

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

     Copyright (C) 2019 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">
    <item
        android:state_activated="true"
        android:drawable="@drawable/color_chip_hollow" />
    <item
        android:state_activated="false"
        android:drawable="@drawable/color_chip_filled" />
    <item
        android:drawable="@drawable/color_chip_filled"/>
</selector>
 No newline at end of file
+2 −2
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--

     Copyright (C) 2019 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,7 @@
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
    <item
        android:id="@+id/center_fill"
        android:height="@dimen/component_color_chip_size"
        android:width="@dimen/component_color_chip_size"
        android:gravity="center">
@@ -34,7 +34,7 @@
            android:innerRadius="24dp"
            android:thickness="@dimen/option_border_width"
            android:useLevel="false">
        <solid android:color="@android:color/black"/>
        <solid android:color="?android:colorAccent"/>
        </shape>
    </item>
</layer-list>
+0 −28
Original line number Diff line number Diff line
<!--
     Copyright (C) 2019 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="@color/accent_color"
      android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10s10,-4.5 10,-10S17.5,2 12,2zM10,17l-4,-4l1.4,-1.4l2.6,2.6l6.6,-6.6L18,9L10,17z"/>
  <path
      android:pathData="m8.0085,14.9866 l-1.9939,-1.994 0.6892,-0.6889 0.6892,-0.6889 1.2925,1.2926c0.7109,0.711 1.3035,1.2926 1.3169,1.2926 0.0134,0 1.5034,-1.4789 3.3111,-3.2865l3.2866,-3.2865 0.689,0.689 0.689,0.689 -3.9878,3.9878 -3.9878,3.9878z"
      android:strokeWidth="0.02439024"
      android:fillColor="@color/selected_check_color"/>
</vector>
+35 −34
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@
            android:clipToPadding="false"
            android:background="@color/fullscreen_preview_background"
            app:layout_constrainedHeight="true"
            app:layout_constraintBottom_toTopOf="@+id/component_options_title"
            app:layout_constraintBottom_toTopOf="@+id/component_scroll_view"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintHeight_max="@dimen/preview_pager_max_height"
            app:layout_constraintStart_toStartOf="parent"
@@ -47,6 +47,20 @@
            <include layout="@layout/theme_preview_card"/>
        </FrameLayout>

        <ScrollView
                android:id="@+id/component_scroll_view"
                android:layout_width="match_parent"
                android:layout_height="0dp"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/component_preview_container"
                app:layout_constraintBottom_toBottomOf="parent">

            <LinearLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:orientation="vertical">

                <TextView
                        android:id="@+id/component_options_title"
                        android:layout_width="match_parent"
@@ -55,21 +69,7 @@
                        android:layout_marginHorizontal="16dp"
                        android:textAlignment="center"
                        android:textAppearance="@style/TitleTextAppearance"
            android:textSize="@dimen/component_options_title_size"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/component_preview_container"
            app:layout_constraintBottom_toTopOf="@+id/edit_text_container"/>

        <FrameLayout
            android:id="@+id/edit_text_container"
            android:layout_width="match_parent"
            android:layout_height="0dp"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/component_options_title"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintVertical_bias="1">
                        android:textSize="@dimen/component_options_title_size"/>

                <EditText
                        android:id="@+id/custom_theme_name"
@@ -81,6 +81,7 @@
                        android:importantForAutofill="no"
                        android:minWidth="300dp"
                        style="@style/CustomThemeNameEditText"/>
        </FrameLayout>
            </LinearLayout>
        </ScrollView>
    </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
Loading