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

Fix strings for support tab.

Browse Source 
Bug: 29105266

- Fix typos in string and comments
- Use 2 different strings for off-hour and off-line cases.

Change-Id: I63859605ff7185d5f8cc66fd31b56f1d09ed11aa
This commit is contained in:
Fan Zhang
2016-07-06 17:07:37 -07:00
parent 071f62954d
commit 4178710f3d
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/values/strings.xml
View File

@@ -7516,7 +7516,10 @@
<string name="support_escalation_24_7_summary">Our support team is available all day, every day</string> <string name="support_escalation_24_7_summary">Our support team is available all day, every day</string>
<!-- Summary text when customer support is closed. [CHAR LIMIT=NONE]--> <!-- Summary text when customer support is closed. [CHAR LIMIT=NONE]-->
<string name="support_escalation_closed_summary">Phone support hours (local time)&lt;br&gt;&lt;b&gt;<xliff:g id="operation_hours">%s</xliff:g>&lt;/b&gt;</string> <string name="support_escalation_closed_summary">Search help or come back during support hours (local time):&lt;br&gt;&lt;b&gt;<xliff:g id="operation_hours">%s</xliff:g>&lt;/b&gt;</string>
<!-- Summary text to call customer support when there is no internet. [CHAR LIMIT=NONE]-->
<string name="support_escalation_no_internet_summary">Phone support hours (local time)&lt;br&gt;&lt;b&gt;<xliff:g id="operation_hours">%s</xliff:g>&lt;/b&gt;</string>
<!-- Summary text when customer support is unavailable in the region. [CHAR LIMIT=NONE]--> <!-- Summary text when customer support is unavailable in the region. [CHAR LIMIT=NONE]-->
<string name="support_escalation_unavailable_summary">Search help or explore tips &amp; tricks</string> <string name="support_escalation_unavailable_summary">Search help or explore tips &amp; tricks</string>
@@ -7538,7 +7541,7 @@
</string> </string>
<!-- Title text for a list of international support phone numbers. [CHAR LIMIT=60]--> <!-- Title text for a list of international support phone numbers. [CHAR LIMIT=60]-->
<string name="support_international_phone_title">Traveling aboard?</string> <string name="support_international_phone_title">Traveling abroad?</string>
<!-- Description text warning international phone charge may apply when dialing support numbers. [CHAR LIMIT=NONE]--> <!-- Description text warning international phone charge may apply when dialing support numbers. [CHAR LIMIT=NONE]-->
<string name="support_international_phone_summary">International charges may apply</string> <string name="support_international_phone_summary">International charges may apply</string>

7
src/com/android/settings/dashboard/SupportItemAdapter.java
View File

@@ -198,10 +198,11 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd
builder.setTileTitle(R.string.support_escalation_title) builder.setTileTitle(R.string.support_escalation_title)
.setTileSummary(R.string.support_escalation_summary); .setTileSummary(R.string.support_escalation_summary);
} else { } else {
// Support is not temporarily unavailable. // Support is now temporarily unavailable.
builder.setTileTitle(R.string.support_escalation_title) builder.setTileTitle(R.string.support_escalation_title)
.setTileSummary( .setTileSummary(
mSupportFeatureProvider.getOperationHours(mActivity, PHONE, null)); mSupportFeatureProvider.getOperationHours(mActivity, PHONE, null,
true /* hasInternet */));
} }
if (hasPhoneOperation) { if (hasPhoneOperation) {
builder.setText1(R.string.support_escalation_by_phone) builder.setText1(R.string.support_escalation_by_phone)
@@ -222,7 +223,7 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd
operatingHours = mActivity.getString(R.string.support_escalation_24_7_summary); operatingHours = mActivity.getString(R.string.support_escalation_24_7_summary);
} else { } else {
operatingHours = mSupportFeatureProvider.getOperationHours(mActivity, operatingHours = mSupportFeatureProvider.getOperationHours(mActivity,
PHONE, mSelectedCountry); PHONE, mSelectedCountry, false /* hasInternet */);
} }
mSupportData.add(new OfflineEscalationData.Builder(mActivity) mSupportData.add(new OfflineEscalationData.Builder(mActivity)
.setCountries(mSupportFeatureProvider.getPhoneSupportCountries()) .setCountries(mSupportFeatureProvider.getPhoneSupportCountries())

3
src/com/android/settings/overlay/SupportFeatureProvider.java
View File

@@ -71,7 +71,8 @@ public interface SupportFeatureProvider {
* Returns localized string for operation hours in specified country. If country is null, use * Returns localized string for operation hours in specified country. If country is null, use
* current country to figure out operation hours. * current country to figure out operation hours.
*/ */
CharSequence getOperationHours(Context context, @SupportType int type, String countryCode); CharSequence getOperationHours(Context context, @SupportType int type, String countryCode,
boolean hasInternet);
/** /**
* Returns a localized string indicating estimated wait time for a support time. * Returns a localized string indicating estimated wait time for a support time.