Upstream oodles of Chrome for Android code into Chromium.

chrome/android/java_staging/res/layout/eb_add_edit_folder_activity.xml

Index: chrome/android/java_staging/res/layout/eb_add_edit_folder_activity.xml
diff --git a/chrome/android/java_staging/res/layout/eb_add_edit_folder_activity.xml b/chrome/android/java_staging/res/layout/eb_add_edit_folder_activity.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c4ff36e566aae9e949b154ef45bf166eeb298aca
--- /dev/null
+++ b/chrome/android/java_staging/res/layout/eb_add_edit_folder_activity.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file. -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:chrome="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:minHeight="@dimen/enhanced_bookmark_minimum_dialog_size_tablet"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/toolbar_height_no_shadow"
+        android:background="@color/default_primary_color" >
+
+        <ImageButton
+            android:id="@+id/back"
+            style="@style/EnhancedBookmarkTitleBarButton"
+            android:contentDescription="@string/accessibility_toolbar_btn_back"
+            android:src="@drawable/eb_back_normal" />
+
+        <TextView
+            android:id="@+id/dialog_title"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:textColor="#343434"
+            android:textSize="20sp" />
+
+        <ImageButton
+            android:id="@+id/save"
+            style="@style/EnhancedBookmarkTitleBarButton"
+            android:contentDescription="@string/save"
+            android:src="@drawable/eb_check_gray" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="4dp"
+        android:layout_marginBottom="-4dp"
+        android:background="@drawable/eb_title_bar_shadow" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:clipToPadding="false" >
+
+            <EditText
+                android:id="@+id/folder_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="12dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginTop="24dp"
+                android:hint="@string/title"
+                android:imeOptions="flagNoExtractUi"
+                android:inputType="textCapSentences|textAutoCorrect"
+                android:textSize="24sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="24dp"
+                android:text="@string/enhanced_bookmark_parent_folder"
+                android:textColor="@color/enhanced_bookmark_detail_section"
+                android:textSize="14sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/parent_folder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="32dp"
+                android:textColor="@color/dark_mode_tint"
+                android:textSize="16sp" />
+
+            <org.chromium.chrome.browser.widget.ButtonCompat
+                android:id="@+id/delete"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:layout_marginBottom="32dp"
+                android:text="@string/delete"
+                android:textAllCaps="true"
+                android:textColor="#343434"
+                android:textSize="14sp"
+                chrome:buttonColor="@color/default_primary_color" />
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>