ControlContainer is now a child of CompositorViewHolder

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
index c7223de735e4d6fc44d15b1df8ee86fc3a27dfef..cd0116965e0f419c8a5d8c1324ebba38a39aaab9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -22,9 +22,11 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.StrictMode;
 import android.os.SystemClock;
+import android.support.design.widget.CoordinatorLayout.LayoutParams;
 import android.support.v7.app.AlertDialog;
 import android.util.DisplayMetrics;
 import android.util.Pair;
+import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -60,6 +62,7 @@ import org.chromium.chrome.browser.blimp.ChromeBlimpClientContextDelegate;
 import org.chromium.chrome.browser.bookmarks.BookmarkModel;
 import org.chromium.chrome.browser.bookmarks.BookmarkUtils;
 import org.chromium.chrome.browser.compositor.CompositorViewHolder;
+import org.chromium.chrome.browser.compositor.CompositorViewHolderBehavior;
 import org.chromium.chrome.browser.compositor.layouts.Layout;
 import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
 import org.chromium.chrome.browser.compositor.layouts.LayoutManagerDocument;
@@ -378,8 +381,19 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
                 if (controlContainerLayoutId != NO_CONTROL_CONTAINER) {
                     ViewStub toolbarContainerStub =
                             ((ViewStub) findViewById(R.id.control_container_stub));
+
                     toolbarContainerStub.setLayoutResource(controlContainerLayoutId);
-                    toolbarContainerStub.inflate();
+                    View toolbar = toolbarContainerStub.inflate();
+
+                    LayoutParams lp = new LayoutParams(toolbar.getLayoutParams());
+                    lp.setBehavior(new CompositorViewHolderBehavior());

[Ian Wen, 2016/12/09 19:03:06]

This can be done in xml. Please follow the example of
omnibox_results_container_stub.

[mdjones, 2016/12/09 21:48:11]

Done.

+                    // If the control container is at the bottom apply Gravity.BOTTOM here since
+                    // it is not respected in the XML while the ViewStub in between the
+                    // CompositorViewHolder and ControlContainer.
+                    if (controlContainerLayoutId == R.layout.bottom_control_container) {
+                        lp.gravity = Gravity.BOTTOM;
+                    }
+                    toolbar.setLayoutParams(lp);
                 }
 
                 // It cannot be assumed that the result of toolbarContainerStub.inflate() will be