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

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

Issue 2427853002: Revert "Inherit default text color from parent themes." (Closed)
Patch Set: 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
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2015 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 <LinearLayout 6 <LinearLayout
7 xmlns:android="http://schemas.android.com/apk/res/android" 7 xmlns:android="http://schemas.android.com/apk/res/android"
8 android:layout_width="match_parent" 8 android:layout_width="match_parent"
9 android:layout_height="wrap_content" 9 android:layout_height="wrap_content"
10 android:minHeight="36dp" 10 android:minHeight="36dp"
11 android:gravity="center_vertical"> 11 android:gravity="center_vertical">
12 12
13 <ImageView 13 <ImageView
14 android:id="@+id/control_icon" 14 android:id="@+id/control_icon"
15 android:layout_width="wrap_content" 15 android:layout_width="wrap_content"
16 android:layout_height="wrap_content" 16 android:layout_height="wrap_content"
17 android:layout_marginEnd="@dimen/infobar_control_margin_between_items" 17 android:layout_marginEnd="@dimen/infobar_control_margin_between_items"
18 android:scaleType="centerInside" 18 android:scaleType="centerInside"
19 android:contentDescription="@null" /> 19 android:contentDescription="@null" />
20 20
21 <org.chromium.chrome.browser.widget.DualControlLayout 21 <org.chromium.chrome.browser.widget.DualControlLayout
22 android:layout_width="0dp" 22 android:layout_width="0dp"
23 android:layout_height="wrap_content" 23 android:layout_height="wrap_content"
24 android:layout_weight="1" > 24 android:layout_weight="1" >
25 25
26 <TextView 26 <TextView
27 android:id="@+id/control_message" 27 android:id="@+id/control_message"
28 android:layout_width="wrap_content" 28 android:layout_width="wrap_content"
29 android:layout_height="wrap_content" 29 android:layout_height="wrap_content"
30 android:textSize="@dimen/infobar_text_size" /> 30 android:textSize="@dimen/infobar_text_size"
31 android:textColor="@color/default_text_color" />
31 32
32 <TextView 33 <TextView
33 android:id="@+id/control_secondary_message" 34 android:id="@+id/control_secondary_message"
34 android:layout_width="wrap_content" 35 android:layout_width="wrap_content"
35 android:layout_height="wrap_content" 36 android:layout_height="wrap_content"
36 android:textSize="@dimen/infobar_text_size" 37 android:textSize="@dimen/infobar_text_size"
37 android:textColor="@color/infobar_descriptive_text_color" /> 38 android:textColor="@color/infobar_descriptive_text_color" />
38 39
39 </org.chromium.chrome.browser.widget.DualControlLayout> 40 </org.chromium.chrome.browser.widget.DualControlLayout>
40 41
41 </LinearLayout> 42 </LinearLayout>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698