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

Update UI for support tab.

Browse Source 
Bug: 29397123
Bug: 29832054

- Increase spinner dropdown width to contain country names.
- Reduce suggestion counter's right padding.
- Tweak paddings in travel abroad phone dialog.
- Update icon and text for help&feedback / tips&tricks.

Change-Id: Ide52c6f8198d1a13a0fdeb000d7cb9e8c03688ca
This commit is contained in:
Fan Zhang
2016-06-29 08:53:30 -07:00
parent 734c550c59
commit d89d60d9ca
8 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
res/drawable/ic_help_24dp.xml
View File

@@ -21,12 +21,11 @@
android:height="24dp" android:height="24dp"
android:viewportWidth="24.0" android:viewportWidth="24.0"
android:viewportHeight="24.0" android:viewportHeight="24.0"
android:tint="?android:attr/colorControlNormal"> android:tint="?android:attr/colorAccent">
<path <path
android:fillColor="#FFFFFFFF" android:fillColor="#FF000000"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 android:pathData="M20,19.59V8l-6,-6H6c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2
10,-10S17.52,2 12,2zm1,17h-2v-2h2v2zm2.07,-7.75l-0.9,0.92C13.45,12.9 13,13.5 1.99,2H18c0.45,0 0.85,-0.15 1.19,-0.4l-4.43,-4.43c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0
13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L20,19.59zM9,13c0,1.66
0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2H8c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 1.34,3 3,3s3,-1.34 3,-3 -1.34,-3 -3,-3 -3,1.34 -3,3z"/>
-0.36,1.68 -0.93,2.25z"/>
</vector> </vector>

2
res/drawable/ic_lightbulb_outline_24.xml
View File

@@ -20,7 +20,7 @@
android:height="24dp" android:height="24dp"
android:viewportWidth="24.0" android:viewportWidth="24.0"
android:viewportHeight="24.0" android:viewportHeight="24.0"
android:tint="?android:attr/colorControlNormal"> android:tint="?android:attr/colorAccent">
<path <path
android:fillColor="#FF000000" android:fillColor="#FF000000"
android:pathData="M9,21c0,0.55 0.45,1 1,1h4c0.55,0 1,-0.45 1,-1v-1L9,20v1zM12,2C8.14,2 android:pathData="M9,21c0,0.55 0.45,1 1,1h4c0.55,0 1,-0.45 1,-1v-1L9,20v1zM12,2C8.14,2

2
res/layout/suggestion_header.xml
View File

@@ -46,7 +46,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="end" android:gravity="end"
android:paddingEnd="20dp" android:paddingEnd="18dp"
android:textAppearance="@style/TextAppearance.SuggestionTitle" android:textAppearance="@style/TextAppearance.SuggestionTitle"
android:textColor="?android:attr/colorAccent"/> android:textColor="?android:attr/colorAccent"/>
</LinearLayout> </LinearLayout>

3
res/layout/support_offline_escalation_options.xml
View File

@@ -37,7 +37,8 @@
<Spinner <Spinner
android:id="@+id/spinner" android:id="@+id/spinner"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"
android:dropDownWidth="196dp"/>
</LinearLayout> </LinearLayout>
<Button <Button
android:id="@android:id/text1" android:id="@android:id/text1"

25
res/layout/support_phone_dialog_content.xml
View File

@@ -18,20 +18,33 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:padding="24dp"> android:paddingStart="24dp"
android:paddingEnd="24dp"
android:paddingTop="12dp"
android:paddingBottom="12dp">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="16dp" android:paddingBottom="16dp"
android:text="@string/support_international_phone_summary"/> android:text="@string/support_international_phone_summary"/>
<TextView <LinearLayout
android:id="@+id/phone_number" android:id="@+id/phone_number_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:drawableLeft="@drawable/ic_call_24dp"
android:drawablePadding="16dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="48dp" android:minHeight="48dp"
android:textAppearance="@style/TextAppearance.TileTitle"/> android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingEnd="32dp"
android:src="@drawable/ic_call_24dp"/>
<TextView
android:id="@+id/phone_number"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:textAppearance="@style/TextAppearance.TileTitle"/>
</LinearLayout>
</LinearLayout> </LinearLayout>

