Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(230)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/java/res/layout/website_settings.xml

Issue 620983002: Add Permissions to the PageInfo dialog on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@page_info_dialog_shell_only_v2
Patch Set: Review feedback, UI feedback and moved Permission Settings strings into Android Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/java/res/drawable/website_settings_permission_spinner_item_background.xml ('k') | chrome/android/java/res/layout/website_settings_permission_row.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..9e0f08a96e345b0396818e3293bd03fea3b1a236 100644
--- a/chrome/android/java/res/layout/website_settings.xml
+++ b/chrome/android/java/res/layout/website_settings.xml
@@ -8,26 +8,111 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
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:background="#ffffff"
+ 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_padding_sides"
+ android:paddingStart="@dimen/website_settings_popup_padding_sides" >
+
+ <TextView
+ android:id="@+id/website_settings_url"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:lineSpacingExtra="4dp"
+ android:paddingTop="16dp"
+ android:textColor="@color/website_settings_popup_url"
+ android:textSize="16dp" />
+
+ <TextView
+ android:id="@+id/website_settings_connection_message"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:lineSpacingExtra="3dp"
+ android:paddingTop="12dp"
+ android:textColor="#444444"
+ android:textSize="14dp" />
+
+ <Button
+ android:id="@+id/website_settings_copy_url_button"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_gravity="end"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/website_settings_popup_button_height"
+ android:layout_marginEnd="@dimen/website_settings_popup_button_margin_sides"
+ android:layout_marginStart="@dimen/website_settings_popup_button_margin_sides"
+ android:layout_marginBottom="8dp"
+ android:layout_marginTop="24dp"
+ android:paddingEnd="@dimen/website_settings_popup_button_padding_sides"
+ android:paddingStart="@dimen/website_settings_popup_button_padding_sides"
+ android:text="@string/page_info_copy_url_button"
+ android:textAllCaps="true"
+ android:textColor="#4184f3"
+ android:textSize="@dimen/website_settings_popup_button_text_size"
+ android:textStyle="bold" />
+ </LinearLayout>
+
+ <!-- Horizontal separator -->
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dip"
+ android:background="#e7e7e7" />
- <TextView
- android:id="@+id/website_settings_permission_message"
+ <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:paddingStart="@dimen/website_settings_popup_padding_sides"
+ android:paddingEnd="@dimen/website_settings_popup_padding_sides" >
+
+ <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:paddingTop="16dp"
+ android:paddingBottom="16dp" >
+
+ <Button
sashab 2014/10/14 02:53:18 This button code is duplicated 3 times. Is there a
+ android:id="@+id/website_settings_site_settings_button"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/website_settings_popup_button_height"
+ android:layout_marginEnd="@dimen/website_settings_popup_button_margin_sides"
+ android:layout_marginStart="@dimen/website_settings_popup_button_margin_sides"
+ android:paddingEnd="@dimen/website_settings_popup_button_padding_sides"
+ android:paddingStart="@dimen/website_settings_popup_button_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="@dimen/website_settings_popup_button_height"
+ android:layout_marginEnd="@dimen/website_settings_popup_button_margin_sides"
+ android:layout_marginStart="@dimen/website_settings_popup_button_margin_sides"
+ android:paddingEnd="@dimen/website_settings_popup_button_padding_sides"
+ android:paddingStart="@dimen/website_settings_popup_button_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>
« no previous file with comments | « chrome/android/java/res/drawable/website_settings_permission_spinner_item_background.xml ('k') | chrome/android/java/res/layout/website_settings_permission_row.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698