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

Commit 154cf271 authored by David Liu's avatar David Liu Committed by Android (Google) Code Review
Browse files

Merge "[Expressive design] Update DropDownPreference style" into main

parents d39494ee fe9a56c8
Loading
Loading
Loading
Loading
+56 −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.
  -->

<!-- We use a FrameLayout as we want to place the invisible spinner on top of the other views -->
<FrameLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content">
    <!-- This spinner should be invisible in the layout and take up no space, when the Preference
         is clicked the dropdown will appear from this location on screen. -->
    <Spinner
        android:id="@+id/spinner"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/settingslib_expressive_space_large3"
        android:layout_marginLeft="@dimen/settingslib_expressive_space_large3"
        android:visibility="invisible" />

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:minHeight="@dimen/settingslib_expressive_space_large3"
        android:gravity="center_vertical"
        android:clipToPadding="false"
        android:baselineAligned="false"
        android:filterTouchesWhenObscured="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>
</FrameLayout>
 No newline at end of file
+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@
    </style>

    <style name="SettingsLibPreference.DropDown.Expressive">
        <item name="layout">@layout/settingslib_expressive_preference_dropdown</item>
    </style>

    <style name="SettingsLibPreference.SwitchPreference.Expressive"/>