diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-05-19 19:15:12 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-19 19:15:13 +0000 |
commit | 7f6b7a510953d51db85c4364fea64b2505758408 (patch) | |
tree | 5c2400a0db5b7cf91e83d92d538585564d3ffefe | |
parent | da25da3d557177febb9c7afb78e04b1ef4a45f17 (diff) | |
parent | 096e4d5355054cbc62d5cc33fdf445e54d3bf198 (diff) | |
download | android_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.png | bin | 1285 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/bg_appwidget_error.9.png | bin | 794 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/bg_appwidget_error.9.png | bin | 2387 -> 0 bytes | |||
-rw-r--r-- | res/layout/appwidget_error.xml | 13 | ||||
-rw-r--r-- | res/values/colors.xml | 2 |
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 Binary files differdeleted file mode 100644 index 4da3195d4..000000000 --- a/res/drawable-hdpi/bg_appwidget_error.9.png +++ /dev/null diff --git a/res/drawable-mdpi/bg_appwidget_error.9.png b/res/drawable-mdpi/bg_appwidget_error.9.png Binary files differdeleted file mode 100644 index 493c0d454..000000000 --- a/res/drawable-mdpi/bg_appwidget_error.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/bg_appwidget_error.9.png b/res/drawable-xhdpi/bg_appwidget_error.9.png Binary files differdeleted file mode 100644 index b792cc847..000000000 --- a/res/drawable-xhdpi/bg_appwidget_error.9.png +++ /dev/null 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> |