diff --git a/res/values/strings.xml b/res/values/strings.xml index 46b7e868321..46c8f8cbe94 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5140,8 +5140,6 @@ %1$s +1 more Pair new device - - About Pair new device Hearing devices @@ -5156,10 +5154,10 @@ Improves compatibility with telecoils and reduces unwanted noise About hearing devices - - Make sure your hearing device is turned on and ready to pair. Only ASHA and LE Audio hearing devices show on this page. Pair hearing device + + You can pair ASHA and LE Audio hearing devices on this page. Make sure your hearing device is turned on and ready to pair. Available hearing devices diff --git a/res/xml/accessibility_hearing_aids.xml b/res/xml/accessibility_hearing_aids.xml index 57a0fe27819..27a421273cc 100644 --- a/res/xml/accessibility_hearing_aids.xml +++ b/res/xml/accessibility_hearing_aids.xml @@ -60,11 +60,4 @@ settings:searchable="true" settings:controller="com.android.settings.accessibility.HearingAidCompatibilityPreferenceController"/> - - \ No newline at end of file diff --git a/res/xml/hearing_device_pairing_detail.xml b/res/xml/hearing_device_pairing_detail.xml index 0ccd000a4a3..0526eb3153a 100644 --- a/res/xml/hearing_device_pairing_detail.xml +++ b/res/xml/hearing_device_pairing_detail.xml @@ -32,12 +32,4 @@ settings:useAdminDisabledSummary="true" settings:controller="com.android.settings.accessibility.ViewAllBluetoothDevicesPreferenceController"/> - - - \ No newline at end of file diff --git a/res/xml/hearing_device_pairing_fragment.xml b/res/xml/hearing_device_pairing_fragment.xml index 1ccc1dd77c4..ce7f39f8df5 100644 --- a/res/xml/hearing_device_pairing_fragment.xml +++ b/res/xml/hearing_device_pairing_fragment.xml @@ -19,6 +19,10 @@ xmlns:settings="http://schemas.android.com/apk/res-auto" android:title="@string/bluetooth_pairing_pref_title"> + + @@ -35,11 +39,4 @@ settings:controller="com.android.settings.accessibility.ViewAllBluetoothDevicesPreferenceController"/> - - \ No newline at end of file diff --git a/src/com/android/settings/accessibility/PairHearingDeviceFooterPreferenceController.java b/src/com/android/settings/accessibility/PairHearingDeviceFooterPreferenceController.java deleted file mode 100644 index 09396ffd50d..00000000000 --- a/src/com/android/settings/accessibility/PairHearingDeviceFooterPreferenceController.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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); - } -}