Android Autofill card unmasking prompt - Add tooltip

chrome/android/java/res/layout/autofill_card_unmask_prompt.xml

Index: chrome/android/java/res/layout/autofill_card_unmask_prompt.xml
diff --git a/chrome/android/java/res/layout/autofill_card_unmask_prompt.xml b/chrome/android/java/res/layout/autofill_card_unmask_prompt.xml
index 92315052973fd947abdb1b1b806d0fc17c2444c6..4d8ce6b5195ab7cc1bbb9525f74be09501ad9d6c 100644
--- a/chrome/android/java/res/layout/autofill_card_unmask_prompt.xml
+++ b/chrome/android/java/res/layout/autofill_card_unmask_prompt.xml
@@ -116,17 +116,38 @@
             android:textColor="@color/input_underline_error_color"
             android:visibility="gone" />
 
-        <CheckBox
-            android:id="@+id/store_locally_checkbox"
+        <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="17dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginTop="16dp"
-            android:paddingStart="7dp"
-            android:textSize="14sp"
-            android:textColor="@color/explanation_text_color"
-            android:text="@string/autofill_card_unmask_prompt_store_locally" />
+            android:layout_marginTop="16dp">
+
+            <CheckBox
+                android:id="@+id/store_locally_checkbox"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"

[newt (away), 2015/03/09 18:20:22]

you should specify layout_toStartOf here. Otherwise, if this text is really
long, it'll overlap the tooltip icon.

[Evan Stade, 2015/03/09 18:54:13]

Done.

+                android:layout_marginStart="17dp"
+                android:layout_marginEnd="10dp"
+                android:paddingStart="7dp"
+                android:textSize="14sp"
+                android:textColor="@color/explanation_text_color"
+                android:text="@string/autofill_card_unmask_prompt_store_locally" />
+
+            <!-- TODO(estade): get (?) resources in all scales. -->
+            <!-- TODO(estade): Content description? -->
+            <ImageView
+                android:id="@+id/store_locally_tooltip_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="12dp"

[newt (away), 2015/03/09 18:20:22]

Do you really need marginEnd and paddingEnd? Same above.

[Evan Stade, 2015/03/09 18:54:13]

my understanding is that margin and padding affect the event hitbox differently,
so yes

+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:padding="12dp"
+                android:src="@drawable/deprecation_warning"
+                android:contentDescription="@null" />
+
+        </RelativeLayout>
     </LinearLayout>
 
     <LinearLayout