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

Commit dd1064d1 authored by David Liu's avatar David Liu
Browse files

[Settingslib] Update SettingsSpinner with expressive styles 

- Support Large and Full-width spinner styles
- Update expressive styles

Bug: 394697765, 396786547
Test: manul
Flag: com.android.settingslib.widget.theme.flags.is_expressive_design_enabled
Change-Id: I5ce72d2551c998d56ae996765cb1683f9ca3f39f
parent 01883486

packages/SettingsLib/SettingsSpinner/res/layout-v33/settings_spinner_view.xml

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
<TextView

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

    android:id="@android:id/text1"

    android:layout_centerVertical="true"

    android:gravity="center_vertical"

    style="@style/SettingsSpinnerTitleBar"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"/>

packages/SettingsLib/SettingsSpinner/res/layout-v36/settings_expressive_spinner_preference_full.xml

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

<!--

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

-->

<RelativeLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

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

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

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

    android:filterTouchesWhenObscured="true">

    <Spinner

        android:id="@+id/spinner"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_centerVertical="true"/>

</RelativeLayout>

packages/SettingsLib/SettingsSpinner/res/layout-v36/settings_expressive_spinner_view_full.xml

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

<!--

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

-->

<TextView

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

    android:id="@android:id/text1"

    android:layout_centerVertical="true"

    android:gravity="center_vertical"

    style="@style/SettingsSpinnerTitleBar.Expressive.Large"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:filterTouchesWhenObscured="true"/>

packages/SettingsLib/SettingsSpinner/res/layout-v36/settings_expressive_spinner_view_large.xml

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

<!--

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

-->

<TextView

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

    android:id="@android:id/text1"

    android:layout_centerVertical="true"

    android:gravity="center_vertical"

    style="@style/SettingsSpinnerTitleBar.Expressive.Large"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:filterTouchesWhenObscured="true"/>

packages/SettingsLib/SettingsSpinner/res/layout-v36/settings_expressvie_spinner_dropdown_view.xml

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

<!--

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

-->

<TextView

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

    android:id="@android:id/text1"

    style="@style/SettingsSpinnerDropdown.Expressive"

    android:gravity="center_vertical"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:filterTouchesWhenObscured="true"/>