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

Merge "Adds missing accessibility string for accounts syncing"

Browse Source
This commit is contained in:
Alexandra Gherghina
2014-05-29 16:29:43 +00:00
committed by Android (Google) Code Review
parent 21300597d1 a14cfda8fc
commit ff0f1d8049
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -4211,6 +4211,8 @@
<string name="accessibility_sync_enabled">Sync enabled</string> <string name="accessibility_sync_enabled">Sync enabled</string>
<!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] --> <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
<string name="accessibility_sync_disabled">Sync disabled</string> <string name="accessibility_sync_disabled">Sync disabled</string>
<!-- Content description of the in progress sync icon for accessibility. [CHAR LIMIT=NONE] -->
<string name="accessibility_sync_in_progress">Syncing now</string>
<!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] --> <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
<string name="accessibility_sync_error">Sync error.</string> <string name="accessibility_sync_error">Sync error.</string>
<!-- Image description for the sync failed icon. --> <!-- Image description for the sync failed icon. -->

2
src/com/android/settings/AccountPreference.java
View File

@@ -140,6 +140,8 @@ public class AccountPreference extends Preference {
return getContext().getString(R.string.accessibility_sync_disabled); return getContext().getString(R.string.accessibility_sync_disabled);
case SYNC_ERROR: case SYNC_ERROR:
return getContext().getString(R.string.accessibility_sync_error); return getContext().getString(R.string.accessibility_sync_error);
case SYNC_IN_PROGRESS:
return getContext().getString(R.string.accessibility_sync_in_progress);
default: default:
Log.e(TAG, "Unknown sync status: " + status); Log.e(TAG, "Unknown sync status: " + status);
return getContext().getString(R.string.accessibility_sync_error); return getContext().getString(R.string.accessibility_sync_error);