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

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

Merge changes from topic "ha-new-pairing" into main 

* changes:
  New hearing device pairing page (2/2): MFi devices
  New hearing device pairing page (1/2)
parents 76a783b5 5cb00f66

aconfig/settings_accessibility_flag_declarations_legacy.aconfig

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ flag { 
flag {

    name: "new_hearing_device_pairing_page"

    namespace: "accessibility"

    description: "New hearing device pairing page with deny list method"

    description: "New hearing device pairing page with extra MFi+ASHA filtering"

    bug: "307473972"

}

res/layout/arrow_preference.xml

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

<!--

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

-->

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

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

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

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

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

    android:paddingVertical="@dimen/settingslib_switchbar_margin"

    android:background="@android:color/transparent">



    <LinearLayout

        android:id="@+id/background"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:paddingStart="@dimen/settingslib_switchbar_padding_left"

        android:paddingEnd="@dimen/settingslib_switchbar_padding_right"

        android:background="@drawable/settingslib_switch_bar_bg_on"

        android:orientation="horizontal">



        <TextView

            android:id="@android:id/title"

            android:layout_height="wrap_content"

            android:layout_width="0dp"

            android:layout_gravity="start|center_vertical"

            android:layout_weight="1"

            android:paddingVertical="@dimen/settingslib_switch_title_margin"

            android:ellipsize="end"

            android:textAppearance="?android:attr/textAppearanceListItem"

            android:hyphenationFrequency="normalFast"

            android:lineBreakWordStyle="phrase"

            style="@style/MainSwitchText.Settingslib"/>



        <ImageView

            android:layout_width="24dp"

            android:layout_height="24dp"

            android:layout_gravity="center_vertical"

            android:contentDescription="@null"

            android:src="@drawable/ic_arrow_forward"/>



    </LinearLayout>

</FrameLayout>

res/xml/accessibility_hearing_aids.xml

+1 −2
Original line number Diff line number Diff line
@@ -28,11 +28,10 @@ 
        settings:controller="com.android.settings.accessibility.AvailableHearingDevicePreferenceController"/>



    <com.android.settingslib.RestrictedPreference

        android:key="add_bt_devices"

        android:key="hearing_device_add_bt_devices"

        android:title="@string/bluetooth_pairing_pref_title"

        android:icon="@drawable/ic_add_24dp"

        android:summary="@string/connected_device_add_device_summary"

        android:fragment="com.android.settings.accessibility.HearingDevicePairingDetail"

        settings:userRestriction="no_config_bluetooth"

        settings:useAdminDisabledSummary="true"

        settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"/>

res/xml/hearing_device_pairing_fragment.xml

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

<!--

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

-->



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

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

    android:title="@string/bluetooth_pairing_pref_title">



    <com.android.settings.bluetooth.BluetoothProgressCategory

        android:key="available_hearing_devices"

        android:title="@string/accessibility_found_hearing_devices" />



    <PreferenceCategory

        android:key="more_devices_category"

        android:title="@string/accessibility_found_all_devices">

        <com.android.settings.accessibility.ArrowPreference

            android:key="more_devices"

            android:title="@string/accessibility_list_all_devices_title"

            settings:searchable="false"

            settings:userRestriction="no_config_bluetooth"

            settings:useAdminDisabledSummary="true"

            settings:controller="com.android.settings.accessibility.ViewAllBluetoothDevicesPreferenceController"/>

    </PreferenceCategory>



    <com.android.settings.accessibility.AccessibilityFooterPreference

        android:key="hearing_device_footer"

        android:title="@string/accessibility_hearing_device_footer_summary"

        android:selectable="false"

        settings:searchable="false"

        settings:controller="com.android.settings.accessibility.PairHearingDeviceFooterPreferenceController"/>



</PreferenceScreen>
 
 No newline at end of file

src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@ import com.android.settingslib.search.SearchIndexable; 
/** Accessibility settings for hearing aids. */

@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)

public class AccessibilityHearingAidsFragment extends AccessibilityShortcutPreferenceFragment {



    private static final String TAG = "AccessibilityHearingAidsFragment";

    private static final String KEY_HEARING_OPTIONS_CATEGORY = "hearing_options_category";

    public static final String KEY_HEARING_DEVICE_ADD_BT_DEVICES = "hearing_device_add_bt_devices";

    private static final int SHORTCUT_PREFERENCE_IN_CATEGORY_INDEX = 20;

    private String mFeatureName;