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

Commit 620d0eaa authored by Edgar Wang's avatar Edgar Wang Committed by Mill Chen
Browse files

[Expressive design] update TopIntroPreference 

- support expand/collapse

Bug: 366407433
Test: manual
Flag: EXEMPT resource only update
Change-Id: I7b417287568b06b7ea243625a0b788d5b2854454
parent 7e21ef8b

packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_expressive_icon_collapse.xml

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

  -->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item>

        <shape

            android:shape="oval">

            <size android:width="24dp" android:height="24dp"/>

            <solid android:color="@color/settingslib_materialColorSurfaceDim"/>

        </shape>

    </item>

    <item>

        <vector

            android:width="24dp"

            android:height="24dp"

            android:viewportWidth="960"

            android:viewportHeight="960">

            <path

                android:fillColor="@color/settingslib_materialColorOnSurface"

                android:pathData="M480,432L296,616L240,560L480,320L720,560L664,616L480,432Z"/>

        </vector>

    </item>

</layer-list>
 
 No newline at end of file

packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_expressive_icon_expand.xml

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

  -->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item>

        <shape

            android:shape="oval">

            <size android:width="24dp" android:height="24dp"/>

            <solid android:color="@color/settingslib_materialColorSurfaceDim"/>

        </shape>

    </item>

    <item>

        <vector

            android:width="24dp"

            android:height="24dp"

            android:viewportWidth="960"

            android:viewportHeight="960">

            <path

                android:fillColor="@color/settingslib_materialColorOnSurface"

                android:pathData="M480,616L240,376L296,320L480,504L664,320L720,376L480,616Z"/>

        </vector>

    </item>

</layer-list>
 
 No newline at end of file

packages/SettingsLib/SettingsTheme/res/layout-v35/settingslib_expressive_collapsable_textview.xml

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

  -->



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

    android:paddingBottom="@dimen/settingslib_expressive_space_small1"

    android:paddingTop="@dimen/settingslib_expressive_space_extrasmall4"

    android:orientation="vertical"

    android:animateLayoutChanges="true"

    android:background="?android:attr/selectableItemBackground"

    android:clipToPadding="false">



    <TextView

        android:id="@android:id/title"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        android:textAlignment="viewStart"

        android:clickable="false"

        android:longClickable="false"

        android:maxLines="10"

        android:ellipsize="end"

        android:textAppearance="@style/TextAppearance.TopIntroText"/>



    <com.google.android.material.button.MaterialButton

        android:id="@+id/collapse_button"

        app:layout_constraintTop_toBottomOf="@android:id/title"

        app:layout_constraintStart_toStartOf="parent"

        android:text="@string/settingslib_expressive_text_expand"

        app:icon="@drawable/settingslib_expressive_icon_expand"

        style="@style/SettingslibTextButtonStyle.Expressive"/>

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

packages/SettingsLib/SettingsTheme/res/values-v35/attrs_expressive.xml

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

-->



<resources>

    <declare-styleable name="CollapsableTextView">

        <attr name="android:gravity"/>

        <!-- The minimum number of lines when the textView collapsed. -->

        <attr name="android:minLines"/>

        <!-- Specifies that the textView is collapsable. -->

        <attr name="isCollapsable" format="boolean"/>

    </declare-styleable>

</resources>
 
 No newline at end of file

packages/SettingsLib/SettingsTheme/res/values-v35/strings.xml

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

<!--

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

  -->



<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- text of button to indicate user the textView is expandable [CHAR LIMIT=NONE] -->

    <string name="settingslib_expressive_text_expand">Expand</string>

    <!-- text of button to indicate user the textView is collapsable [CHAR LIMIT=NONE] -->

    <string name="settingslib_expressive_text_collapse">Collapse</string>

</resources>
 
 No newline at end of file