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

Commit 4c3c4bfc authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Expressive design] update TopIntroPreference" into main

parents 885a7452 620d0eaa
Loading
Loading
Loading
Loading
+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
+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
+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
+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
+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
Loading