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

Commit 6f553a15 authored by Edgar Wang's avatar Edgar Wang
Browse files

[Expressive design] Add CardPreference 

Bug: 367334214
Test: manual
Flag: EXEMPT resource only update
Change-Id: Ib7932a0e7ce8001e47c780671648eeacd99a18c7
parent 435ec085

packages/SettingsLib/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ android_library { 
        "SettingsLibBarChartPreference",

        "SettingsLibButtonPreference",

        "SettingsLibBulletPreference",

        "SettingsLibCardPreference",

        "SettingsLibCollapsingToolbarBaseActivity",

        "SettingsLibDeviceStateRotationLock",

        "SettingsLibDisplayUtils",

packages/SettingsLib/CardPreference/Android.bp

0 → 100644
+33 −0
Original line number Diff line number Diff line 
package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

}



android_library {

    name: "SettingsLibCardPreference",

    use_resource_processor: true,

    defaults: [

        "SettingsLintDefaults",

    ],



    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

    ],

    resource_dirs: ["res"],



    static_libs: [

        "androidx.annotation_annotation",

        "androidx.preference_preference",

        "SettingsLibSettingsTheme",

    ],

    sdk_version: "system_current",

    min_sdk_version: "21",

    apex_available: [

        "//apex_available:platform",

    ],

}

packages/SettingsLib/CardPreference/AndroidManifest.xml

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

  -->



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

          package="com.android.settingslib.widget.preference.card">



    <uses-sdk android:minSdkVersion="21" />



</manifest>

packages/SettingsLib/CardPreference/res/layout/settingslib_expressive_preference_card.xml

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

-->

<com.google.android.material.card.MaterialCardView

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

    style="@style/SettingsLibCardStyle">



    <LinearLayout

        android:id="@+id/card_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:baselineAligned="false"

        android:minHeight="@dimen/settingslib_expressive_space_large3"

        android:paddingStart="@dimen/settingslib_expressive_space_small1"

        android:paddingEnd="@dimen/settingslib_expressive_space_small1"

        android:orientation="horizontal"

        android:gravity="center_vertical">



        <LinearLayout

            android:id="@+id/icon_frame"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:minWidth="@dimen/settingslib_expressive_space_medium3"

            android:minHeight="@dimen/settingslib_expressive_space_medium3"

            android:gravity="center"

            android:orientation="horizontal">



            <ImageView

                android:id="@android:id/icon"

                android:src="@drawable/settingslib_arrow_drop_down"

                android:layout_width="@dimen/settingslib_expressive_space_medium3"

                android:layout_height="@dimen/settingslib_expressive_space_medium3"

                android:scaleType="centerInside"/>



        </LinearLayout>



        <LinearLayout

            android:id="@+id/text_container"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:paddingHorizontal="@dimen/settingslib_expressive_space_small1"

            android:paddingVertical="@dimen/settingslib_expressive_space_small2"

            android:orientation="vertical">



            <TextView

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

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:hyphenationFrequency="normalFast"

                android:lineBreakWordStyle="phrase"

                android:textAppearance="@style/TextAppearance.CardTitle.SettingsLib"/>



            <TextView

                android:id="@android:id/summary"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:hyphenationFrequency="normalFast"

                android:lineBreakWordStyle="phrase"

                android:textAppearance="@style/TextAppearance.CardSummary.SettingsLib"/>



        </LinearLayout>



        <ImageView

            android:id="@android:id/closeButton"

            android:layout_width="@dimen/settingslib_expressive_space_medium4"

            android:layout_height="@dimen/settingslib_expressive_space_medium4"

            android:padding="@dimen/settingslib_expressive_space_extrasmall4"

            android:layout_gravity="center"

            android:src="@drawable/settingslib_expressive_icon_close"

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



    </LinearLayout>



</com.google.android.material.card.MaterialCardView>
 
 No newline at end of file

packages/SettingsLib/CardPreference/res/values/styles_expressive.xml

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

    <style name="TextAppearance.CardTitle.SettingsLib"

        parent="@style/TextAppearance.PreferenceTitle.SettingsLib">

        <item name="android:textColor">@color/settingslib_materialColorOnPrimary</item>

        <item name="android:textSize">20sp</item>

    </style>



    <style name="TextAppearance.CardSummary.SettingsLib"

        parent="@style/TextAppearance.PreferenceSummary.SettingsLib">

        <item name="android:textColor">@color/settingslib_materialColorOnSecondary</item>

        <item name="android:textSize">14sp</item>

    </style>

</resources>
 
 No newline at end of file