am 90b0749b: Adopt new AppWidget assets, per http://b/2038594.

Merge commit '90b0749beca5718fd4ece268297866deb7f42c10'

* commit '90b0749beca5718fd4ece268297866deb7f42c10':
  Adopt new AppWidget assets, per http://b/2038594.

6 files changed, 30 insertions, 11 deletions

diff --git a/res/drawable-land/photo_frame.9.png b/res/drawable-land/photo_frame.9.png
deleted file mode 100644
index 7d479b5..0000000
--- a/res/drawable-land/photo_frame.9.png
+++ /dev/null
diff --git a/res/drawable/appwidget_bg.9.png b/res/drawable/appwidget_bg.9.png
new file mode 100644
index 0000000..2e7ddbc
--- /dev/null
+++ b/res/drawable/appwidget_bg.9.png
diff --git a/res/drawable/photo_frame.9.png b/res/drawable/photo_frame.9.png
deleted file mode 100644
index 9dbf362..0000000
--- a/res/drawable/photo_frame.9.png
+++ /dev/null
diff --git a/res/layout/photo_frame.xml b/res/layout/photo_frame.xml
index 00ab25d..ca84481 100644
--- a/res/layout/photo_frame.xml
+++ b/res/layout/photo_frame.xml
@@ -4,9 +4,9 @@
      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.
@@ -15,23 +15,20 @@
 -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@drawable/photo_frame"
-    >
+    android:layout_width="@dimen/appwidget_width"
+    android:layout_height="@dimen/appwidget_height"
+    android:background="@drawable/appwidget_bg">
 
     <ImageView
         android:id="@+id/photo"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:scaleType="center"
-        android:cropToPadding="true"
-        />
+        android:cropToPadding="true" />
 
     <ImageView
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:background="@drawable/photo_inner"
-        />
+        android:background="@drawable/photo_inner" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
new file mode 100644
index 0000000..2cdfb99
--- /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">206dip</dimen>
+    <dimen name="appwidget_height">143dip</dimen>
+</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 5ec105b..8bcda80 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -19,4 +19,6 @@
 -->
 <resources>
     <dimen name="hint_y_offset">64dip</dimen>
+    <dimen name="appwidget_width">151dip</dimen>
+    <dimen name="appwidget_height">196dip</dimen>
 </resources>