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

Merge "Updated the Contacts Storage Settings' bottom line text." into main

Browse Source
This commit is contained in:
Liefu Liu
2025-02-05 15:06:42 -08:00
committed by Android (Google) Code Review
parent c47c644696 b197bfe8f2
commit ce463e4142
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -14090,7 +14090,7 @@
<!-- Text for "device only" preference label in Contacts Storage Settings [CHAR LIMIT=34] --> <!-- Text for "device only" preference label in Contacts Storage Settings [CHAR LIMIT=34] -->
<string name="contacts_storage_device_only_preference_label">Device only</string> <string name="contacts_storage_device_only_preference_label">Device only</string>
<!-- Text for "device only" preference summary in Contacts Storage Settings [CHAR LIMIT=NONE] --> <!-- Text for "device only" preference summary in Contacts Storage Settings [CHAR LIMIT=NONE] -->
<string name="contacts_storage_device_only_preference_summary">New contacts won\'t be synced with an account</string> <string name="contacts_storage_device_only_preference_summary">Contacts may not sync or be available on your other devices</string>
<!-- Text for explaining the selection in Contacts Storage Settings [CHAR LIMIT=NONE] --> <!-- Text for explaining the selection in Contacts Storage Settings [CHAR LIMIT=NONE] -->
<string name="contacts_storage_selection_message">Contacts will be saved to your device and synced to your account by default</string> <string name="contacts_storage_selection_message">Contacts will be saved to your device and synced to your account by default</string>
<!-- Text for error toast when there's error setting the default account in Contacts Storage Settings [CHAR LIMIT=NONE] --> <!-- Text for error toast when there's error setting the default account in Contacts Storage Settings [CHAR LIMIT=NONE] -->

2
tests/robotests/src/com/android/settings/applications/contacts/ContactsStorageSettingsTest.java
View File

@@ -155,7 +155,7 @@ public class ContactsStorageSettingsTest {
assertThat(deviceOnlyPreference.getTitle()).isEqualTo("Device only"); assertThat(deviceOnlyPreference.getTitle()).isEqualTo("Device only");
assertThat(deviceOnlyPreference.getSummary()).isEqualTo( assertThat(deviceOnlyPreference.getSummary()).isEqualTo(
"New contacts won't be synced with an account"); "Contacts may not sync or be available on your other devices");
assertThat(deviceOnlyPreference.getOrder()).isEqualTo(999); assertThat(deviceOnlyPreference.getOrder()).isEqualTo(999);
assertThat(mContactsStorageSettings.findPreference( assertThat(mContactsStorageSettings.findPreference(
PREF_KEY_ACCOUNT_CATEGORY).getTitle()).isEqualTo("Where to save contacts"); PREF_KEY_ACCOUNT_CATEGORY).getTitle()).isEqualTo("Where to save contacts");