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

Merge \"Show operation hours for selected country\'s support phone\" into nyc-mr1-dev

Browse Source 
am: ab7a6cf828

Change-Id: I325c9dcb1469855d3273e42457ee0e0f3d62d8fa
This commit is contained in:
Fan Zhang
2016-06-28 18:13:20 +00:00
committed by android-build-merger
parent 45eb3c04b5 ab7a6cf828
commit 2768793840
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,8 +177,8 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd
}
private void addEscalationCards() {
if (mSupportFeatureProvider.isAlwaysOperating(PHONE)
|| mSupportFeatureProvider.isAlwaysOperating(CHAT)) {
if (mSupportFeatureProvider.isAlwaysOperating(PHONE, null /* countryCode */)
|| mSupportFeatureProvider.isAlwaysOperating(CHAT, null /* countryCode */)) {
mSupportData.add(new SupportData.Builder(mActivity, TYPE_TITLE)
.setText1(R.string.support_escalation_24_7_title)
.setText2(mActivity.getString(R.string.support_escalation_24_7_summary))
@@ -192,7 +192,7 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd
} else {
mSupportData.add(new SupportData.Builder(mActivity, TYPE_TITLE)
.setText1(R.string.support_escalation_closed_title)
.setText2(mSupportFeatureProvider.getOperationHours(mActivity, PHONE))
.setText2(mSupportFeatureProvider.getOperationHours(mActivity, PHONE, null))
.build());
}
final SupportData.Builder builder =
@@ -211,9 +211,16 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd
}
private void addOfflineEscalationCards() {
final CharSequence operatingHours;
if (mSupportFeatureProvider.isAlwaysOperating(PHONE, mSelectedCountry)) {
operatingHours = mActivity.getString(R.string.support_escalation_24_7_summary);
} else {
operatingHours = mSupportFeatureProvider.getOperationHours(mActivity,
PHONE, mSelectedCountry);
}
mSupportData.add(new SupportData.Builder(mActivity, TYPE_TITLE)
.setText1(R.string.support_offline_title)
.setText2(R.string.support_offline_summary)
.setText2(operatingHours)
.build());
final OfflineSupportData.Builder builder = new OfflineSupportData.Builder(mActivity);
builder.setCountries(mSupportFeatureProvider.getPhoneSupportCountries())