Automated import from //branches/donutburger/...@142721,142721

diff --git a/res/drawable-finger/appwidget_bg.9.png b/res/drawable-finger/appwidget_bg.9.png
index 7bec3c7..7ace816 100644 (file)
Binary files a/res/drawable-finger/appwidget_bg.9.png and b/res/drawable-finger/appwidget_bg.9.png differ

diff --git a/res/drawable-finger/appwidget_inner.9.png b/res/drawable-finger/appwidget_inner.9.png
index 4e60c5b..de628a2 100644 (file)
Binary files a/res/drawable-finger/appwidget_inner.9.png and b/res/drawable-finger/appwidget_inner.9.png differ

diff --git a/res/drawable-finger/appwidget_led0.png b/res/drawable-finger/appwidget_led0.png
deleted file mode 100644 (file)
index dd7537f..0000000
Binary files a/res/drawable-finger/appwidget_led0.png and /dev/null differ

diff --git a/res/drawable-finger/appwidget_led1.png b/res/drawable-finger/appwidget_led1.png
deleted file mode 100644 (file)
index 7e03413..0000000
Binary files a/res/drawable-finger/appwidget_led1.png and /dev/null differ

diff --git a/res/drawable-finger/appwidget_led2.png b/res/drawable-finger/appwidget_led2.png
deleted file mode 100644 (file)
index ee09602..0000000
Binary files a/res/drawable-finger/appwidget_led2.png and /dev/null differ

diff --git a/res/drawable-finger/appwidget_led3.png b/res/drawable-finger/appwidget_led3.png
deleted file mode 100644 (file)
index 3bd8c3d..0000000
Binary files a/res/drawable-finger/appwidget_led3.png and /dev/null differ

diff --git a/res/drawable-finger/appwidget_led4.png b/res/drawable-finger/appwidget_led4.png
deleted file mode 100644 (file)
index 80d9ab8..0000000
Binary files a/res/drawable-finger/appwidget_led4.png and /dev/null differ

diff --git a/res/drawable-finger/appwidget_led5.png b/res/drawable-finger/appwidget_led5.png
deleted file mode 100644 (file)
index 49c5f04..0000000
Binary files a/res/drawable-finger/appwidget_led5.png and /dev/null differ

diff --git a/res/drawable-finger/appwidget_led_anim.xml b/res/drawable-finger/appwidget_led_anim.xml
deleted file mode 100644 (file)
index 58ae196..0000000
--- a/res/drawable-finger/appwidget_led_anim.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<animation-list
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:oneshot="false">
-    <item android:drawable="@drawable/appwidget_led1" android:duration="500" />
-    <item android:drawable="@drawable/appwidget_led3" android:duration="500" />
-    <item android:drawable="@drawable/appwidget_led2" android:duration="500" />
-    <item android:drawable="@drawable/appwidget_led5" android:duration="500" />
-    <item android:drawable="@drawable/appwidget_led4" android:duration="500" />
-    <item android:drawable="@drawable/appwidget_led3" android:duration="500" />
-</animation-list>

diff --git a/res/drawable-land-finger/appwidget_bg.9.png b/res/drawable-land-finger/appwidget_bg.9.png
index 24288d2..a289712 100644 (file)
Binary files a/res/drawable-land-finger/appwidget_bg.9.png and b/res/drawable-land-finger/appwidget_bg.9.png differ

diff --git a/res/layout-finger/album_appwidget.xml b/res/layout-finger/album_appwidget.xml
index 7c2c409..7258ff5 100644 (file)
--- a/res/layout-finger/album_appwidget.xml
+++ b/res/layout-finger/album_appwidget.xml
@@ -24,6 +24,7 @@
         android:id="@+id/control_play"
         android:layout_width="48dip"
         android:layout_height="fill_parent"
+        android:layout_marginLeft="2dip"
         android:src="@drawable/appwidget_play"
         android:background="@android:color/transparent"
         android:scaleType="center"
@@ -39,39 +40,21 @@
         android:scaleType="center"
         />
 
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/album_appwidget"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_toRightOf="@id/control_play"
         android:layout_toLeftOf="@id/control_next"
         android:background="@drawable/appwidget_inner_dither"
+        android:orientation="vertical"
+        android:gravity="center_vertical"
         >
 
-        <com.android.server.status.AnimatedImageView
-            android:id="@+id/led"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="5dip"
-            android:layout_marginRight="10dip"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
-            android:src="@drawable/appwidget_led0"
-            />
-
-        <ImageView
-            android:visibility="invisible"
-            android:id="@+id/anchor"
-            android:layout_width="0dip"
-            android:layout_height="7dip"
-            android:layout_centerVertical="true"
-            />
-
         <TextView
             android:id="@+id/title"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/anchor"
             android:layout_marginLeft="10dip"
             android:layout_marginRight="20dip"
             android:textColor="@color/appwidget_text"
@@ -87,9 +70,8 @@
             android:id="@+id/artist"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/anchor"
             android:layout_marginLeft="10dip"
-            android:layout_marginRight="40dip"
+            android:layout_marginRight="20dip"
             android:textColor="@color/appwidget_text"
             android:textSize="14sp"
             android:singleLine="true"
@@ -98,6 +80,6 @@
             android:ellipsize="none"
             />
 
-    </RelativeLayout>
+    </LinearLayout>
 
 </RelativeLayout>

diff --git a/src/com/android/music/MediaAppWidgetProvider.java b/src/com/android/music/MediaAppWidgetProvider.java
index 3bef910..b265efb 100644 (file)
--- a/src/com/android/music/MediaAppWidgetProvider.java
+++ b/src/com/android/music/MediaAppWidgetProvider.java
@@ -138,10 +138,8 @@ public class MediaAppWidgetProvider extends AppWidgetProvider {
         final boolean playing = service.isPlaying();
         if (playing) {
             views.setImageViewResource(R.id.control_play, R.drawable.appwidget_pause);
-            views.setImageViewResource(R.id.led, R.drawable.appwidget_led_anim);
         } else {
             views.setImageViewResource(R.id.control_play, R.drawable.appwidget_play);
-            views.setImageViewResource(R.id.led, R.drawable.appwidget_led0);
         }
 
         // Link actions buttons to intents