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: Added TODO to rename class to PageInfo 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

« chrome/android/java/res/drawable/website_settings_permission_spinner_item_background.xml ('K') | « chrome/android/java/res/drawable/website_settings_permission_spinner_item_background.xml ('k') | chrome/android/java/res/layout/website_settings_permission_row.xml » ('j') | chrome/android/java/res/layout/website_settings_permission_row.xml » ('J')
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="@color/website_settings_popup_background"

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_margin_sides"

24 android:textSize="@dimen/website_settings_url_title_size" />	19 android:paddingStart="@dimen/website_settings_popup_margin_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="@dimen/website_settings_popup_url_extra_li ne_spacing"

	26 android:paddingTop="@dimen/website_settings_popup_margin_top"

	27 android:text="https://google.com/design/material/guidelines"
	Ted C 2014/10/09 01:25:14 remove? remove? sashab 2014/10/14 02:53:17 Yup; sorry about these. Done. Show quoted text On 2014/10/09 01:25:14, Ted C wrote: > remove? Yup; sorry about these. Done.
	28 android:textColor="@color/website_settings_popup_url"

	29 android:textSize="@dimen/website_settings_popup_url_size" />

	30

	31 <TextView

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

	33 android:layout_width="match_parent"

	34 android:layout_height="wrap_content"

	35 android:lineSpacingExtra="@dimen/website_settings_popup_connection_m essage_extra_line_spacing"

	36 android:paddingTop="@dimen/website_settings_popup_margin_below_url"

	37 android:text="Your connection to this site is private, but an attack er could still compromise the page."
	Ted C 2014/10/09 01:25:14 remove this too? remove this too? sashab 2014/10/14 02:53:17 Done. Show quoted text On 2014/10/09 01:25:14, Ted C wrote: > remove this too? Done.
	38 android:textColor="@color/website_settings_popup_connection_message"

	39 android:textSize="@dimen/website_settings_popup_connection_message_s ize" />

	40

	41 <LinearLayout

	42 android:layout_width="match_parent"
	Ted C 2014/10/09 01:25:14 why do you need this? If you set layout_gravity=" 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 d Show quoted text On 2014/10/09 01:25:14, Ted C wrote: > 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. Yup, layout_gravity works, didn't know you could do this on a single view :) Done and moved the paddings to margins.
	43 android:layout_height="wrap_content"

	44 android:gravity="end"

	45 android:orientation="horizontal"

	46 android:paddingBottom="@dimen/website_settings_popup_margin_below_co py_url_button"

	47 android:paddingTop="@dimen/website_settings_popup_margin_below_conne ction_message" >

	48

	49 <Button

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

	51 style="?android:attr/borderlessButtonStyle"

	52 android:layout_width="wrap_content"

	53 android:layout_height="wrap_content"

	54 android:layout_marginEnd="@dimen/website_settings_popup_button_e xternal_padding_sides"

	55 android:layout_marginStart="@dimen/website_settings_popup_button _external_padding_sides"

	56 android:height="@dimen/website_settings_popup_button_height"
	Ted C 2014/10/09 01:25:14 if you just set layout_height="@dimen/website_sett 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. Show quoted text On 2014/10/09 01:25:14, Ted C wrote: > if you just set layout_height="@dimen/website_settings_popup_button_height" > instead, can you remove this? Yup, works :) Done.
	57 android:paddingEnd="@dimen/website_settings_popup_button_interna l_padding_sides"

	58 android:paddingStart="@dimen/website_settings_popup_button_inter nal_padding_sides"

	59 android:text="@string/page_info_copy_url_button"

	60 android:textAllCaps="true"

	61 android:textColor="@color/website_settings_popup_copy_url_button _text"

	62 android:textSize="@dimen/website_settings_popup_button_text_size "

	63 android:textStyle="bold" />

	64 </LinearLayout>

	65 </LinearLayout>

	66

	67 <!-- Horizontal separator -->

	68 <View

	69 android:layout_width="match_parent"

	70 android:layout_height="1dip"

	71 android:background="@color/website_settings_popup_separator" />

	72

	73 <LinearLayout

