chrome/android/java/src/org/chromium/chrome/browser/widget/BoundedLinearLayout.java - Issue 1206673003: Merge java_staging/src into java/src.

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/src/org/chromium/chrome/browser/widget/BoundedLinearLayout.java

Issue 1206673003: Merge java_staging/src into java/src. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 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/src/org/chromium/chrome/browser/webapps/WebappUrlBar.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/widget/ControlContainer.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 The Chromium Authors. All rights reserved.

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

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 package org.chromium.chrome.browser.widget;	5 package org.chromium.chrome.browser.widget;

6	6

7 import android.content.Context;	7 import android.content.Context;

8 import android.content.res.TypedArray;	8 import android.content.res.TypedArray;

9 import android.util.AttributeSet;	9 import android.util.AttributeSet;

10 import android.widget.LinearLayout;	10 import android.widget.LinearLayout;

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
44 // Limit width to mMaxWidth.	44 // Limit width to mMaxWidth.

45 int widthSize = MeasureSpec.getSize(widthMeasureSpec);	45 int widthSize = MeasureSpec.getSize(widthMeasureSpec);

46 if (mMaxWidth != NO_MAX_WIDTH && widthSize > mMaxWidth) {	46 if (mMaxWidth != NO_MAX_WIDTH && widthSize > mMaxWidth) {

47 int widthMode = MeasureSpec.getMode(widthMeasureSpec);	47 int widthMode = MeasureSpec.getMode(widthMeasureSpec);

48 if (widthMode == MeasureSpec.UNSPECIFIED) widthMode = MeasureSpec.AT _MOST;	48 if (widthMode == MeasureSpec.UNSPECIFIED) widthMode = MeasureSpec.AT _MOST;

49 widthMeasureSpec = MeasureSpec.makeMeasureSpec(mMaxWidth, widthMode) ;	49 widthMeasureSpec = MeasureSpec.makeMeasureSpec(mMaxWidth, widthMode) ;

50 }	50 }

51 super.onMeasure(widthMeasureSpec, heightMeasureSpec);	51 super.onMeasure(widthMeasureSpec, heightMeasureSpec);

52 }	52 }

53 }	53 }

OLD	NEW