Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/android/java/res/layout/eb_edit.xml

Issue 1419553003: Revert "Introduce support design library to chrome and roll android_tools/" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Proper rebase Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- 2 <!--
3 Copyright 2015 The Chromium Authors. All rights reserved. 3 Copyright 2015 The Chromium Authors. All rights reserved.
4 Use of this source code is governed by a BSD-style license that can be 4 Use of this source code is governed by a BSD-style license that can be
5 found in the LICENSE file. 5 found in the LICENSE file.
6 --> 6 -->
7 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 7 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
8 xmlns:chrome="http://schemas.android.com/apk/res-auto" 8 xmlns:chrome="http://schemas.android.com/apk/res-auto"
9 android:layout_width="match_parent" 9 android:layout_width="match_parent"
10 android:layout_height="match_parent" 10 android:layout_height="match_parent"
(...skipping 15 matching lines...) Expand all
26 android:layout_width="match_parent" 26 android:layout_width="match_parent"
27 android:layout_height="match_parent" > 27 android:layout_height="match_parent" >
28 28
29 <LinearLayout 29 <LinearLayout
30 android:layout_width="match_parent" 30 android:layout_width="match_parent"
31 android:layout_height="wrap_content" 31 android:layout_height="wrap_content"
32 android:layout_marginEnd="16dp" 32 android:layout_marginEnd="16dp"
33 android:layout_marginStart="16dp" 33 android:layout_marginStart="16dp"
34 android:orientation="vertical" > 34 android:orientation="vertical" >
35 35
36 <android.support.design.widget.TextInputLayout 36 <org.chromium.chrome.browser.widget.FloatLabelLayout
37 android:layout_width="match_parent" 37 android:layout_width="match_parent"
38 android:layout_height="wrap_content" 38 android:layout_height="wrap_content"
39 android:layout_marginTop="22dp" > 39 android:layout_marginTop="22dp" >
40 <!-- android:text is set here is to avoid UI jumping. -->
41 <org.chromium.chrome.browser.widget.EmptyAlertEditText 40 <org.chromium.chrome.browser.widget.EmptyAlertEditText
42 android:id="@+id/title_text" 41 android:id="@+id/title_text"
43 android:layout_width="match_parent" 42 android:layout_width="match_parent"
44 android:layout_height="wrap_content" 43 android:layout_height="wrap_content"
45 android:hint="@string/bookmark_name" 44 android:hint="@string/bookmark_name"
46 android:text="@string/bookmark_name"
47 android:imeOptions="flagNoExtractUi" 45 android:imeOptions="flagNoExtractUi"
48 android:inputType="textCapSentences|textAutoCorrect" 46 android:inputType="textCapSentences|textAutoCorrect"
49 android:singleLine="true" 47 android:singleLine="true"
50 chrome:alertMessage="@string/bookmark_missing_title" /> 48 chrome:alertMessage="@string/bookmark_missing_title" />
51 </android.support.design.widget.TextInputLayout> 49 </org.chromium.chrome.browser.widget.FloatLabelLayout>
52 50
53 <TextView 51 <TextView
54 android:layout_width="wrap_content" 52 android:layout_width="wrap_content"
55 android:layout_height="wrap_content" 53 android:layout_height="wrap_content"
56 android:layout_marginTop="18dp" 54 android:layout_marginTop="18dp"
57 android:layout_marginStart="3dp" 55 android:layout_marginStart="3dp"
58 android:layout_marginEnd="3dp" 56 android:layout_marginEnd="3dp"
59 android:text="@string/bookmark_folder" 57 android:text="@string/bookmark_folder"
60 android:textAppearance="@style/TextAppearance.AppCompat.Small" 58 android:textAppearance="@style/TextAppearance.AppCompat.Small"
61 android:textSize="12sp" /> 59 android:textSize="12sp" />
62 60
63 <TextView 61 <TextView
64 android:id="@+id/folder_text" 62 android:id="@+id/folder_text"
65 android:layout_width="match_parent" 63 android:layout_width="match_parent"
66 android:layout_height="wrap_content" 64 android:layout_height="wrap_content"
67 android:layout_marginTop="14dp" 65 android:layout_marginTop="14dp"
68 android:layout_marginStart="3dp" 66 android:layout_marginStart="3dp"
69 android:layout_marginEnd="3dp" 67 android:layout_marginEnd="3dp"
70 android:textAppearance="@style/TextAppearance.AppCompat.Medium" 68 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
71 android:textColor="@color/dark_mode_tint" /> 69 android:textColor="@color/dark_mode_tint" />
72 70
73 <android.support.design.widget.TextInputLayout 71 <org.chromium.chrome.browser.widget.FloatLabelLayout
74 android:layout_width="match_parent" 72 android:layout_width="match_parent"
75 android:layout_height="wrap_content" 73 android:layout_height="wrap_content"
76 android:layout_marginTop="24dp" > 74 android:layout_marginTop="24dp" >
77 75
78 <org.chromium.chrome.browser.widget.EmptyAlertEditText 76 <org.chromium.chrome.browser.widget.EmptyAlertEditText
79 android:id="@+id/url_text" 77 android:id="@+id/url_text"
80 android:layout_width="match_parent" 78 android:layout_width="match_parent"
81 android:layout_height="wrap_content" 79 android:layout_height="wrap_content"
82 android:hint="@string/bookmark_url" 80 android:hint="@string/bookmark_url"
83 android:text="@string/bookmark_url"
84 android:imeOptions="flagNoExtractUi" 81 android:imeOptions="flagNoExtractUi"
85 android:inputType="textUri" 82 android:inputType="textUri"
86 android:singleLine="true" 83 android:singleLine="true"
87 chrome:alertMessage="@string/bookmark_missing_url" /> 84 chrome:alertMessage="@string/bookmark_missing_url" />
88 </android.support.design.widget.TextInputLayout> 85 </org.chromium.chrome.browser.widget.FloatLabelLayout>
89 86
90 <LinearLayout 87 <LinearLayout
91 android:id="@+id/offline_page_group" 88 android:id="@+id/offline_page_group"
92 android:layout_width="match_parent" 89 android:layout_width="match_parent"
93 android:layout_height="wrap_content" 90 android:layout_height="wrap_content"
94 android:orientation="horizontal" 91 android:orientation="horizontal"
95 android:layout_marginTop="28dp" 92 android:layout_marginTop="28dp"
96 android:visibility="gone" > 93 android:visibility="gone" >
97 94
98 <TextView 95 <TextView
(...skipping 16 matching lines...) Expand all
115 android:layout_height="wrap_content" 112 android:layout_height="wrap_content"
116 android:layout_gravity="center_vertical" 113 android:layout_gravity="center_vertical"
117 android:textAllCaps="true" 114 android:textAllCaps="true"
118 android:textColor="@color/light_active_color" 115 android:textColor="@color/light_active_color"
119 android:textSize="15sp" /> 116 android:textSize="15sp" />
120 117
121 </LinearLayout> 118 </LinearLayout>
122 </LinearLayout> 119 </LinearLayout>
123 </ScrollView> 120 </ScrollView>
124 </LinearLayout> 121 </LinearLayout>
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698