diff --git a/res/layout/support_escalation_options.xml b/res/layout/support_escalation_options.xml
index 6b8890882d0..b214561c0c6 100644
--- a/res/layout/support_escalation_options.xml
+++ b/res/layout/support_escalation_options.xml
@@ -17,51 +17,71 @@
-
+
-
-
-
-
+
-
+
+
-
+
+
+
+
+ android:layout_marginStart="8dp"
+ android:layout_marginEnd="8dp"
+ android:gravity="center_horizontal"
+ android:orientation="vertical">
+
+
+
diff --git a/res/layout/support_item_title.xml b/res/layout/support_item_title.xml
deleted file mode 100644
index 0110da05d10..00000000000
--- a/res/layout/support_item_title.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/res/layout/support_offline_escalation_options.xml b/res/layout/support_offline_escalation_options.xml
index 43be55f17b9..d1e77a3db60 100644
--- a/res/layout/support_offline_escalation_options.xml
+++ b/res/layout/support_offline_escalation_options.xml
@@ -17,13 +17,25 @@
-
+
+
diff --git a/res/layout/support_sign_in_button.xml b/res/layout/support_sign_in_button.xml
index fb789e85920..45de57184ce 100644
--- a/res/layout/support_sign_in_button.xml
+++ b/res/layout/support_sign_in_button.xml
@@ -17,11 +17,25 @@
+
+
%s (%s)
-
- Call us toll-free
-
Traveling aboard?
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1942a4c6f73..cc6dc30f5de 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -424,4 +424,12 @@
- @android:style/TextAppearance.Material.Subhead
+
+
diff --git a/src/com/android/settings/dashboard/SupportItemAdapter.java b/src/com/android/settings/dashboard/SupportItemAdapter.java
index 8f2be01fdb0..678226a00aa 100644
--- a/src/com/android/settings/dashboard/SupportItemAdapter.java
+++ b/src/com/android/settings/dashboard/SupportItemAdapter.java
@@ -56,7 +56,6 @@ import static com.android.settings.overlay.SupportFeatureProvider.SupportType.PH
public final class SupportItemAdapter extends RecyclerView.Adapter {
private static final String STATE_SELECTED_COUNTRY = "STATE_SELECTED_COUNTRY";
- private static final int TYPE_TITLE = R.layout.support_item_title;
private static final int TYPE_ESCALATION_OPTIONS = R.layout.support_escalation_options;
private static final int TYPE_ESCALATION_OPTIONS_OFFLINE =
R.layout.support_offline_escalation_options;
@@ -104,13 +103,13 @@ public final class SupportItemAdapter extends RecyclerView.Adapter adapter = new ArrayAdapter(
@@ -331,7 +323,9 @@ public final class SupportItemAdapter extends RecyclerView.Adapter countries;
final SupportPhone tollFreePhone;
final SupportPhone tolledPhone;
- private OfflineSupportData(Builder builder) {
+ private OfflineEscalationData(Builder builder) {
super(builder);
countries = builder.mCountries;
tollFreePhone = builder.mTollFreePhone;
tolledPhone = builder.mTolledPhone;
}
- static final class Builder extends SupportData.Builder {
+ static final class Builder extends EscalationData.Builder {
private List mCountries;
private SupportPhone mTollFreePhone;
@@ -611,8 +660,8 @@ public final class SupportItemAdapter extends RecyclerView.Adapter