From 8db246f15ce6f4d2c7f7f7ec51c68b87e9a66c2f Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Tue, 8 Mar 2016 13:59:39 +0100
Subject: [PATCH] Squashed 'libs/editor/' changes from 2b066be..eb8d070

eb8d070 Merge pull request #311 from wordpress-mobile/issue/310-add-labels-to-link-edittext
6c99e24 wrap DialogLink's EditText inside TextInputLayout

git-subtree-dir: libs/editor
git-subtree-split: eb8d070e013e9c9ce30d20ba28825831b4689e79
---
 WordPressEditor/build.gradle                  |  1 +
 .../src/main/res/layout/dialog_link.xml       | 40 ++++++++++++-------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/WordPressEditor/build.gradle b/WordPressEditor/build.gradle
index d13b34740cec..a8109cc0c5e3 100644
--- a/WordPressEditor/build.gradle
+++ b/WordPressEditor/build.gradle
@@ -48,6 +48,7 @@ android {
 dependencies {
     compile 'com.android.support:appcompat-v7:23.1.1'
     compile 'com.android.support:support-v4:23.1.1'
+    compile 'com.android.support:design:23.1.1'
     compile 'org.wordpress:utils:1.9.0'
 
     // Test libraries
diff --git a/WordPressEditor/src/main/res/layout/dialog_link.xml b/WordPressEditor/src/main/res/layout/dialog_link.xml
index 910dc40c213d..c303163d0632 100644
--- a/WordPressEditor/src/main/res/layout/dialog_link.xml
+++ b/WordPressEditor/src/main/res/layout/dialog_link.xml
@@ -1,31 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:tools="http://schemas.android.com/tools"
-              android:orientation="vertical"
               android:layout_width="wrap_content"
-              android:layout_height="wrap_content">
+              android:layout_height="wrap_content"
+              android:orientation="vertical">
+
+    <android.support.design.widget.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/link_dialog_margin_inner"
+        android:layout_marginLeft="@dimen/link_dialog_margin_outer"
+        android:layout_marginRight="@dimen/link_dialog_margin_outer"
+        android:layout_marginTop="@dimen/link_dialog_margin_outer">
 
         <EditText
             android:id="@+id/linkURL"
-            android:inputType="textUri"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/link_dialog_margin_outer"
-            android:layout_marginLeft="@dimen/link_dialog_margin_outer"
-            android:layout_marginRight="@dimen/link_dialog_margin_outer"
-            android:layout_marginBottom="@dimen/link_dialog_margin_inner"
             android:hint="@string/link_enter_url"
             android:imeOptions="actionNext"
-            tools:ignore="HardcodedText"/>
+            android:inputType="textUri"
+            tools:ignore="HardcodedText" />
+    </android.support.design.widget.TextInputLayout>
+
+    <android.support.design.widget.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/link_dialog_margin_outer"
+        android:layout_marginLeft="@dimen/link_dialog_margin_outer"
+        android:layout_marginRight="@dimen/link_dialog_margin_outer"
+        android:layout_marginTop="@dimen/link_dialog_margin_inner">
 
         <EditText
             android:id="@+id/linkText"
-            android:inputType="text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/link_dialog_margin_inner"
-            android:layout_marginLeft="@dimen/link_dialog_margin_outer"
-            android:layout_marginRight="@dimen/link_dialog_margin_outer"
-            android:layout_marginBottom="@dimen/link_dialog_margin_outer"
-            android:hint="@string/link_enter_url_text" />
-</LinearLayout>
\ No newline at end of file
+            android:hint="@string/link_enter_url_text"
+            android:inputType="text" />
+    </android.support.design.widget.TextInputLayout>
+</LinearLayout>