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

Merge "Update UI for support tab." into nyc-mr1-dev

Browse Source
This commit is contained in:
Fan Zhang
2016-06-30 15:22:02 +00:00
committed by Android (Google) Code Review
parent ebed4797b1 d89d60d9ca
commit 0293fb40f2
8 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -257,18 +257,18 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd
}
private void addMoreHelpItems() {
mSupportData.add(new SupportData.Builder(mActivity, TYPE_SUPPORT_TILE)
.setIcon(R.drawable.ic_help_24dp)
.setText1(R.string.support_help_feedback_title)
.setIntent(mSupportFeatureProvider.getHelpIntent(mActivity))
.setMetricsEvent(MetricsProto.MetricsEvent.ACTION_SUPPORT_HELP_AND_FEEDBACK)
.build());
mSupportData.add(new SupportData.Builder(mActivity, TYPE_SUPPORT_TILE)
.setIcon(R.drawable.ic_lightbulb_outline_24)
.setText1(R.string.support_tips_and_tricks_title)
.setIntent(mSupportFeatureProvider.getTipsAndTricksIntent(mActivity))
.setMetricsEvent(MetricsProto.MetricsEvent.ACTION_SUPPORT_TIPS_AND_TRICKS)
.build());
mSupportData.add(new SupportData.Builder(mActivity, TYPE_SUPPORT_TILE)
.setIcon(R.drawable.ic_help_24dp)
.setText1(R.string.help_feedback_label)
.setIntent(mSupportFeatureProvider.getHelpIntent(mActivity))
.setMetricsEvent(MetricsProto.MetricsEvent.ACTION_SUPPORT_HELP_AND_FEEDBACK)
.build());
}
private void bindEscalationOptions(ViewHolder holder, SupportData data) {

3
src/com/android/settings/support/SupportPhoneDialogFragment.java
View File

@@ -51,12 +51,13 @@ public final class SupportPhoneDialogFragment extends DialogFragment implements
.setTitle(R.string.support_international_phone_title);
final View content = LayoutInflater.from(builder.getContext())
.inflate(R.layout.support_phone_dialog_content, null);
final View phoneNumberContainer = content.findViewById(R.id.phone_number_container);
final TextView phoneView = (TextView) content.findViewById(R.id.phone_number);
final String formattedPhoneNumber = getContext().getString(
R.string.support_phone_international_format,
new Locale(phone.language).getDisplayLanguage(), phone.number);
phoneView.setText(formattedPhoneNumber);
phoneView.setOnClickListener(this);
phoneNumberContainer.setOnClickListener(this);
return builder
.setView(content)
.create();