From 46da9be5098b63543d67183837e797ed2068d18d Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Mon, 27 Jun 2016 14:58:34 -0700
Subject: [PATCH 1/2] By default select current country in support phone list.

Bug: 29105266
Change-Id: I78027e5c817aae5e2220bc974e03282d937c33c6
---
 src/com/android/settings/dashboard/SupportItemAdapter.java   | 1 +
 src/com/android/settings/overlay/SupportFeatureProvider.java | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/src/com/android/settings/dashboard/SupportItemAdapter.java b/src/com/android/settings/dashboard/SupportItemAdapter.java
index 901ea088c3d..9d12ec091e3 100644
--- a/src/com/android/settings/dashboard/SupportItemAdapter.java
+++ b/src/com/android/settings/dashboard/SupportItemAdapter.java
@@ -83,6 +83,7 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd
         // Optimistically assume we have Internet access. It will be updated later to correct value.
         mHasInternet = true;
         setAccount(mSupportFeatureProvider.getSupportEligibleAccount(mActivity));
+        mSelectedCountry = mSupportFeatureProvider.getCurrentCountryCodeIfHasConfig(PHONE);
         refreshData();
     }
 
diff --git a/src/com/android/settings/overlay/SupportFeatureProvider.java b/src/com/android/settings/overlay/SupportFeatureProvider.java
index 75f526971d7..c5356221f7c 100644
--- a/src/com/android/settings/overlay/SupportFeatureProvider.java
+++ b/src/com/android/settings/overlay/SupportFeatureProvider.java
@@ -62,6 +62,11 @@ public interface SupportFeatureProvider {
      */
     boolean isOperatingNow(@SupportType int type);
 
+    /**
+     * Returns the current country code if it has a operation config, otherwise returns null.
+     */
+    String getCurrentCountryCodeIfHasConfig(@SupportType int type);
+
     /**
      * Returns localized string for operation hours in specified country. If country is null, use
      * current country to figure out operation hours.

From 2c9f35e98d249d8d49a8020caebd422359462cfd Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Mon, 27 Jun 2016 15:55:34 -0700
Subject: [PATCH 2/2] Show a static title/summary if country doesn't have
 support

Bug: 29105266
Change-Id: I874fbb1172ab2faf9372362cf0e1f933046c621c
---
 res/values/strings.xml                        |  6 +++---
 .../dashboard/SupportItemAdapter.java         | 21 +++++++++++++++----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 017b33f7f37..4690f8824a9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7507,9 +7507,6 @@
     <!-- Title text for connecting to 24/7 available customer support [CHAR LIMIT=80]-->
     <string name="support_escalation_24_7_title">We\'re here for you 24/7</string>
 
-    <!-- Title text when customer support is closed [CHAR LIMIT=80]-->
-    <string name="support_escalation_closed_title">Support closed</string>
-
     <!-- 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>
 
@@ -7519,6 +7516,9 @@
     <!-- 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>
 
+    <!-- Summary text when customer support is unavailble in the region. [CHAR LIMIT=NONE]-->
+    <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]-->
     <string name="support_hour_format" translatable="false">
         <xliff:g id="start_day">%s</xliff:g> - <xliff:g id="end_day">%s</xliff:g>, <xliff:g id="start_time">%s</xliff:g> - <xliff:g id="end_time">%s</xliff:g>&lt;br&gt;
diff --git a/src/com/android/settings/dashboard/SupportItemAdapter.java b/src/com/android/settings/dashboard/SupportItemAdapter.java
index 9d12ec091e3..cba956ed0b8 100644
--- a/src/com/android/settings/dashboard/SupportItemAdapter.java
+++ b/src/com/android/settings/dashboard/SupportItemAdapter.java
@@ -169,32 +169,45 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd
     }
 
     private void addEscalationCards() {
-        if (mSupportFeatureProvider.isAlwaysOperating(PHONE, null /* countryCode */)
+        final boolean hasPhoneOperation =
+                mSupportFeatureProvider.isSupportTypeEnabled(mActivity, PHONE);
+        final boolean hasChatOperation =
+                mSupportFeatureProvider.isSupportTypeEnabled(mActivity, CHAT);
+        if (!hasPhoneOperation && !hasChatOperation) {
+            // No support at all.
+            mSupportData.add(new SupportData.Builder(mActivity, TYPE_TITLE)
+                    .setText1(R.string.support_escalation_title)
+                    .setText2(mActivity.getString(R.string.support_escalation_unavailable_summary))
+                    .build());
+        } else if (mSupportFeatureProvider.isAlwaysOperating(PHONE, null /* countryCode */)
                 || mSupportFeatureProvider.isAlwaysOperating(CHAT, null /* countryCode */)) {
+            // Support is available.
             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))
                     .build());
         } else if (mSupportFeatureProvider.isOperatingNow(PHONE)
                 || mSupportFeatureProvider.isOperatingNow(CHAT)) {
+            // Support is available now.
             mSupportData.add(new SupportData.Builder(mActivity, TYPE_TITLE)
                     .setText1(R.string.support_escalation_title)
                     .setText2(R.string.support_escalation_summary)
                     .build());
         } else {
+            // Support is not temporarily unavailable.
             mSupportData.add(new SupportData.Builder(mActivity, TYPE_TITLE)
-                    .setText1(R.string.support_escalation_closed_title)
+                    .setText1(R.string.support_escalation_title)
                     .setText2(mSupportFeatureProvider.getOperationHours(mActivity, PHONE, null))
                     .build());
         }
         final SupportData.Builder builder =
                 new SupportData.Builder(mActivity, TYPE_ESCALATION_OPTIONS);
-        if (mSupportFeatureProvider.isSupportTypeEnabled(mActivity, PHONE)) {
+        if (hasPhoneOperation) {
             builder.setText1(R.string.support_escalation_by_phone);
             builder.setSummary1(mSupportFeatureProvider.getEstimatedWaitTime(mActivity, PHONE));
             builder.setEnabled1(mSupportFeatureProvider.isOperatingNow(PHONE));
         }
-        if (mSupportFeatureProvider.isSupportTypeEnabled(mActivity, CHAT)) {
+        if (hasChatOperation) {
             builder.setText2(R.string.support_escalation_by_chat);
             builder.setSummary2(mSupportFeatureProvider.getEstimatedWaitTime(mActivity, CHAT));
             builder.setEnabled2(mSupportFeatureProvider.isOperatingNow(CHAT));