chrome/android/java/res/layout/website_settings.xml - Issue 620983002: Add Permissions to the PageInfo dialog on Android

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <?xml version="1.0" encoding="utf-8"?>	1 <?xml version="1.0" encoding="utf-8"?>

2 <!--	2 <!--

3 Copyright (c) 2013 The Chromium Authors. All rights reserved.	3 Copyright (c) 2013 The Chromium Authors. All rights reserved.

4	4

5 Use of this source code is governed by a BSD-style license that can be	5 Use of this source code is governed by a BSD-style license that can be

6 found in the LICENSE file.	6 found in the LICENSE file.

7 -->	7 -->

8 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"	8 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

9 android:layout_width="match_parent"	9 android:layout_width="match_parent"

10 android:layout_height="match_parent"	10 android:layout_height="match_parent"

11 android:background="@color/website_settings_popup_background"	11 android:background="#ffffff"

12 android:orientation="vertical"	12 android:orientation="vertical" >

13 android:paddingBottom="@dimen/website_settings_margin_bottom"

14 android:paddingEnd="@dimen/website_settings_margin_sides"

15 android:paddingStart="@dimen/website_settings_margin_sides"

16 android:paddingTop="@dimen/website_settings_margin_top" >

17	13

18 <TextView	14 <LinearLayout

19 android:id="@+id/website_settings_url"

20 android:layout_width="match_parent"	15 android:layout_width="match_parent"

21 android:layout_height="wrap_content"	16 android:layout_height="wrap_content"

22 android:paddingBottom="@dimen/website_settings_margin_below_url"	17 android:orientation="vertical"

23 android:textColor="@color/website_settings_popup_url"	18 android:paddingEnd="@dimen/website_settings_popup_padding_sides"

24 android:textSize="@dimen/website_settings_url_title_size" />	19 android:paddingStart="@dimen/website_settings_popup_padding_sides" >

25	20

26 <TextView	21 <TextView

27 android:id="@+id/website_settings_permission_message"	22 android:id="@+id/website_settings_url"

	23 android:layout_width="match_parent"

	24 android:layout_height="wrap_content"

	25 android:lineSpacingExtra="4dp"

	26 android:paddingTop="16dp"

	27 android:textColor="@color/website_settings_popup_url"

	28 android:textSize="16dp" />

	29

	30 <TextView

	31 android:id="@+id/website_settings_connection_message"

	32 android:layout_width="match_parent"

	33 android:layout_height="wrap_content"

	34 android:lineSpacingExtra="3dp"

	35 android:paddingTop="12dp"

	36 android:textColor="#444444"

	37 android:textSize="14dp" />

	38

	39 <Button

	40 android:id="@+id/website_settings_copy_url_button"

	41 style="?android:attr/borderlessButtonStyle"

	42 android:layout_gravity="end"

	43 android:layout_width="wrap_content"

	44 android:layout_height="@dimen/website_settings_popup_button_height"

	45 android:layout_marginEnd="@dimen/website_settings_popup_button_margi n_sides"

	46 android:layout_marginStart="@dimen/website_settings_popup_button_mar gin_sides"

	47 android:layout_marginBottom="8dp"

	48 android:layout_marginTop="24dp"

	49 android:paddingEnd="@dimen/website_settings_popup_button_padding_sid es"

	50 android:paddingStart="@dimen/website_settings_popup_button_padding_s ides"

	51 android:text="@string/page_info_copy_url_button"

	52 android:textAllCaps="true"

	53 android:textColor="#4184f3"

	54 android:textSize="@dimen/website_settings_popup_button_text_size"

	55 android:textStyle="bold" />

	56 </LinearLayout>

	57

	58 <!-- Horizontal separator -->

	59 <View

	60 android:layout_width="match_parent"

	61 android:layout_height="1dip"

	62 android:background="#e7e7e7" />

	63

	64 <LinearLayout

28 android:layout_width="match_parent"	65 android:layout_width="match_parent"

29 android:layout_height="wrap_content"	66 android:layout_height="wrap_content"

30 android:textColor="@color/website_settings_popup_text"	67 android:orientation="vertical"

31 android:textSize="@dimen/website_settings_url_description_size" />	68 android:paddingStart="@dimen/website_settings_popup_padding_sides"

	69 android:paddingEnd="@dimen/website_settings_popup_padding_sides" >

32	70

33 </LinearLayout>	71 <LinearLayout

	72 android:id="@+id/website_settings_permissions_list"

	73 android:layout_width="match_parent"

	74 android:layout_height="wrap_content"

	75 android:orientation="vertical" >

	76 </LinearLayout>

	77

	78 <LinearLayout

	79 android:layout_width="match_parent"

	80 android:layout_height="wrap_content"

	81 android:gravity="end"

	82 android:orientation="horizontal"

	83 android:paddingTop="16dp"

	84 android:paddingBottom="16dp" >

	85

	86 <Button
	sashab 2014/10/14 02:53:18 This button code is duplicated 3 times. Is there a This button code is duplicated 3 times. Is there a way I can extract out the common text size/color/padding etc into a custom tag, perhaps? Is there an accepted pattern for doing this?
	87 android:id="@+id/website_settings_site_settings_button"

	88 style="?android:attr/borderlessButtonStyle"

	89 android:layout_width="wrap_content"

	90 android:layout_height="@dimen/website_settings_popup_button_heig ht"

	91 android:layout_marginEnd="@dimen/website_settings_popup_button_m argin_sides"

	92 android:layout_marginStart="@dimen/website_settings_popup_button _margin_sides"

	93 android:paddingEnd="@dimen/website_settings_popup_button_padding _sides"

	94 android:paddingStart="@dimen/website_settings_popup_button_paddi ng_sides"

	95 android:text="@string/page_info_site_settings_button"

	96 android:textAllCaps="true"

	97 android:textColor="@color/website_settings_popup_button_text"

	98 android:textSize="@dimen/website_settings_popup_button_text_size "

	99 android:textStyle="bold" />

	100

	101 <Button

	102 android:id="@+id/website_settings_done_button"

	103 style="?android:attr/borderlessButtonStyle"

	104 android:layout_width="wrap_content"

	105 android:layout_height="@dimen/website_settings_popup_button_heig ht"

	106 android:layout_marginEnd="@dimen/website_settings_popup_button_m argin_sides"

	107 android:layout_marginStart="@dimen/website_settings_popup_button _margin_sides"

	108 android:paddingEnd="@dimen/website_settings_popup_button_padding _sides"

	109 android:paddingStart="@dimen/website_settings_popup_button_paddi ng_sides"

	110 android:text="@string/page_info_done_button"

	111 android:textAllCaps="true"

	112 android:textColor="@color/website_settings_popup_button_text"

	113 android:textSize="@dimen/website_settings_popup_button_text_size "

	114 android:textStyle="bold" />

	115 </LinearLayout>

	116 </LinearLayout>

	117

	118 </LinearLayout>

OLD	NEW