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

Commit f25e56ae authored by Edgar Wang's avatar Edgar Wang
Browse files

[Expressive design] Add BulletPreference 

Bug: 367264817
Test: manual
Flag: EXEMPT resource only update

Change-Id: Ieebcb8d947395936a785474762c23c3464138058
parent 68bbab50

packages/SettingsLib/Android.bp

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

        "SettingsLibBarChartPreference",

        "SettingsLibButtonPreference",

        "SettingsLibBulletPreference",

        "SettingsLibCollapsingToolbarBaseActivity",

        "SettingsLibDeviceStateRotationLock",

        "SettingsLibDisplayUtils",

packages/SettingsLib/BulletPreference/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: "SettingsLibBulletPreference",

    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/BulletPreference/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.bullet">



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



</manifest>

packages/SettingsLib/BulletPreference/res/layout/settingslib_expressive_bullet_icon_frame.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.

  -->



<LinearLayout

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

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

    android:id="@+id/icon_frame"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:minWidth="@dimen/settingslib_expressive_space_medium4"

    android:gravity="top|start"

    android:layout_marginTop="@dimen/settingslib_expressive_space_small1"

    android:paddingStart="@dimen/settingslib_expressive_space_extrasmall4"

    android:paddingEnd="@dimen/settingslib_expressive_space_small1">



    <androidx.preference.internal.PreferenceImageView

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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        app:maxWidth="@dimen/settingslib_expressive_space_small4"

        app:maxHeight="@dimen/settingslib_expressive_space_small4"/>



</LinearLayout>
 
 No newline at end of file

packages/SettingsLib/BulletPreference/res/layout/settingslib_expressive_bullet_preference.xml

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

  -->



<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

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

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

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

    android:clipToPadding="false"

    android:baselineAligned="false">



    <include layout="@layout/settingslib_expressive_bullet_icon_frame"/>



    <include layout="@layout/settingslib_expressive_preference_text_frame"/>



    <!-- Preference should place its actual preference widget here. -->

    <LinearLayout

        android:id="@android:id/widget_frame"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:gravity="end|center_vertical"

        android:paddingStart="@dimen/settingslib_expressive_space_small1"

        android:paddingEnd="0dp"

        android:orientation="vertical"/>



</LinearLayout>
 
 No newline at end of file