summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-05-19 19:15:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-19 19:15:13 +0000
commit7f6b7a510953d51db85c4364fea64b2505758408 (patch)
tree5c2400a0db5b7cf91e83d92d538585564d3ffefe
parentda25da3d557177febb9c7afb78e04b1ef4a45f17 (diff)
parent096e4d5355054cbc62d5cc33fdf445e54d3bf198 (diff)
downloadandroid_packages_apps_Trebuchet-7f6b7a510953d51db85c4364fea64b2505758408.tar.gz
android_packages_apps_Trebuchet-7f6b7a510953d51db85c4364fea64b2505758408.tar.bz2
android_packages_apps_Trebuchet-7f6b7a510953d51db85c4364fea64b2505758408.zip
Merge "Updating the widget error view" into ub-launcher3-burnaby
-rw-r--r--res/drawable-hdpi/bg_appwidget_error.9.pngbin1285 -> 0 bytes
-rw-r--r--res/drawable-mdpi/bg_appwidget_error.9.pngbin794 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/bg_appwidget_error.9.pngbin2387 -> 0 bytes
-rw-r--r--res/layout/appwidget_error.xml13
-rw-r--r--res/values/colors.xml2
5 files changed, 5 insertions, 10 deletions
diff --git a/res/drawable-hdpi/bg_appwidget_error.9.png b/res/drawable-hdpi/bg_appwidget_error.9.png
deleted file mode 100644
index 4da3195d4..000000000
--- a/res/drawable-hdpi/bg_appwidget_error.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/bg_appwidget_error.9.png b/res/drawable-mdpi/bg_appwidget_error.9.png
deleted file mode 100644
index 493c0d454..000000000
--- a/res/drawable-mdpi/bg_appwidget_error.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/bg_appwidget_error.9.png b/res/drawable-xhdpi/bg_appwidget_error.9.png
deleted file mode 100644
index b792cc847..000000000
--- a/res/drawable-xhdpi/bg_appwidget_error.9.png
+++ /dev/null
Binary files differ
diff --git a/res/layout/appwidget_error.xml b/res/layout/appwidget_error.xml
index 03d4ae424..708ece4e2 100644
--- a/res/layout/appwidget_error.xml
+++ b/res/layout/appwidget_error.xml
@@ -15,15 +15,12 @@
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="10dip"
- android:paddingBottom="10dip"
- android:paddingLeft="20dip"
- android:paddingRight="20dip"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:gravity="center"
- android:background="@drawable/bg_appwidget_error"
+ android:elevation="2dp"
+ android:background="@drawable/quantum_panel_dark"
android:textAppearance="?android:attr/textAppearanceMediumInverse"
- android:textColor="@color/appwidget_error_color"
+ android:textColor="@color/widgets_view_item_text_color"
android:text="@string/gadget_error_text"
/>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 0ba55f326..1e89615af 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -27,8 +27,6 @@
<color name="focused_background">#80c6c5c5</color>
- <color name="appwidget_error_color">#FCCC</color>
-
<color name="workspace_icon_text_color">#FFF</color>
<color name="quantum_panel_text_color">#FF666666</color>