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

Commit 89fb94fa authored by Angela Wang's avatar Angela Wang Committed by Android (Google) Code Review
Browse files

Merge changes from topic "separated-preset-in-settings" into main 

* changes:
  Refactor: Move hearing device spinner related codes into SettingsLib
  Preset: Separated preset control UI in hearing device dialog
parents 349a3384 1dd923a0

packages/SystemUI/res/drawable/hearing_devices_spinner_background.xml→packages/SettingsLib/res/drawable/hearing_devices_spinner_background.xml

+2 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!--

    Copyright (C) 2024 The Android Open Source Project

packages/SystemUI/res/drawable/hearing_devices_spinner_popup_background.xml→packages/SettingsLib/res/drawable/hearing_devices_spinner_popup_background.xml

+1 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!--

    Copyright (C) 2024 The Android Open Source Project

packages/SystemUI/res/drawable/hearing_devices_spinner_selected_background.xml→packages/SettingsLib/res/drawable/hearing_devices_spinner_selected_background.xml

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
    See the License for the specific language governing permissions and

    limitations under the License.

-->



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

    android:drawable="@drawable/settingslib_switch_bar_bg_on"

    android:insetLeft="11dp"

packages/SettingsLib/res/drawable/hearing_devices_spinner_unselected_background.xml

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

-->



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

    android:color="?android:attr/colorControlHighlight">

    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

            <solid android:color="@android:color/white"/>

            <corners android:radius="@dimen/settingslib_switch_bar_radius"/>

        </shape>

    </item>

</ripple>
 
 No newline at end of file

packages/SettingsLib/res/drawable/ic_check.xml

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

<!--

    Copyright 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.

-->



<vector

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

    android:width="24dp"

    android:height="24dp"

    android:viewportHeight="24"

    android:viewportWidth="24">

    <path

        android:pathData="M0 0h24v24H0z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"/>

</vector>
 
 No newline at end of file