Inflate toolbar layouts in ControlContainer

Inflate toolbar layouts in ControlContainer

Previously, the layout of the toolbar was decided and inflated by
Android (phone vs. tablet). This is now handled by the control
container.

BUG=652892
Committed: https://crrev.com/4d1c4d3f99187dcedea2df6d956933866294b143
Cr-Commit-Position: refs/heads/master@{#425054}

[mdjones, 2016-10-10 21:10:38]

mdjones@chromium.org changed reviewers:
+ dfalcantara@chromium.org

[mdjones, 2016-10-10 21:10:38]

ptal

[gone, 2016-10-11 18:24:21]

https://chromiumcodereview.appspot.com/2410603002/diff/1/chrome/android/java/...
File
chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java
(right):

https://chromiumcodereview.appspot.com/2410603002/diff/1/chrome/android/java/...
chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java:187:
if (mToolbar instanceof CustomTabToolbar) {
/methinks you broke this.

https://chromiumcodereview.appspot.com/2410603002/diff/1/chrome/android/java/...
chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java:197:
* Since the toolbar is now dynamically inflated, this is not know until later.
Set the toolbar after it has been dynamically inflated?

[mdjones, 2016-10-12 01:25:44]

https://codereview.chromium.org/2410603002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java
(right):

https://codereview.chromium.org/2410603002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java:187:
if (mToolbar instanceof CustomTabToolbar) {
On 2016/10/11 18:24:21, dfalcantara wrote:
> /methinks you broke this.

eeyup. Fixed

https://codereview.chromium.org/2410603002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java:197:
* Since the toolbar is now dynamically inflated, this is not know until later.
On 2016/10/11 18:24:21, dfalcantara wrote:
> Set the toolbar after it has been dynamically inflated?

Done.

[gone, 2016-10-12 17:37:46]

lgtm

https://chromiumcodereview.appspot.com/2410603002/diff/20001/chrome/android/j...
File chrome/android/java/res/layout/custom_tabs_toolbar.xml (right):

https://chromiumcodereview.appspot.com/2410603002/diff/20001/chrome/android/j...
chrome/android/java/res/layout/custom_tabs_toolbar.xml:10:
android:layout_height="@dimen/custom_tabs_control_container_height"
I don't think layout_width/height values actually have an effect when they're
the root.

https://chromiumcodereview.appspot.com/2410603002/diff/20001/chrome/android/j...
File chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
(right):

https://chromiumcodereview.appspot.com/2410603002/diff/20001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java:367: //
Inflate the correct toolbar layout for the device.
Feels weird to not null check the controlContainer here, but I guess it's
developer error if you try to have a toolbar without a control container.

https://chromiumcodereview.appspot.com/2410603002/diff/20001/chrome/android/j...
File
chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java
(right):

https://chromiumcodereview.appspot.com/2410603002/diff/20001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java:162:
private int mToolbarActualHeightPx;
nit: Move the privates below the private finals?

https://chromiumcodereview.appspot.com/2410603002/diff/20001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java:172:

nit: remove newline?

[mdjones, 2016-10-12 20:17:15]

https://codereview.chromium.org/2410603002/diff/20001/chrome/android/java/res...
File chrome/android/java/res/layout/custom_tabs_toolbar.xml (right):

https://codereview.chromium.org/2410603002/diff/20001/chrome/android/java/res...
chrome/android/java/res/layout/custom_tabs_toolbar.xml:10:
android:layout_height="@dimen/custom_tabs_control_container_height"
On 2016/10/12 17:37:45, dfalcantara wrote:
> I don't think layout_width/height values actually have an effect when they're
> the root.

Not having these caused an inflation exception, I think it has something to do
with them now being dynamically inflated.

https://codereview.chromium.org/2410603002/diff/20001/chrome/android/java/src...
File chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
(right):

https://codereview.chromium.org/2410603002/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java:367: //
Inflate the correct toolbar layout for the device.
On 2016/10/12 17:37:45, dfalcantara wrote:
> Feels weird to not null check the controlContainer here, but I guess it's
> developer error if you try to have a toolbar without a control container.

Added check.

https://codereview.chromium.org/2410603002/diff/20001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java
(right):

https://codereview.chromium.org/2410603002/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java:162:
private int mToolbarActualHeightPx;
On 2016/10/12 17:37:45, dfalcantara wrote:
> nit: Move the privates below the private finals?

Done.

https://codereview.chromium.org/2410603002/diff/20001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java:172:

On 2016/10/12 17:37:45, dfalcantara wrote:
> nit: remove newline?

Done.

[mdjones, 2016-10-12 20:28:17]

The CQ bit was checked by mdjones@chromium.org

[mdjones, 2016-10-12 20:28:18]

The patchset sent to the CQ was uploaded after l-g-t-m from
dfalcantara@chromium.org
Link to the patchset: https://codereview.chromium.org/2410603002/#ps40001
(title: "address comments")

[commit-bot: I haz the power, 2016-10-12 20:29:00]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-12 22:08:48]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-10-12 22:08:49]

Try jobs failed on following builders:
  linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)

[mdjones, 2016-10-12 23:35:31]

The CQ bit was checked by mdjones@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-10-12 23:35:48]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[mdjones, 2016-10-13 00:56:06]

The CQ bit was checked by mdjones@chromium.org

[mdjones, 2016-10-13 00:56:06]

The patchset sent to the CQ was uploaded after l-g-t-m from
dfalcantara@chromium.org
Link to the patchset: https://codereview.chromium.org/2410603002/#ps80001
(title: "use correct api")

[commit-bot: I haz the power, 2016-10-13 00:56:17]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-13 02:16:21]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-10-13 02:16:21]

Try jobs failed on following builders:
  linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)

[mdjones, 2016-10-13 15:51:44]

The CQ bit was checked by mdjones@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-10-13 15:52:11]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-13 16:20:27]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-10-13 16:20:28]

Dry run: This issue passed the CQ dry run.

[mdjones, 2016-10-13 16:26:16]

The CQ bit was checked by mdjones@chromium.org

[mdjones, 2016-10-13 16:26:16]

The patchset sent to the CQ was uploaded after l-g-t-m from
dfalcantara@chromium.org
Link to the patchset: https://codereview.chromium.org/2410603002/#ps100001
(title: "fix ID")

[commit-bot: I haz the power, 2016-10-13 16:26:31]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-13 16:33:21]

Committed patchset #6 (id:100001)

[commit-bot: I haz the power, 2016-10-13 16:35:40]

Description was changed from

==========
Inflate toolbar layouts in ControlContainer

Previously, the layout of the toolbar was decided and inflated by
Android (phone vs. tablet). This is now handled by the control
container.

BUG=652892
==========

to

==========
Inflate toolbar layouts in ControlContainer

Previously, the layout of the toolbar was decided and inflated by
Android (phone vs. tablet). This is now handled by the control
container.

BUG=652892

Committed: https://crrev.com/4d1c4d3f99187dcedea2df6d956933866294b143
Cr-Commit-Position: refs/heads/master@{#425054}
==========

[commit-bot: I haz the power, 2016-10-13 16:35:41]

Patchset 6 (id:??) landed as
https://crrev.com/4d1c4d3f99187dcedea2df6d956933866294b143
Cr-Commit-Position: refs/heads/master@{#425054}