chrome/android/java/res/layout/infobar_control_icon_with_description.xml - Issue 1543913002: Add support for images with descriptions to infobars

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1543913002: Add support for images with descriptions to infobars (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased, ready to review Created 4 years, 11 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 | « no previous file | chrome/android/java/res/layout/infobar_control_toggle.xml » ('j') | chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarControlLayout.java » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

	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

	4 found in the LICENSE file. -->

	5

	6 <LinearLayout

	7 xmlns:android="http://schemas.android.com/apk/res/android"

	8 android:layout_width="match_parent"

	9 android:layout_height="wrap_content"

	10 android:minHeight="36dp"

	11 android:gravity="center_vertical">

	12

	13 <ImageView

	14 android:id="@+id/control_icon"

	15 android:layout_width="wrap_content"

	16 android:layout_height="wrap_content"

	17 android:layout_marginEnd="@dimen/infobar_control_margin_between_items"

	18 android:scaleType="centerInside"

	19 android:contentDescription="@null" />

	20

	21 <org.chromium.chrome.browser.infobar.InfoBarDualControlLayout

	22 xmlns:android="http://schemas.android.com/apk/res/android"

	23 android:layout_width="0dp"

	24 android:layout_height="wrap_content"

	25 android:layout_weight="1" >

	26

	27 <TextView

	28 android:id="@+id/control_message"

	29 android:layout_width="wrap_content"

	30 android:layout_height="wrap_content"

	31 android:gravity="center_vertical"
	newt (away) 2016/01/05 21:20:53 This gravity doesn't do anything since height is w This gravity doesn't do anything since height is wrap_content, right? Same for the TextView below. gone 2016/01/05 21:43:54 Done. Show quoted text On 2016/01/05 21:20:53, newt wrote: > This gravity doesn't do anything since height is wrap_content, right? Same for > the TextView below. Done.
	32 android:textSize="@dimen/infobar_text_size"

	33 android:textColor="@color/default_text_color" />

	34

	35 <TextView

	36 android:id="@+id/control_secondary_message"

	37 android:layout_width="wrap_content"

	38 android:layout_height="wrap_content"

	39 android:gravity="center_vertical"

	40 android:textSize="@dimen/infobar_text_size"

	41 android:textColor="@color/infobar_descriptive_text_color" />

	42

	43 </org.chromium.chrome.browser.infobar.InfoBarDualControlLayout>

	44

	45 </LinearLayout>

OLD	NEW