chrome/android/java/res/layout/password_entry_editor_interactive.xml - Issue 2365733002: Inherit default text color from MainTheme.

Side by Side Diff: chrome/android/java/res/layout/password_entry_editor_interactive.xml

Issue 2365733002: Inherit default text color from MainTheme. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: swapping out @ColorRes and @ColorInt usage in code. Created 4 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/layout/infobar_control_toggle.xml ('k') | chrome/android/java/res/layout/password_generation_popup_suggestion.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 <!-- Copyright 2016 The Chromium Authors. All rights reserved.	2 <!-- Copyright 2016 The Chromium Authors. All rights reserved.

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

4 found in the LICENSE file. -->	4 found in the LICENSE file. -->

5	5

6 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"	6 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"

7 android:layout_width="match_parent"	7 android:layout_width="match_parent"

8 android:layout_height="match_parent"	8 android:layout_height="match_parent"

9 android:fillViewport="true" >	9 android:fillViewport="true" >

10	10

(...skipping 14 matching lines...) Expand all Loading...
25 android:gravity="center_vertical"	25 android:gravity="center_vertical"

26 android:textAppearance="?android:attr/textAppearanceMedium" />	26 android:textAppearance="?android:attr/textAppearanceMedium" />

27	27

28 <LinearLayout	28 <LinearLayout

29 android:layout_width="wrap_content"	29 android:layout_width="wrap_content"

30 android:layout_height="wrap_content"	30 android:layout_height="wrap_content"

31 android:orientation="horizontal">	31 android:orientation="horizontal">

32	32

33 <TextView	33 <TextView

34 android:id="@+id/password_entry_editor_url"	34 android:id="@+id/password_entry_editor_url"

35 android:textColor="@color/default_text_color"

36 android:layout_width="fill_parent"	35 android:layout_width="fill_parent"

37 android:layout_height="wrap_content"	36 android:layout_height="wrap_content"

38 android:layout_marginTop="10dp"	37 android:layout_marginTop="10dp"

39 android:layout_marginStart="15dp"	38 android:layout_marginStart="15dp"

40 android:textAppearance="?android:attr/textAppearanceMedium" />	39 android:textAppearance="?android:attr/textAppearanceMedium" />

41	40

42 <View	41 <View

43 android:layout_width="0dp"	42 android:layout_width="0dp"

44 android:layout_height="0dp"	43 android:layout_height="0dp"

45 android:layout_weight="1" />	44 android:layout_weight="1" />

(...skipping 20 matching lines...) Expand all Loading...
66 android:gravity="center_vertical"	65 android:gravity="center_vertical"

67 android:textAppearance="?android:attr/textAppearanceMedium" />	66 android:textAppearance="?android:attr/textAppearanceMedium" />

68	67

69 <LinearLayout	68 <LinearLayout

70 android:layout_width="wrap_content"	69 android:layout_width="wrap_content"

71 android:layout_height="wrap_content"	70 android:layout_height="wrap_content"

72 android:orientation="horizontal">	71 android:orientation="horizontal">

73	72

74 <TextView	73 <TextView

75 android:id="@+id/password_entry_editor_name"	74 android:id="@+id/password_entry_editor_name"

76 android:textColor="@color/default_text_color"

77 android:layout_width="fill_parent"	75 android:layout_width="fill_parent"

78 android:layout_height="wrap_content"	76 android:layout_height="wrap_content"

79 android:layout_marginTop="10dp"	77 android:layout_marginTop="10dp"

80 android:layout_marginStart="15dp"	78 android:layout_marginStart="15dp"

81 android:textAppearance="?android:attr/textAppearanceMedium" />	79 android:textAppearance="?android:attr/textAppearanceMedium" />

82	80

83 <View	81 <View

84 android:layout_width="0dp"	82 android:layout_width="0dp"

85 android:layout_height="0dp"	83 android:layout_height="0dp"

86 android:layout_weight="1" />	84 android:layout_weight="1" />

(...skipping 20 matching lines...) Expand all Loading...
107 android:gravity="center_vertical"	105 android:gravity="center_vertical"

108 android:textAppearance="?android:attr/textAppearanceMedium" />	106 android:textAppearance="?android:attr/textAppearanceMedium" />

109	107

110 <LinearLayout	108 <LinearLayout

111 android:layout_width="wrap_content"	109 android:layout_width="wrap_content"

112 android:layout_height="wrap_content"	110 android:layout_height="wrap_content"

113 android:orientation="horizontal">	111 android:orientation="horizontal">

114	112

115 <TextView	113 <TextView

116 android:id="@+id/password_entry_editor_password"	114 android:id="@+id/password_entry_editor_password"

117 android:textColor="@color/default_text_color"

118 android:layout_width="fill_parent"	115 android:layout_width="fill_parent"

119 android:layout_height="wrap_content"	116 android:layout_height="wrap_content"

120 android:layout_marginTop="10dp"	117 android:layout_marginTop="10dp"

121 android:layout_marginStart="15dp"	118 android:layout_marginStart="15dp"

122 android:textAppearance="?android:attr/textAppearanceMedium" />	119 android:textAppearance="?android:attr/textAppearanceMedium" />

123	120

124 <View	121 <View

125 android:layout_width="0dp"	122 android:layout_width="0dp"

126 android:layout_height="0dp"	123 android:layout_height="0dp"

127 android:layout_weight="1" />	124 android:layout_weight="1" />

(...skipping 16 matching lines...) Expand all Loading...
144 android:layout_marginTop="10dp"	141 android:layout_marginTop="10dp"

145 android:layout_marginEnd="15dp"	142 android:layout_marginEnd="15dp"

146 android:src="@drawable/ic_content_copy"	143 android:src="@drawable/ic_content_copy"

147 android:contentDescription="@string/password_entry_editor_copy_s tored_password" />	144 android:contentDescription="@string/password_entry_editor_copy_s tored_password" />

148	145

149 </LinearLayout>	146 </LinearLayout>

150	147

151 </LinearLayout>	148 </LinearLayout>

152	149

153 </ScrollView>	150 </ScrollView>

OLD	NEW