Merge "Prompt sign-in when there is no account for support options" into nyc-mr1-dev

am: 050d94151f

* commit '050d94151fa931ee2c90a1c949090f66aa032792':
  Prompt sign-in when there is no account for support options

Change-Id: I6b78faaf8080a5c0e6c4158592c297e1d9728039

res/layout/support_escalation_card.xml

@@ -38,7 +38,7 @@
             android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"
             android:scaleType="centerInside"/>
         <TextView
-            android:id="@android:id/title"
+            android:id="@android:id/text1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="@style/TextAppearance.TileTitle"/>

res/layout/support_item_subtitle.xml

@@ -17,7 +17,7 @@
 
 <TextView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/title"
+    android:id="@android:id/text1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingBottom="16dp"

res/layout/support_item_title.xml

@@ -21,7 +21,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
     <TextView
-        android:id="@android:id/title"
+        android:id="@android:id/text1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingEnd="8dp"
@@ -29,7 +29,7 @@
         android:paddingTop="8dp"
         android:textAppearance="@style/TextAppearance.SupportTitle"/>
     <TextView
-        android:id="@android:id/summary"
+        android:id="@android:id/text2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="16dp"

res/layout/support_sign_in_button.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <Button
+        android:id="@android:id/text1"
+        style="@style/SupportPrimaryButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"/>
+    <Button
+        android:id="@android:id/text2"
+        style="@style/SupportSecondaryButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+</LinearLayout>

res/layout/support_tile.xml

@@ -31,7 +31,7 @@
         android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
         android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"/>
     <TextView
-        android:id="@android:id/title"
+        android:id="@android:id/text1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:singleLine="true"