From ed406de802bd26ac399e888142664d129d1d86c4 Mon Sep 17 00:00:00 2001 From: Brian Nicholson Date: Fri, 23 May 2014 09:50:17 -0700 Subject: [PATCH] Bug 997447 - Add FloatingHintEditText widget. r=lucasr --- mobile/android/base/moz.build | 1 + .../resources/color/floating_hint_text.xml | 8 + .../base/resources/values-v11/themes.xml | 1 + .../android/base/resources/values/attrs.xml | 4 + .../android/base/resources/values/colors.xml | 1 + .../android/base/resources/values/styles.xml | 4 + .../android/base/resources/values/themes.xml | 1 + .../base/widget/FloatingHintEditText.java | 168 ++++++++++++++++++ 8 files changed, 188 insertions(+) create mode 100644 mobile/android/base/resources/color/floating_hint_text.xml create mode 100644 mobile/android/base/widget/FloatingHintEditText.java diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build index c3fb48d0e51..bc5f00adbd5 100644 --- a/mobile/android/base/moz.build +++ b/mobile/android/base/moz.build @@ -415,6 +415,7 @@ gbjar.sources += [ 'widget/DoorHanger.java', 'widget/EllipsisTextView.java', 'widget/FaviconView.java', + 'widget/FloatingHintEditText.java', 'widget/FlowLayout.java', 'widget/GeckoActionProvider.java', 'widget/GeckoPopupMenu.java', diff --git a/mobile/android/base/resources/color/floating_hint_text.xml b/mobile/android/base/resources/color/floating_hint_text.xml new file mode 100644 index 00000000000..dcec219f4c7 --- /dev/null +++ b/mobile/android/base/resources/color/floating_hint_text.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/mobile/android/base/resources/values-v11/themes.xml b/mobile/android/base/resources/values-v11/themes.xml index 42c207926be..a2f034ab434 100644 --- a/mobile/android/base/resources/values-v11/themes.xml +++ b/mobile/android/base/resources/values-v11/themes.xml @@ -60,6 +60,7 @@ @drawable/ab_copy @drawable/ab_paste @drawable/ab_select_all + @style/FloatingHintEditText diff --git a/mobile/android/base/resources/values/attrs.xml b/mobile/android/base/resources/values/attrs.xml index deff0790a5e..0c27b8751dd 100644 --- a/mobile/android/base/resources/values/attrs.xml +++ b/mobile/android/base/resources/values/attrs.xml @@ -244,5 +244,9 @@ + + + + diff --git a/mobile/android/base/resources/values/colors.xml b/mobile/android/base/resources/values/colors.xml index a4ec2edd134..58b43352e1f 100644 --- a/mobile/android/base/resources/values/colors.xml +++ b/mobile/android/base/resources/values/colors.xml @@ -50,6 +50,7 @@ #666666 #7F828A + #33b5e5 #FF9500 diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml index 8d2a7e53e4d..76a4a54f2ba 100644 --- a/mobile/android/base/resources/values/styles.xml +++ b/mobile/android/base/resources/values/styles.xml @@ -684,4 +684,8 @@ @dimen/menu_item_row_height + + diff --git a/mobile/android/base/resources/values/themes.xml b/mobile/android/base/resources/values/themes.xml index 6a3430d4b34..0033cf8cbc2 100644 --- a/mobile/android/base/resources/values/themes.xml +++ b/mobile/android/base/resources/values/themes.xml @@ -92,6 +92,7 @@ @style/Widget.MenuItemActionBar @style/GeckoActionBar.Button @style/Widget.MenuItemSecondaryActionBar + @style/FloatingHintEditText