11
res/values/strings.xml
View File

@@ -7508,15 +7508,15 @@
<string name="support_escalation_24_7_title">We\'re here for you 24/7</string> <string name="support_escalation_24_7_title">We\'re here for you 24/7</string>
<!-- Summary text for connecting to customer support [CHAR LIMIT=NONE]--> <!-- Summary text for connecting to customer support [CHAR LIMIT=NONE]-->
<string name="support_escalation_summary">Our support team is here to address any issues</string> <string name="support_escalation_summary">Our support team is here to help address any issues</string>
<!-- Summary text for connecting to 24/7 customer support [CHAR LIMIT=NONE]--> <!-- Summary text for connecting to 24/7 customer support [CHAR LIMIT=NONE]-->
<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">Call us during 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">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 unavailble 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>
<!-- Template for formatting support hours eg Mon - Fri, 8:00 AM - 19:30 PM. [CHAR LIMIT=NONE]--> <!-- Template for formatting support hours eg Mon - Fri, 8:00 AM - 19:30 PM. [CHAR LIMIT=NONE]-->
@@ -7551,7 +7551,10 @@
<string name="support_escalation_by_chat">Chat</string> <string name="support_escalation_by_chat">Chat</string>
<!-- Button label for visiting the tips & tricks site [CHAR LIMIT=60]--> <!-- Button label for visiting the tips & tricks site [CHAR LIMIT=60]-->
<string name="support_tips_and_tricks_title">Tips &amp; tricks</string> <string name="support_tips_and_tricks_title">Explore tips &amp; tricks</string>
<!-- Button label for visiting help and/or send feedback [CHAR LIMIT=60]-->
<string name="support_help_feedback_title">Search help &amp; send feedback</string>
<!-- Title text that indicates user needs to sign in to get customer support. [CHAR LIMIT=80]--> <!-- Title text that indicates user needs to sign in to get customer support. [CHAR LIMIT=80]-->
<string name="support_sign_in_required_title">Sign in for support</string> <string name="support_sign_in_required_title">Sign in for support</string>

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() { 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) mSupportData.add(new SupportData.Builder(mActivity, TYPE_SUPPORT_TILE)
.setIcon(R.drawable.ic_lightbulb_outline_24) .setIcon(R.drawable.ic_lightbulb_outline_24)
.setText1(R.string.support_tips_and_tricks_title) .setText1(R.string.support_tips_and_tricks_title)
.setIntent(mSupportFeatureProvider.getTipsAndTricksIntent(mActivity)) .setIntent(mSupportFeatureProvider.getTipsAndTricksIntent(mActivity))
.setMetricsEvent(MetricsProto.MetricsEvent.ACTION_SUPPORT_TIPS_AND_TRICKS) .setMetricsEvent(MetricsProto.MetricsEvent.ACTION_SUPPORT_TIPS_AND_TRICKS)
.build()); .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) { 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); .setTitle(R.string.support_international_phone_title);
final View content = LayoutInflater.from(builder.getContext()) final View content = LayoutInflater.from(builder.getContext())
.inflate(R.layout.support_phone_dialog_content, null); .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 TextView phoneView = (TextView) content.findViewById(R.id.phone_number);
final String formattedPhoneNumber = getContext().getString( final String formattedPhoneNumber = getContext().getString(
R.string.support_phone_international_format, R.string.support_phone_international_format,
new Locale(phone.language).getDisplayLanguage(), phone.number); new Locale(phone.language).getDisplayLanguage(), phone.number);
phoneView.setText(formattedPhoneNumber); phoneView.setText(formattedPhoneNumber);
phoneView.setOnClickListener(this); phoneNumberContainer.setOnClickListener(this);
return builder return builder
.setView(content) .setView(content)
.create(); .create();