Merge change 21112 into donut
* changes:
Fix memory leaks in music app. Fixes http://b/issue?id=2046569
diff --git a/res/drawable-finger/appwidget_bg.9.png b/res/drawable-finger/appwidget_bg.9.png
index 7ace816..688d131 100644
--- a/res/drawable-finger/appwidget_bg.9.png
+++ b/res/drawable-finger/appwidget_bg.9.png
Binary files differ
diff --git a/res/drawable-land-finger/appwidget_bg.9.png b/res/drawable-land-finger/appwidget_bg.9.png
deleted file mode 100644
index a289712..0000000
--- a/res/drawable-land-finger/appwidget_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/layout-finger/album_appwidget.xml b/res/layout-finger/album_appwidget.xml
index 7258ff5..f1d1eba 100644
--- a/res/layout-finger/album_appwidget.xml
+++ b/res/layout-finger/album_appwidget.xml
@@ -15,10 +15,9 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/appwidget_bg"
- >
+ android:layout_width="@dimen/appwidget_width"
+ android:layout_height="@dimen/appwidget_height"
+ android:background="@drawable/appwidget_bg">
<ImageButton
android:id="@+id/control_play"
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
new file mode 100644
index 0000000..2ced533
--- /dev/null
+++ b/res/values-land/dimens.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+
+<resources>
+ <dimen name="appwidget_width">421dip</dimen>
+ <dimen name="appwidget_height">68dip</dimen>
+</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 539b64f..bcb0d64 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -17,4 +17,7 @@
<resources>
<!-- Size of widget album art cutout -->
<dimen name="appwidget_cutout">198dip</dimen>
+
+ <dimen name="appwidget_width">311dip</dimen>
+ <dimen name="appwidget_height">80dip</dimen>
</resources>
