diff options
author | Michael Jurka <mikejurka@google.com> | 2011-10-27 11:40:13 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-27 11:40:13 -0700 |
commit | c5deca7c6a4139875e9b86c951f2b81b2db9f816 (patch) | |
tree | cc5ac381c66dd366a80c9fd273edae8ce8060175 /res | |
parent | 0191f1c9d8cd01eb40f96db23dab07961ae886c2 (diff) | |
parent | 8db7000140d3c35be92a4e07cf54ea6ec4ae3030 (diff) | |
download | android_packages_apps_Trebuchet-c5deca7c6a4139875e9b86c951f2b81b2db9f816.tar.gz android_packages_apps_Trebuchet-c5deca7c6a4139875e9b86c951f2b81b2db9f816.tar.bz2 android_packages_apps_Trebuchet-c5deca7c6a4139875e9b86c951f2b81b2db9f816.zip |
Merge "Asset updates" into ics-mr1
Diffstat (limited to 'res')
32 files changed, 3 insertions, 5 deletions
diff --git a/res/drawable-hdpi/default_widget_preview_holo.9.png b/res/drawable-hdpi/default_widget_preview_holo.9.png Binary files differindex 6745e4945..0b4a6343f 100644 --- a/res/drawable-hdpi/default_widget_preview_holo.9.png +++ b/res/drawable-hdpi/default_widget_preview_holo.9.png diff --git a/res/drawable-hdpi/portal_container_holo.9.png b/res/drawable-hdpi/portal_container_holo.9.png Binary files differindex c4976124c..557ee5a98 100644 --- a/res/drawable-hdpi/portal_container_holo.9.png +++ b/res/drawable-hdpi/portal_container_holo.9.png diff --git a/res/drawable-hdpi/portal_ring_inner_holo.png b/res/drawable-hdpi/portal_ring_inner_holo.png Binary files differindex 477e56977..e95322156 100644 --- a/res/drawable-hdpi/portal_ring_inner_holo.png +++ b/res/drawable-hdpi/portal_ring_inner_holo.png diff --git a/res/drawable-hdpi/portal_ring_inner_nolip_holo.png b/res/drawable-hdpi/portal_ring_inner_nolip_holo.png Binary files differnew file mode 100644 index 000000000..257fc691b --- /dev/null +++ b/res/drawable-hdpi/portal_ring_inner_nolip_holo.png diff --git a/res/drawable-hdpi/portal_ring_outer_holo.png b/res/drawable-hdpi/portal_ring_outer_holo.png Binary files differindex 2b635cb1b..2bf0c0d18 100644 --- a/res/drawable-hdpi/portal_ring_outer_holo.png +++ b/res/drawable-hdpi/portal_ring_outer_holo.png diff --git a/res/drawable-hdpi/portal_ring_rest.png b/res/drawable-hdpi/portal_ring_rest.png Binary files differindex b9ef77829..93e3f6be3 100644 --- a/res/drawable-hdpi/portal_ring_rest.png +++ b/res/drawable-hdpi/portal_ring_rest.png diff --git a/res/drawable-hdpi/widget_info_bg.9.png b/res/drawable-hdpi/widget_info_bg.9.png Binary files differdeleted file mode 100644 index df4cea9dc..000000000 --- a/res/drawable-hdpi/widget_info_bg.9.png +++ /dev/null diff --git a/res/drawable-mdpi/default_widget_preview_holo.9.png b/res/drawable-mdpi/default_widget_preview_holo.9.png Binary files differindex f9a97263a..0bfdaef58 100644 --- a/res/drawable-mdpi/default_widget_preview_holo.9.png +++ b/res/drawable-mdpi/default_widget_preview_holo.9.png diff --git a/res/drawable-mdpi/portal_container_holo.9.png b/res/drawable-mdpi/portal_container_holo.9.png Binary files differindex 30b0fa0fa..9a4751730 100644 --- a/res/drawable-mdpi/portal_container_holo.9.png +++ b/res/drawable-mdpi/portal_container_holo.9.png diff --git a/res/drawable-mdpi/portal_ring_inner_holo.png b/res/drawable-mdpi/portal_ring_inner_holo.png Binary files differindex eccea20c4..3d704af65 100644 --- a/res/drawable-mdpi/portal_ring_inner_holo.png +++ b/res/drawable-mdpi/portal_ring_inner_holo.png diff --git a/res/drawable-mdpi/portal_ring_inner_nolip_holo.png b/res/drawable-mdpi/portal_ring_inner_nolip_holo.png Binary files differnew file mode 100644 index 000000000..1dbdbe841 --- /dev/null +++ b/res/drawable-mdpi/portal_ring_inner_nolip_holo.png diff --git a/res/drawable-mdpi/portal_ring_outer_holo.png b/res/drawable-mdpi/portal_ring_outer_holo.png Binary files differindex c5142171d..3a7303ec5 100644 --- a/res/drawable-mdpi/portal_ring_outer_holo.png +++ b/res/drawable-mdpi/portal_ring_outer_holo.png diff --git a/res/drawable-mdpi/portal_ring_rest.png b/res/drawable-mdpi/portal_ring_rest.png Binary files differindex 3ab8b368f..259e48c0c 100644 --- a/res/drawable-mdpi/portal_ring_rest.png +++ b/res/drawable-mdpi/portal_ring_rest.png diff --git a/res/drawable-mdpi/widget_info_bg.9.png b/res/drawable-mdpi/widget_info_bg.9.png Binary files differdeleted file mode 100644 index c8c62b58f..000000000 --- a/res/drawable-mdpi/widget_info_bg.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/default_widget_preview_holo.9.png b/res/drawable-xhdpi/default_widget_preview_holo.9.png Binary files differindex 87cc9753b..42d57d843 100644 --- a/res/drawable-xhdpi/default_widget_preview_holo.9.png +++ b/res/drawable-xhdpi/default_widget_preview_holo.9.png diff --git a/res/drawable-xhdpi/portal_container_holo.9.png b/res/drawable-xhdpi/portal_container_holo.9.png Binary files differindex 0935a4b75..4ae8d223b 100644 --- a/res/drawable-xhdpi/portal_container_holo.9.png +++ b/res/drawable-xhdpi/portal_container_holo.9.png diff --git a/res/drawable-xhdpi/portal_ring_inner_holo.png b/res/drawable-xhdpi/portal_ring_inner_holo.png Binary files differindex bc34314ed..b9867c0d9 100644 --- a/res/drawable-xhdpi/portal_ring_inner_holo.png +++ b/res/drawable-xhdpi/portal_ring_inner_holo.png diff --git a/res/drawable-xhdpi/portal_ring_inner_nolip_holo.png b/res/drawable-xhdpi/portal_ring_inner_nolip_holo.png Binary files differnew file mode 100644 index 000000000..e218713e4 --- /dev/null +++ b/res/drawable-xhdpi/portal_ring_inner_nolip_holo.png diff --git a/res/drawable-xhdpi/portal_ring_outer_holo.png b/res/drawable-xhdpi/portal_ring_outer_holo.png Binary files differindex a7b5b6013..286bee039 100644 --- a/res/drawable-xhdpi/portal_ring_outer_holo.png +++ b/res/drawable-xhdpi/portal_ring_outer_holo.png diff --git a/res/drawable-xhdpi/portal_ring_rest.png b/res/drawable-xhdpi/portal_ring_rest.png Binary files differindex ba0a652e7..ab5c2c479 100644 --- a/res/drawable-xhdpi/portal_ring_rest.png +++ b/res/drawable-xhdpi/portal_ring_rest.png diff --git a/res/drawable-xhdpi/widget_info_bg.9.png b/res/drawable-xhdpi/widget_info_bg.9.png Binary files differdeleted file mode 100644 index 19eff0589..000000000 --- a/res/drawable-xhdpi/widget_info_bg.9.png +++ /dev/null diff --git a/res/drawable-xlarge-hdpi/portal_ring_inner_holo.png b/res/drawable-xlarge-hdpi/portal_ring_inner_holo.png Binary files differindex 659c23ba9..b3be4720a 100644 --- a/res/drawable-xlarge-hdpi/portal_ring_inner_holo.png +++ b/res/drawable-xlarge-hdpi/portal_ring_inner_holo.png diff --git a/res/drawable-xlarge-hdpi/portal_ring_inner_nolip_holo.png b/res/drawable-xlarge-hdpi/portal_ring_inner_nolip_holo.png Binary files differnew file mode 100644 index 000000000..96b981c50 --- /dev/null +++ b/res/drawable-xlarge-hdpi/portal_ring_inner_nolip_holo.png diff --git a/res/drawable-xlarge-hdpi/portal_ring_outer_holo.png b/res/drawable-xlarge-hdpi/portal_ring_outer_holo.png Binary files differindex 8ec67df5a..bc13a26cd 100644 --- a/res/drawable-xlarge-hdpi/portal_ring_outer_holo.png +++ b/res/drawable-xlarge-hdpi/portal_ring_outer_holo.png diff --git a/res/drawable-xlarge-mdpi/portal_ring_inner_holo.png b/res/drawable-xlarge-mdpi/portal_ring_inner_holo.png Binary files differindex 8e3dd576a..319c07427 100644 --- a/res/drawable-xlarge-mdpi/portal_ring_inner_holo.png +++ b/res/drawable-xlarge-mdpi/portal_ring_inner_holo.png diff --git a/res/drawable-xlarge-mdpi/portal_ring_inner_nolip_holo.png b/res/drawable-xlarge-mdpi/portal_ring_inner_nolip_holo.png Binary files differnew file mode 100644 index 000000000..8537714aa --- /dev/null +++ b/res/drawable-xlarge-mdpi/portal_ring_inner_nolip_holo.png diff --git a/res/drawable-xlarge-mdpi/portal_ring_outer_holo.png b/res/drawable-xlarge-mdpi/portal_ring_outer_holo.png Binary files differindex 94e067775..365dcfce9 100644 --- a/res/drawable-xlarge-mdpi/portal_ring_outer_holo.png +++ b/res/drawable-xlarge-mdpi/portal_ring_outer_holo.png diff --git a/res/drawable-xlarge-xhdpi/portal_ring_inner_holo.png b/res/drawable-xlarge-xhdpi/portal_ring_inner_holo.png Binary files differindex a013e5a60..d4ce45f12 100644 --- a/res/drawable-xlarge-xhdpi/portal_ring_inner_holo.png +++ b/res/drawable-xlarge-xhdpi/portal_ring_inner_holo.png diff --git a/res/drawable-xlarge-xhdpi/portal_ring_inner_nolip_holo.png b/res/drawable-xlarge-xhdpi/portal_ring_inner_nolip_holo.png Binary files differnew file mode 100644 index 000000000..9aa13c987 --- /dev/null +++ b/res/drawable-xlarge-xhdpi/portal_ring_inner_nolip_holo.png diff --git a/res/drawable-xlarge-xhdpi/portal_ring_outer_holo.png b/res/drawable-xlarge-xhdpi/portal_ring_outer_holo.png Binary files differindex 7bdaaf39b..0106cd6e0 100644 --- a/res/drawable-xlarge-xhdpi/portal_ring_outer_holo.png +++ b/res/drawable-xlarge-xhdpi/portal_ring_outer_holo.png diff --git a/res/layout-sw720dp/apps_customize_widget.xml b/res/layout-sw720dp/apps_customize_widget.xml index 31c3fbe58..e707ef774 100644 --- a/res/layout-sw720dp/apps_customize_widget.xml +++ b/res/layout-sw720dp/apps_customize_widget.xml @@ -32,8 +32,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="4dp" - android:orientation="vertical" - android:background="@drawable/widget_info_bg"> + android:orientation="vertical"> <!-- The name of the widget. --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/widget_name" @@ -54,7 +53,7 @@ <!-- The original dimensions of the widget (can't be the same text as above due to different style. --> - <TextView xmlns:android="http://schemas.android.com/apk/res/android" + <TextView android:id="@+id/widget_dims" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/res/layout/apps_customize_widget.xml b/res/layout/apps_customize_widget.xml index 7cc4177de..2c11c1db9 100644 --- a/res/layout/apps_customize_widget.xml +++ b/res/layout/apps_customize_widget.xml @@ -32,8 +32,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="4dp" - android:orientation="horizontal" - android:background="@drawable/widget_info_bg"> + android:orientation="horizontal"> <!-- The name of the widget. --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/widget_name" |