PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update the exclamation icon can be announced by screen reader" into udc-dev

Browse Source
This commit is contained in:
Jason Hsu
2023-03-17 07:29:02 +00:00
committed by Android (Google) Code Review
parent e959be60a9 7be7ef9ecc
commit fe9c359367
9 changed files with 160 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/values/strings.xml
View File

@@ -132,6 +132,8 @@
<string name="bluetooth_device_controls_summary">Hearing device shortcut, hearing aid compatibility</string>
<!-- Connected devices settings. Title of the preference to show the entrance of the audio output page. It can change different types of audio are played on phone or other bluetooth devices. [CHAR LIMIT=35] -->
<string name="bluetooth_audio_routing_title">Audio output</string>
<!-- Title for bluetooth audio routing page footer. [CHAR LIMIT=30] -->
<string name="bluetooth_audio_routing_about_title">About audio output</string>
<!-- Connected devices settings. Summary of the preference to show the entrance of the audio output page. [CHAR LIMIT=NONE] -->
<string name="bluetooth_audio_routing_summary">Route sounds to your hearing device or phone speaker</string>
<!-- Title for related tools section. This section will list related tools below. [CHAR LIMIT=15] -->
@@ -4630,6 +4632,8 @@
<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]-->
@@ -4642,6 +4646,8 @@
<string name="accessibility_hac_mode_title">Hearing aid compatibility</string>
<!--Summary for the Hearing Aid Compatibility preference in the accessibility page. [CHAR LIMIT=NONE] -->
<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</string>
<!-- Title for the pair hearing device page. [CHAR LIMIT=25] -->
@@ -11914,8 +11920,10 @@
<string name="accessibility_fingerprint_label">Fingerprint sensor</string>
<!-- Accessibility Flash Notification -->
<!-- Title of the Flash Notification entry [CHAR LIMIT=NONE] -->
<!-- Title of the Flash Notification entry [CHAR LIMIT=35] -->
<string name="flash_notifications_title">Flash notifications</string>
<!-- Title for flash notifications page footer. [CHAR LIMIT=45] -->
<string name="flash_notifications_about_title">About flash notifications</string>
<!-- Summary of the Flash Notification preference if all flash alerts are off. [CHAR LIMIT=60] -->
<string name="flash_notifications_summary_off">Off</string>
<!-- Summary of the Flash Notification preference if only camera flash is on. [CHAR LIMIT=60] -->

3
res/xml/accessibility_hearing_aids.xml
View File

@@ -57,5 +57,6 @@
android:key="hearing_device_footer"
android:title="@string/accessibility_hearing_device_footer_summary"
android:selectable="false"
settings:searchable="false" />
settings:searchable="false"
settings:controller="com.android.settings.accessibility.HearingDeviceFooterPreferenceController"/>
</PreferenceScreen>

3
res/xml/bluetooth_audio_routing_fragment.xml
View File

@@ -64,6 +64,7 @@
android:key="hearing_device_footer"
android:title="@string/bluetooth_audio_routing_footer_summary"
android:selectable="false"
settings:searchable="false" />
settings:searchable="false"
settings:controller="com.android.settings.bluetooth.BluetoothDetailsAudioRoutingFooterPreferenceController"/>
</PreferenceScreen>

7
res/xml/flash_notifications_settings.xml
View File

@@ -46,10 +46,11 @@
android:title="@string/flash_notifications_preview"
settings:controller="com.android.settings.accessibility.FlashNotificationsPreviewPreferenceController" />
<com.android.settingslib.widget.FooterPreference
<com.android.settings.accessibility.AccessibilityFooterPreference
android:key="flash_notifications_footer"
android:selectable="false"
android:title="@string/flash_notifications_note"
settings:searchable="false" />
android:selectable="false"
settings:searchable="false"
settings:controller="com.android.settings.accessibility.FlashNotificationsFooterPreferenceController"/>
</PreferenceScreen>

3
res/xml/hearing_device_pairing_detail.xml
View File

@@ -37,6 +37,7 @@
android:key="hearing_device_footer"
android:title="@string/accessibility_hearing_device_footer_summary"
android:selectable="false"
settings:searchable="false" />
settings:searchable="false"
settings:controller="com.android.settings.accessibility.PairHearingDeviceFooterPreferenceController"/>
</PreferenceScreen>

35
src/com/android/settings/accessibility/FlashNotificationsFooterPreferenceController.java Normal file
View File

@@ -0,0 +1,35 @@
/*
* 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 flash notifications page. */
public class FlashNotificationsFooterPreferenceController extends
AccessibilityFooterPreferenceController {
public FlashNotificationsFooterPreferenceController(Context context,
String key) {
super(context, key);
}
@Override
protected String getIntroductionTitle() {
return mContext.getString(R.string.flash_notifications_about_title);
}
}

35
src/com/android/settings/accessibility/HearingDeviceFooterPreferenceController.java Normal file
View File

@@ -0,0 +1,35 @@
/*
* 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 hearing device page. */
public class HearingDeviceFooterPreferenceController extends
AccessibilityFooterPreferenceController {
public HearingDeviceFooterPreferenceController(Context context,
String key) {
super(context, key);
}
@Override
protected String getIntroductionTitle() {
return mContext.getString(R.string.accessibility_hearing_device_about_title);
}
}

35
src/com/android/settings/accessibility/PairHearingDeviceFooterPreferenceController.java Normal file
View File

@@ -0,0 +1,35 @@
/*
* 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);
}
}

36
src/com/android/settings/bluetooth/BluetoothDetailsAudioRoutingFooterPreferenceController.java Normal file
View File

@@ -0,0 +1,36 @@
/*
* 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.bluetooth;
import android.content.Context;
import com.android.settings.R;
import com.android.settings.accessibility.AccessibilityFooterPreferenceController;
/** Preference controller for footer in bluetooth details audio routing page. */
public class BluetoothDetailsAudioRoutingFooterPreferenceController extends
AccessibilityFooterPreferenceController {
public BluetoothDetailsAudioRoutingFooterPreferenceController(Context context,
String key) {
super(context, key);
}
@Override
protected String getIntroductionTitle() {
return mContext.getString(R.string.bluetooth_audio_routing_about_title);
}
}