Merge "Launch Help & Feedback" into nyc-mr1-dev

diff --cc res/values/strings.xml
index 554e453,c61db83..7b7f996
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -7512,14 -7512,8 +7512,8 @@@
      <!-- Button label for visiting help forum [CHAR LIMIT=60]-->
      <string name="support_forum_title">Help forum</string>
  
-     <!-- Button label for visiting help articles [CHAR LIMIT=60]-->
-     <string name="support_articles_title">Help articles</string>
- 
-     <!-- Button label for sending user feedback [CHAR LIMIT=60]-->
-     <string name="support_feedback_title">Send feedback</string>
- 
      <!-- Title text that indicates user needs to sign in to get customer support. [CHAR LIMIT=80]-->
 -    <string name="support_sign_in_required_title">Need assistance now?</string>
 +    <string name="support_sign_in_required_title">Sign in for support</string>
  
      <!-- Summary text that indicates user needs to sign-in to get real time customer support. [CHAR LIMIT=NONE]-->
      <string name="support_sign_in_required_summary" translatable="false"></string>

diff --cc src/com/android/settings/dashboard/SupportItemAdapter.java
index e8d74e3,b528cf4..beef92e
--- 1/src/com/android/settings/dashboard/SupportItemAdapter.java
--- 2/src/com/android/settings/dashboard/SupportItemAdapter.java
+++ b/src/com/android/settings/dashboard/SupportItemAdapter.java
@@@ -179,30 -177,10 +179,29 @@@ public final class SupportItemAdapter e
                  R.string.support_forum_title, 0 /* summary */,
                  mSupportFeatureProvider.getForumIntent()));
          mSupportData.add(new SupportData(TYPE_SUPPORT_TILE, R.drawable.ic_help_24dp,
-                 R.string.support_articles_title, 0 /* summary */, null /*intent */));
-         mSupportData.add(new SupportData(TYPE_SUPPORT_TILE, R.drawable.ic_feedback_24dp,
-                 R.string.support_feedback_title, 0 /* summary */, null /*intent */));
+                 R.string.help_feedback_label, 0 /* summary */,
+                 mSupportFeatureProvider.getHelpIntent(mActivity)));
      }
  
 +    private void bindEscalationOptions(ViewHolder holder, SupportData data) {
 +        if (data.text1 == 0) {
 +            holder.text1View.setVisibility(View.GONE);
 +        } else {
 +            holder.text1View.setText(data.text1);
 +            holder.text1View.setOnClickListener(mEscalationClickListener);
 +            holder.text1View.setEnabled(mHasInternet);
 +            holder.text1View.setVisibility(View.VISIBLE);
 +        }
 +        if (data.text2 == 0) {
 +            holder.text2View.setVisibility(View.GONE);
 +        } else {
 +            holder.text2View.setText(data.text2);
 +            holder.text2View.setOnClickListener(mEscalationClickListener);
 +            holder.text2View.setEnabled(mHasInternet);
 +            holder.text2View.setVisibility(View.VISIBLE);
 +        }
 +    }
 +
      private void bindSignInPromoTile(ViewHolder holder, SupportData data) {
          holder.text1View.setText(data.text1);
          holder.text2View.setText(data.text2);

diff --cc src/com/android/settings/overlay/SupportFeatureProvider.java
Simple merge