Introduce support design library to chrome and roll android_tools/

We want several new widgets from the design library:
1. TextInputLayout
2. NavigationView
3. AppBarLayout

This CL adds the gyp target to chrome_java and roll DEPS for the
third_party folder.

BUG=498585

Review URL: https://codereview.chromium.org/1225393002

Cr-Commit-Position: refs/heads/master@{#339073}

6 files changed, 28 insertions, 5 deletions

diff --git a/DEPS b/DEPS
index b219917..9884aaf 100644
--- a/DEPS
+++ b/DEPS
@@ -411,7 +411,7 @@ deps_os = {
      Var('chromium_git') + '/external/android_protobuf.git' + '@' + '999188d0dc72e97f7fe08bb756958a2cf090f4e7',
 
     'src/third_party/android_tools':
-     Var('chromium_git') + '/android_tools.git' + '@' + '21f4bcbd6cd927e4b4227cfde7d5f13486be1236',
+     Var('chromium_git') + '/android_tools.git' + '@' + '2abd22b08cd757f88362f44b02484de43e4b9611',
 
     'src/third_party/apache-mime4j':
      Var('chromium_git') + '/chromium/deps/apache-mime4j.git' + '@' + '28cb1108bff4b6cf0a2e86ff58b3d025934ebe3a',
diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn
index 7d6d5eb..df2368b 100644
--- a/build/secondary/third_party/android_tools/BUILD.gn
+++ b/build/secondary/third_party/android_tools/BUILD.gn
@@ -28,6 +28,23 @@ android_java_prebuilt("uiautomator_java") {
   jar_path = "$android_sdk/uiautomator.jar"
 }
 
+android_resources("android_support_design_resources") {
+  v14_skip = true
+  resource_dirs = [ "$android_sdk_root/extras/android/support/design/res" ]
+  deps = [
+    ":android_support_v7_appcompat_resources",
+  ]
+  custom_package = "android.support.design"
+}
+
+android_java_prebuilt("android_support_design_java") {
+  deps = [
+    ":android_support_v7_appcompat_java",
+    ":android_support_design_resources",
+  ]
+  jar_path = "$android_sdk_root/extras/android/support/design/libs/android-support-design.jar"
+}
+
 android_java_prebuilt("android_support_v13_java") {
   jar_path =
       "$android_sdk_root/extras/android/support/v13/android-support-v13.jar"
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index cd88626..39dde94 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -141,6 +141,7 @@ android_library("chrome_java") {
     "//third_party/android_protobuf:protobuf_nano_javalib",
     "//third_party/android_swipe_refresh:android_swipe_refresh_java",
     "//third_party/android_tools:android_gcm_java",
+    "//third_party/android_tools:android_support_design_java",
     "//third_party/android_tools:android_support_v13_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//third_party/android_tools:android_support_v7_mediarouter_java",
diff --git a/chrome/android/java/res/layout/eb_edit.xml b/chrome/android/java/res/layout/eb_edit.xml
index f60e169..5665c65 100644
--- a/chrome/android/java/res/layout/eb_edit.xml
+++ b/chrome/android/java/res/layout/eb_edit.xml
@@ -35,20 +35,22 @@
             android:layout_marginBottom="8dp"
             android:orientation="vertical" >
 
-            <org.chromium.chrome.browser.widget.FloatLabelLayout
+            <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
 
+                <!-- android:text is set here is to avoid UI jumping. -->
                 <org.chromium.chrome.browser.widget.EmptyAlertEditText
                     android:id="@+id/title_text"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="@string/bookmark_name"
+                    android:text="@string/bookmark_name"
                     android:imeOptions="flagNoExtractUi"
                     android:inputType="textCapSentences|textAutoCorrect"
                     android:singleLine="true"
                     chrome:alertMessage="@string/bookmark_missing_title" />
-            </org.chromium.chrome.browser.widget.FloatLabelLayout>
+            </android.support.design.widget.TextInputLayout>
 
             <TextView
                 android:layout_width="wrap_content"
@@ -70,7 +72,7 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 android:textColor="@color/dark_mode_tint" />
 
-            <org.chromium.chrome.browser.widget.FloatLabelLayout
+            <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
 
@@ -79,11 +81,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="@string/bookmark_url"
+                    android:text="@string/bookmark_url"
                     android:imeOptions="flagNoExtractUi"
                     android:inputType="textUri"
                     android:singleLine="true"
                     chrome:alertMessage="@string/bookmark_missing_url" />
-            </org.chromium.chrome.browser.widget.FloatLabelLayout>
+            </android.support.design.widget.TextInputLayout>
         </LinearLayout>
     </ScrollView>
 </LinearLayout>
\ No newline at end of file
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index f0bcc0a..395b3a3 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -612,6 +612,7 @@
             '../third_party/android_media/android_media.gyp:android_media_java',
             '../third_party/android_protobuf/android_protobuf.gyp:protobuf_nano_javalib',
             '../third_party/android_swipe_refresh/android_swipe_refresh.gyp:android_swipe_refresh_java',
+            '../third_party/android_tools/android_tools.gyp:android_support_design_javalib',
             '../third_party/android_tools/android_tools.gyp:android_support_v7_appcompat_javalib',
             '../third_party/android_tools/android_tools.gyp:android_support_v7_mediarouter_javalib',
             '../third_party/android_tools/android_tools.gyp:android_support_v7_recyclerview_javalib',
diff --git a/tools/android/eclipse/.classpath b/tools/android/eclipse/.classpath
index 4400f24..50c5870 100644
--- a/tools/android/eclipse/.classpath
+++ b/tools/android/eclipse/.classpath
@@ -163,6 +163,7 @@ to the classpath for downstream development. See "additional_entries" below.
     </classpathentry>
     <classpathentry kind="lib" path="third_party/android_tools/sdk/platforms/android-22/data/layoutlib.jar" sourcepath="third_party/android_tools/sdk/sources/"/>
     <classpathentry kind="lib" path="third_party/android_tools/sdk/platforms/android-22/uiautomator.jar" sourcepath="third_party/android_tools/sdk/sources"/>
+    <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/android/support/design/libs/android-support-design.jar" sourcepath="third_party/android_tools/sdk/sources"/>
     <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/android/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar" sourcepath="third_party/android_tools/sdk/sources"/>
     <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/android/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar" sourcepath="third_party/android_tools/sdk/sources"/>
     <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/android/support/v13/android-support-v13.jar" sourcepath="third_party/android_tools/sdk/sources"/>