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

Commit 62f02f7b authored by Edgar Wang's avatar Edgar Wang
Browse files

[Expressive design] create expressive design theme 

Bug: 366336385
Bug: 366337788
Test: manual
Flag: EXEMPT resource only update
Change-Id: I0ed6f62fd9d6d7caf9ab8b86e5d7e4183cc67b5a
parent eff4dad4

packages/SettingsLib/SettingsTheme/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -15,7 +15,10 @@ android_library { 
        "src/**/*.kt",

    ],

    resource_dirs: ["res"],

    static_libs: ["androidx.preference_preference"],

    static_libs: [

        "androidx.preference_preference",

        "com.google.android.material_material",

    ],

    sdk_version: "system_current",

    min_sdk_version: "21",

    apex_available: [

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

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

  -->



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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="960"

    android:viewportHeight="960"

    android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M382,720L154,492L211,435L382,606L749,239L806,296L382,720Z"/>

</vector>
 
 No newline at end of file

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

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

  -->



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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="960"

    android:viewportHeight="960"

    android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M256,760L200,704L424,480L200,256L256,200L480,424L704,200L760,256L536,480L760,704L704,760L480,536L256,760Z"/>

</vector>
 
 No newline at end of file

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

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

  -->



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

    <item android:state_checked="true" android:drawable="@drawable/settingslib_expressive_icon_check"/>

    <item android:state_checked="false" android:drawable="@drawable/settingslib_expressive_icon_close"/>

</selector>
 
 No newline at end of file

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

0 → 100644
+44 −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:gravity="center_vertical"

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