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

Commit ad4b8690 authored by jasonwshsu's avatar jasonwshsu
Browse files

Update spinner style for preset info 

* Custom view and drop down view to have preset title
* Move drop down view vertical location to below spinner
* Expand drop down view width to align with spinner
* Add missing preset update when active device changed
* Other UI details fine-tuning

Bug: 336662602
Test: check UI
Flag: EXEMPT resource only update

Change-Id: I0a68e43f6f78195604eb5e7b91eaf8b8427c9a13
parent 8eb3c0f4

packages/SystemUI/res/drawable/hearing_devices_preset_spinner_background.xml

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
        android:end="20dp"

        android:gravity="end|center_vertical">

        <vector

            android:width="@dimen/screenrecord_spinner_arrow_size"

            android:height="@dimen/screenrecord_spinner_arrow_size"

            android:width="@dimen/hearing_devices_preset_spinner_arrow_size"

            android:height="@dimen/hearing_devices_preset_spinner_arrow_size"

            android:viewportWidth="24"

            android:viewportHeight="24"

            android:tint="?androidprv:attr/colorControlNormal">

packages/SystemUI/res/layout/hearing_devices_preset_dropdown_item.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

    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.

-->



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

    android:id="@+id/hearing_devices_preset_option_text"

    style="?android:attr/spinnerDropDownItemStyle"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="@dimen/hearing_devices_preset_spinner_height"

    android:paddingStart="@dimen/hearing_devices_preset_spinner_text_padding_start"

    android:gravity="center_vertical"

    android:ellipsize="end" />
 
 No newline at end of file

packages/SystemUI/res/layout/hearing_devices_preset_spinner_selected.xml

0 → 100644
+46 −0
Original line number Diff line number Diff line 
<!--

    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="@dimen/hearing_devices_preset_spinner_height"

    android:paddingStart="@dimen/hearing_devices_preset_spinner_text_padding_start"

    android:paddingTop="@dimen/hearing_devices_preset_spinner_text_padding_vertical"

    android:paddingBottom="@dimen/hearing_devices_preset_spinner_text_padding_vertical"

    android:orientation="vertical">

    <TextView

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:textAppearance="@style/TextAppearance.Dialog.Title"

        android:lineSpacingExtra="6dp"

        android:text="@string/hearing_devices_preset_label"

        android:fontFamily="@*android:string/config_headlineFontFamilyMedium"

        android:textSize="14sp"

        android:gravity="center_vertical"

        android:layout_weight="1" />

    <TextView

        android:id="@+id/hearing_devices_preset_option_text"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:textAppearance="@style/TextAppearance.Dialog.Body"

        android:lineSpacingExtra="6dp"

        android:gravity="center_vertical"

        android:ellipsize="end"

        android:maxLines="1"

        android:layout_weight="1" />

</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/hearing_devices_tile_dialog.xml

+9 −4
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
<androidx.constraintlayout.widget.ConstraintLayout

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

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

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

    android:id="@+id/root"

    style="@style/Widget.SliceView.Panel"

    android:layout_width="wrap_content"
@@ -36,16 +35,22 @@ 
        android:id="@+id/preset_spinner"

        style="@style/BluetoothTileDialog.Device"

        android:layout_width="match_parent"

        android:layout_height="@dimen/hearing_devices_preset_spinner_height"

        android:layout_marginTop="@dimen/hearing_devices_preset_spinner_margin"

        android:layout_marginBottom="@dimen/hearing_devices_preset_spinner_margin"

        android:layout_height="wrap_content"

        android:minHeight="@dimen/hearing_devices_preset_spinner_height"

        android:layout_marginTop="@dimen/hearing_devices_layout_margin"

        android:layout_marginBottom="@dimen/hearing_devices_layout_margin"

        android:gravity="center_vertical"

        android:background="@drawable/hearing_devices_preset_spinner_background"

        android:popupBackground="@drawable/hearing_devices_preset_spinner_popup_background"

        android:dropDownVerticalOffset="@dimen/hearing_devices_preset_spinner_height"

        android:dropDownWidth="match_parent"

        android:paddingStart="0dp"

        android:paddingEnd="0dp"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toBottomOf="@id/device_list"

        app:layout_constraintBottom_toTopOf="@id/pair_new_device_button"

        android:longClickable="false"

        android:visibility="gone"/>



    <androidx.constraintlayout.widget.Barrier

packages/SystemUI/res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -1768,10 +1768,10 @@ 
    <dimen name="bluetooth_dialog_scroll_view_min_height_with_auto_on">350dp</dimen>



    <!-- Hearing devices dialog related dimensions -->

    <dimen name="hearing_devices_layout_margin">12dp</dimen>

    <dimen name="hearing_devices_preset_spinner_height">72dp</dimen>

    <dimen name="hearing_devices_preset_spinner_margin">24dp</dimen>

    <dimen name="hearing_devices_preset_spinner_text_padding_start">20dp</dimen>

    <dimen name="hearing_devices_preset_spinner_text_padding_end">80dp</dimen>

    <dimen name="hearing_devices_preset_spinner_text_padding_vertical">15dp</dimen>

    <dimen name="hearing_devices_preset_spinner_arrow_size">24dp</dimen>

    <dimen name="hearing_devices_preset_spinner_background_radius">28dp</dimen>