Add Permissions to the PageInfo dialog on Android

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

Index: chrome/android/java/res/layout/website_settings.xml
diff --git a/chrome/android/java/res/layout/website_settings.xml b/chrome/android/java/res/layout/website_settings.xml
index 59aede5bddd4cb2cba5fce4b5cadaf69e610938d..de824851e46c5d798e61ccca2f6f48af1820bdda 100644
--- a/chrome/android/java/res/layout/website_settings.xml
+++ b/chrome/android/java/res/layout/website_settings.xml
@@ -9,25 +9,121 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/website_settings_popup_background"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/website_settings_margin_bottom"
-    android:paddingEnd="@dimen/website_settings_margin_sides"
-    android:paddingStart="@dimen/website_settings_margin_sides"
-    android:paddingTop="@dimen/website_settings_margin_top" >
-
-    <TextView
-        android:id="@+id/website_settings_url"
+    android:orientation="vertical" >
+
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/website_settings_margin_below_url"
-        android:textColor="@color/website_settings_popup_url"
-        android:textSize="@dimen/website_settings_url_title_size" />
+        android:orientation="vertical"
+        android:paddingEnd="@dimen/website_settings_popup_margin_sides"
+        android:paddingStart="@dimen/website_settings_popup_margin_sides" >
+
+        <TextView
+            android:id="@+id/website_settings_url"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:lineSpacingExtra="@dimen/website_settings_popup_url_extra_line_spacing"
+            android:paddingTop="@dimen/website_settings_popup_margin_top"
+            android:text="https://google.com/design/material/guidelines"

[Ted C, 2014/10/09 01:25:14]

remove?

[sashab, 2014/10/14 02:53:17]

Yup; sorry about these. Done.

+            android:textColor="@color/website_settings_popup_url"
+            android:textSize="@dimen/website_settings_popup_url_size" />
+
+        <TextView
+            android:id="@+id/website_settings_connection_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:lineSpacingExtra="@dimen/website_settings_popup_connection_message_extra_line_spacing"
+            android:paddingTop="@dimen/website_settings_popup_margin_below_url"
+            android:text="Your connection to this site is private, but an attacker could still compromise the page."

[Ted C, 2014/10/09 01:25:14]

remove this too?

[sashab, 2014/10/14 02:53:17]

Done.

+            android:textColor="@color/website_settings_popup_connection_message"
+            android:textSize="@dimen/website_settings_popup_connection_message_size" />
 
-    <TextView
-        android:id="@+id/website_settings_permission_message"
+        <LinearLayout
+            android:layout_width="match_parent"

[Ted C, 2014/10/09 01:25:14]

why do you need this?  If you set layout_gravity="end" on the button does it get
right aligned as you expect?

For these padding values, you should be able to set them as
layout_marginTop/Bottom instead of padding to get the same effect as well.

[sashab, 2014/10/14 02:53:17]

Yup, layout_gravity works, didn't know you could do this on a single view :)
Done and moved the paddings to margins.

+            android:layout_height="wrap_content"
+            android:gravity="end"
+            android:orientation="horizontal"
+            android:paddingBottom="@dimen/website_settings_popup_margin_below_copy_url_button"
+            android:paddingTop="@dimen/website_settings_popup_margin_below_connection_message" >
+
+            <Button
+                android:id="@+id/website_settings_copy_url_button"
+                style="?android:attr/borderlessButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/website_settings_popup_button_external_padding_sides"
+                android:layout_marginStart="@dimen/website_settings_popup_button_external_padding_sides"
+                android:height="@dimen/website_settings_popup_button_height"

[Ted C, 2014/10/09 01:25:14]

if you just set layout_height="@dimen/website_settings_popup_button_height"
instead, can you remove this?

[sashab, 2014/10/14 02:53:17]

Yup, works :) Done.

+                android:paddingEnd="@dimen/website_settings_popup_button_internal_padding_sides"
+                android:paddingStart="@dimen/website_settings_popup_button_internal_padding_sides"
+                android:text="@string/page_info_copy_url_button"
+                android:textAllCaps="true"
+                android:textColor="@color/website_settings_popup_copy_url_button_text"
+                android:textSize="@dimen/website_settings_popup_button_text_size"
+                android:textStyle="bold" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <!-- Horizontal separator -->
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="@color/website_settings_popup_separator" />
+
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@color/website_settings_popup_text"
-        android:textSize="@dimen/website_settings_url_description_size" />
+        android:orientation="vertical"
+        android:paddingEnd="@dimen/website_settings_popup_margin_sides"

[Ted C, 2014/10/09 01:25:14]

These seem to be used only in padding, so you should either rename the dimen to
be padding sides or convert these to use marginStart, marginEnd

[sashab, 2014/10/14 02:53:17]

Renamed them to be padding.

+        android:paddingStart="@dimen/website_settings_popup_margin_sides" >

[Ted C, 2014/10/09 01:25:14]

put start above end

[sashab, 2014/10/14 02:53:17]

Done.

+
+        <LinearLayout
+            android:id="@+id/website_settings_permissions_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="end"
+            android:orientation="horizontal"
+            android:paddingBottom="@dimen/website_settings_popup_margin_bottom"
+            android:paddingTop="@dimen/website_settings_popup_margin_above_done_button" >

[Ted C, 2014/10/09 01:25:14]

put top above bottom

[sashab, 2014/10/14 02:53:17]

Done.

+
+            <Button
+                android:id="@+id/website_settings_site_settings_button"
+                style="?android:attr/borderlessButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/website_settings_popup_button_external_padding_sides"

[Ted C, 2014/10/09 01:25:14]

use margin instead of external_padding

[sashab, 2014/10/14 02:53:17]

Done.

+                android:layout_marginStart="@dimen/website_settings_popup_button_external_padding_sides"
+                android:height="@dimen/website_settings_popup_button_height"
+                android:paddingEnd="@dimen/website_settings_popup_button_internal_padding_sides"

[Ted C, 2014/10/09 01:25:14]

no need for padding

[sashab, 2014/10/14 02:53:17]

I think you mean 'no need for internal'? :) Done.

+                android:paddingStart="@dimen/website_settings_popup_button_internal_padding_sides"
+                android:text="@string/page_info_site_settings_button"
+                android:textAllCaps="true"
+                android:textColor="@color/website_settings_popup_button_text"
+                android:textSize="@dimen/website_settings_popup_button_text_size"
+                android:textStyle="bold" />
+
+            <Button
+                android:id="@+id/website_settings_done_button"
+                style="?android:attr/borderlessButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/website_settings_popup_button_external_padding_sides"
+                android:layout_marginStart="@dimen/website_settings_popup_button_external_padding_sides"
+                android:height="@dimen/website_settings_popup_button_height"
+                android:paddingEnd="@dimen/website_settings_popup_button_internal_padding_sides"
+                android:paddingStart="@dimen/website_settings_popup_button_internal_padding_sides"
+                android:text="@string/page_info_done_button"
+                android:textAllCaps="true"
+                android:textColor="@color/website_settings_popup_button_text"
+                android:textSize="@dimen/website_settings_popup_button_text_size"
+                android:textStyle="bold" />
+        </LinearLayout>
+    </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>