diff options
| author | ianwen <ianwen@chromium.org> | 2015-07-16 11:01:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-16 18:02:33 +0000 |
| commit | f322e3cef1ab700bdda8518efe40b474769b94cf (patch) | |
| tree | cd5f60e8fc505b8009c47fbb8c79772fa1f5c1ee /chrome | |
| parent | a84c0e6e9875a605f5ef9a1f78f59c4cadb43836 (diff) | |
| download | chromium_src-f322e3cef1ab700bdda8518efe40b474769b94cf.zip chromium_src-f322e3cef1ab700bdda8518efe40b474769b94cf.tar.gz chromium_src-f322e3cef1ab700bdda8518efe40b474769b94cf.tar.bz2 | |
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}
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/android/BUILD.gn | 1 | ||||
| -rw-r--r-- | chrome/android/java/res/layout/eb_edit.xml | 11 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 1 |
3 files changed, 9 insertions, 4 deletions
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', |