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

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

Merge "Updates messages for hearing devices related page" into main

parents d6006b79 95616807

res/values/strings.xml

+2 −4
Original line number Diff line number Diff line
@@ -5140,8 +5140,6 @@ 
    <string name="accessibility_hearingaid_more_device_summary"><xliff:g id="device_name" example="GN Hearing Aids">%1$s</xliff:g> +1 more</string>

    <!-- Title for the hearing device pairing preference. [CHAR LIMIT=20] -->

    <string name="accessibility_hearing_device_pairing_title">Pair new device</string>

    <!-- Title for accessibility pair new hearing device page footer. [CHAR LIMIT=60] -->

    <string name="accessibility_pair_hearing_device_about_title">About Pair new device</string>

    <!-- Title for the preference category containing the connected hearing device group. [CHAR LIMIT=20]-->

    <string name="accessibility_hearing_device_connected_title">Hearing devices</string>

    <!-- Title for the preference category containing the previously connected hearing device group. [CHAR LIMIT=20]-->
@@ -5156,10 +5154,10 @@ 
    <string name="accessibility_hac_mode_summary">Improves compatibility with telecoils and reduces unwanted noise</string>

    <!-- Title for accessibility hearing device page footer. [CHAR LIMIT=40] -->

    <string name="accessibility_hearing_device_about_title">About hearing devices</string>

    <!-- Description for text in accessibility hearing aids footer. [CHAR LIMIT=NONE] -->

    <string name="accessibility_hearing_device_footer_summary">Make sure your hearing device is turned on and ready to pair. Only ASHA and LE Audio hearing devices show on this page.</string>

    <!-- Title for the pair hearing device page. [CHAR LIMIT=25] -->

    <string name="accessibility_hearing_device_pairing_page_title">Pair hearing device</string>

    <!-- Subtitle for the pair hearing device page. [CHAR LIMIT=NONE] -->

    <string name="accessibility_hearing_device_pairing_intro">You can pair ASHA and LE Audio hearing devices on this page. Make sure your hearing device is turned on and ready to pair.</string>

    <!-- Title for the preference category containing the list of the available hearing during and after bluetooth scanning devices. [CHAR LIMIT=30] -->

    <string name="accessibility_found_hearing_devices">Available hearing devices</string>

    <!-- Title for the preference category containing the all bluetooth devices during and after bluetooth scanning devices. Used when people can not find their hearing device in hearing device pairing list. [CHAR LIMIT=45] -->

res/xml/accessibility_hearing_aids.xml

+0 −7
Original line number Diff line number Diff line
@@ -60,11 +60,4 @@ 
            settings:searchable="true"

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

    </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.HearingDeviceFooterPreferenceController"/>

</PreferenceScreen>
 
 No newline at end of file

res/xml/hearing_device_pairing_detail.xml

+0 −8
Original line number Diff line number Diff line
@@ -32,12 +32,4 @@ 
            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

res/xml/hearing_device_pairing_fragment.xml

+4 −7
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ 
    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/bluetooth_pairing_pref_title">



    <com.android.settingslib.widget.TopIntroPreference

        settings:searchable="false"

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



    <com.android.settings.bluetooth.BluetoothProgressCategory

        android:key="available_hearing_devices"

        android:title="@string/accessibility_found_hearing_devices" />
@@ -35,11 +39,4 @@ 
            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/PairHearingDeviceFooterPreferenceController.java

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
/*

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

 */



package com.android.settings.accessibility;



import android.content.Context;



import com.android.settings.R;



/** Preference controller for footer in pair hearing device page. */

public class PairHearingDeviceFooterPreferenceController extends

        AccessibilityFooterPreferenceController {

    public PairHearingDeviceFooterPreferenceController(Context context,

            String key) {

        super(context, key);

    }



    @Override

    protected String getIntroductionTitle() {

        return mContext.getString(R.string.accessibility_pair_hearing_device_about_title);

    }

}