chrome/android/java/res/layout/eb_edit.xml - Issue 1225393002: Introduce support design library to chrome and roll android_tools/

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

Issue 1225393002: Introduce support design library to chrome and roll android_tools/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix gn again. :( Created 5 years, 5 months 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

OLD	NEW
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 17 matching lines...) Expand all Loading...
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:layout_marginTop="8dp"	34 android:layout_marginTop="8dp"

35 android:layout_marginBottom="8dp"	35 android:layout_marginBottom="8dp"

36 android:orientation="vertical" >	36 android:orientation="vertical" >

37	37

38 <org.chromium.chrome.browser.widget.FloatLabelLayout	38 <android.support.design.widget.TextInputLayout

39 android:layout_width="match_parent"	39 android:layout_width="match_parent"

40 android:layout_height="wrap_content" >	40 android:layout_height="wrap_content" >

41	41

	42 <!-- android:text is set here is to avoid UI jumping. -->

42 <org.chromium.chrome.browser.widget.EmptyAlertEditText	43 <org.chromium.chrome.browser.widget.EmptyAlertEditText

43 android:id="@+id/title_text"	44 android:id="@+id/title_text"

44 android:layout_width="match_parent"	45 android:layout_width="match_parent"

45 android:layout_height="wrap_content"	46 android:layout_height="wrap_content"

46 android:hint="@string/bookmark_name"	47 android:hint="@string/bookmark_name"

	48 android:text="@string/bookmark_name"

47 android:imeOptions="flagNoExtractUi"	49 android:imeOptions="flagNoExtractUi"

48 android:inputType="textCapSentences\|textAutoCorrect"	50 android:inputType="textCapSentences\|textAutoCorrect"

49 android:singleLine="true"	51 android:singleLine="true"

50 chrome:alertMessage="@string/bookmark_missing_title" />	52 chrome:alertMessage="@string/bookmark_missing_title" />

51 </org.chromium.chrome.browser.widget.FloatLabelLayout>	53 </android.support.design.widget.TextInputLayout>

52	54

53 <TextView	55 <TextView

54 android:layout_width="wrap_content"	56 android:layout_width="wrap_content"

55 android:layout_height="wrap_content"	57 android:layout_height="wrap_content"

56 android:paddingEnd="3dp"	58 android:paddingEnd="3dp"

57 android:paddingStart="3dp"	59 android:paddingStart="3dp"

58 android:paddingTop="8dp"	60 android:paddingTop="8dp"

59 android:text="@string/bookmark_folder"	61 android:text="@string/bookmark_folder"

60 android:textAppearance="@style/TextAppearance.AppCompat.Small" / >	62 android:textAppearance="@style/TextAppearance.AppCompat.Small" / >

61	63

62 <TextView	64 <TextView

63 android:id="@+id/folder_text"	65 android:id="@+id/folder_text"

64 android:layout_width="match_parent"	66 android:layout_width="match_parent"

65 android:layout_height="wrap_content"	67 android:layout_height="wrap_content"

66 android:paddingBottom="8dp"	68 android:paddingBottom="8dp"

67 android:paddingEnd="3dp"	69 android:paddingEnd="3dp"

68 android:paddingStart="3dp"	70 android:paddingStart="3dp"

69 android:paddingTop="8dp"	71 android:paddingTop="8dp"

70 android:textAppearance="@style/TextAppearance.AppCompat.Medium"	72 android:textAppearance="@style/TextAppearance.AppCompat.Medium"

71 android:textColor="@color/dark_mode_tint" />	73 android:textColor="@color/dark_mode_tint" />

72	74

73 <org.chromium.chrome.browser.widget.FloatLabelLayout	75 <android.support.design.widget.TextInputLayout

74 android:layout_width="match_parent"	76 android:layout_width="match_parent"

75 android:layout_height="wrap_content" >	77 android:layout_height="wrap_content" >

76	78

77 <org.chromium.chrome.browser.widget.EmptyAlertEditText	79 <org.chromium.chrome.browser.widget.EmptyAlertEditText

78 android:id="@+id/url_text"	80 android:id="@+id/url_text"

79 android:layout_width="match_parent"	81 android:layout_width="match_parent"

80 android:layout_height="wrap_content"	82 android:layout_height="wrap_content"

81 android:hint="@string/bookmark_url"	83 android:hint="@string/bookmark_url"

	84 android:text="@string/bookmark_url"

82 android:imeOptions="flagNoExtractUi"	85 android:imeOptions="flagNoExtractUi"

83 android:inputType="textUri"	86 android:inputType="textUri"

84 android:singleLine="true"	87 android:singleLine="true"

85 chrome:alertMessage="@string/bookmark_missing_url" />	88 chrome:alertMessage="@string/bookmark_missing_url" />

86 </org.chromium.chrome.browser.widget.FloatLabelLayout>	89 </android.support.design.widget.TextInputLayout>

87 </LinearLayout>	90 </LinearLayout>

88 </ScrollView>	91 </ScrollView>

89 </LinearLayout>	92 </LinearLayout>

OLD	NEW

« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/chrome.gyp » ('j') | chrome/chrome.gyp » ('J')