28 android:layout_width="match_parent"	74 android:layout_width="match_parent"

29 android:layout_height="wrap_content"	75 android:layout_height="wrap_content"

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

31 android:textSize="@dimen/website_settings_url_description_size" />	77 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 shou 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. Show quoted text On 2014/10/09 01:25:14, Ted C wrote: > 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 Renamed them to be padding.
	78 android:paddingStart="@dimen/website_settings_popup_margin_sides" >
	Ted C 2014/10/09 01:25:14 put start above end put start above end sashab 2014/10/14 02:53:17 Done. Show quoted text On 2014/10/09 01:25:14, Ted C wrote: > put start above end Done.
32	79

33 </LinearLayout>	80 <LinearLayout

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

	82 android:layout_width="match_parent"

	83 android:layout_height="wrap_content"

	84 android:orientation="vertical" >

	85 </LinearLayout>

	86

	87 <LinearLayout

	88 android:layout_width="match_parent"

	89 android:layout_height="wrap_content"

	90 android:gravity="end"

	91 android:orientation="horizontal"

	92 android:paddingBottom="@dimen/website_settings_popup_margin_bottom"

	93 android:paddingTop="@dimen/website_settings_popup_margin_above_done_ button" >
	Ted C 2014/10/09 01:25:14 put top above bottom put top above bottom sashab 2014/10/14 02:53:17 Done. Show quoted text On 2014/10/09 01:25:14, Ted C wrote: > put top above bottom Done.
	94

	95 <Button

	96 android:id="@+id/website_settings_site_settings_button"

	97 style="?android:attr/borderlessButtonStyle"

	98 android:layout_width="wrap_content"

	99 android:layout_height="wrap_content"

	100 android:layout_marginEnd="@dimen/website_settings_popup_button_e xternal_padding_sides"
	Ted C 2014/10/09 01:25:14 use margin instead of external_padding use margin instead of external_padding sashab 2014/10/14 02:53:17 Done. Show quoted text On 2014/10/09 01:25:14, Ted C wrote: > use margin instead of external_padding Done.
	101 android:layout_marginStart="@dimen/website_settings_popup_button _external_padding_sides"

	102 android:height="@dimen/website_settings_popup_button_height"

	103 android:paddingEnd="@dimen/website_settings_popup_button_interna l_padding_sides"
	Ted C 2014/10/09 01:25:14 no need for padding no need for padding sashab 2014/10/14 02:53:17 I think you mean 'no need for internal'? :) Done. Show quoted text On 2014/10/09 01:25:14, Ted C wrote: > no need for padding I think you mean 'no need for internal'? :) Done.
	104 android:paddingStart="@dimen/website_settings_popup_button_inter nal_padding_sides"

	105 android:text="@string/page_info_site_settings_button"

	106 android:textAllCaps="true"

	107 android:textColor="@color/website_settings_popup_button_text"

	108 android:textSize="@dimen/website_settings_popup_button_text_size "

	109 android:textStyle="bold" />

	110

	111 <Button

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

	113 style="?android:attr/borderlessButtonStyle"

	114 android:layout_width="wrap_content"

	115 android:layout_height="wrap_content"

	116 android:layout_marginEnd="@dimen/website_settings_popup_button_e xternal_padding_sides"

	117 android:layout_marginStart="@dimen/website_settings_popup_button _external_padding_sides"

	118 android:height="@dimen/website_settings_popup_button_height"

	119 android:paddingEnd="@dimen/website_settings_popup_button_interna l_padding_sides"

	120 android:paddingStart="@dimen/website_settings_popup_button_inter nal_padding_sides"

	121 android:text="@string/page_info_done_button"

	122 android:textAllCaps="true"

	123 android:textColor="@color/website_settings_popup_button_text"

	124 android:textSize="@dimen/website_settings_popup_button_text_size "

	125 android:textStyle="bold" />

	126 </LinearLayout>

	127 </LinearLayout>

	128

	129 </LinearLayout>

OLD	NEW