summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2009-08-06 22:05:49 -0700
committerJeff Sharkey <jsharkey@android.com>2009-08-06 22:37:08 -0700
commit6c3287a4d3a8e02322b501034db3133a3ccb1051 (patch)
treec6dd617dd6584342ef7ade52ba56b8dad4325c73
parent09cda9cfaf658d85a5316cf6f07d5f8c038a942e (diff)
downloadpackages_apps_settings-6c3287a4d3a8e02322b501034db3133a3ccb1051.zip
packages_apps_settings-6c3287a4d3a8e02322b501034db3133a3ccb1051.tar.gz
packages_apps_settings-6c3287a4d3a8e02322b501034db3133a3ccb1051.tar.bz2
Adopt new AppWidget assets, per http://b/2038594.
-rw-r--r--res/drawable-land/appwidget_bg.9.pngbin17458 -> 0 bytes
-rw-r--r--res/drawable/appwidget_bg.9.pngbin16577 -> 1885 bytes
-rw-r--r--res/drawable/appwidget_inner_default.9.pngbin179 -> 172 bytes
-rw-r--r--res/drawable/appwidget_inner_pressed.9.pngbin301 -> 285 bytes
-rw-r--r--res/drawable/appwidget_inner_selected.9.pngbin306 -> 293 bytes
-rw-r--r--res/layout-land/widget.xml7
-rw-r--r--res/layout/widget.xml7
-rwxr-xr-xres/values-land/dimens.xml20
-rwxr-xr-xres/values/dimens.xml18
9 files changed, 46 insertions, 6 deletions
diff --git a/res/drawable-land/appwidget_bg.9.png b/res/drawable-land/appwidget_bg.9.png
deleted file mode 100644
index a289712..0000000
--- a/res/drawable-land/appwidget_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/appwidget_bg.9.png b/res/drawable/appwidget_bg.9.png
index 7ace816..688d131 100644
--- a/res/drawable/appwidget_bg.9.png
+++ b/res/drawable/appwidget_bg.9.png
Binary files differ
diff --git a/res/drawable/appwidget_inner_default.9.png b/res/drawable/appwidget_inner_default.9.png
index 2c37b89..f7e9db4 100644
--- a/res/drawable/appwidget_inner_default.9.png
+++ b/res/drawable/appwidget_inner_default.9.png
Binary files differ
diff --git a/res/drawable/appwidget_inner_pressed.9.png b/res/drawable/appwidget_inner_pressed.9.png
index b23c3ae..e2b62b7 100644
--- a/res/drawable/appwidget_inner_pressed.9.png
+++ b/res/drawable/appwidget_inner_pressed.9.png
Binary files differ
diff --git a/res/drawable/appwidget_inner_selected.9.png b/res/drawable/appwidget_inner_selected.9.png
index 474d717..b677391 100644
--- a/res/drawable/appwidget_inner_selected.9.png
+++ b/res/drawable/appwidget_inner_selected.9.png
Binary files differ
diff --git a/res/layout-land/widget.xml b/res/layout-land/widget.xml
index 1e7fb5f..fdafd7d 100644
--- a/res/layout-land/widget.xml
+++ b/res/layout-land/widget.xml
@@ -16,8 +16,9 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/appwidget_width"
+ android:layout_height="@dimen/appwidget_height"
+ android:gravity="center"
android:background="@drawable/appwidget_bg" >
<ImageButton
@@ -54,7 +55,7 @@
<ImageButton
android:id="@+id/btn_brightness"
- android:layout_width="78dip"
+ android:layout_width="79dip"
android:layout_height="fill_parent"
android:background="@drawable/appwidget_inner"
android:layout_gravity="center_horizontal"
diff --git a/res/layout/widget.xml b/res/layout/widget.xml
index 3a223b6..dc40469 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -16,8 +16,9 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/appwidget_width"
+ android:layout_height="@dimen/appwidget_height"
+ android:gravity="center"
android:background="@drawable/appwidget_bg" >
<ImageButton
@@ -54,7 +55,7 @@
<ImageButton
android:id="@+id/btn_brightness"
- android:layout_width="58dip"
+ android:layout_width="57dip"
android:layout_height="fill_parent"
android:background="@drawable/appwidget_inner"
android:layout_gravity="center_horizontal"
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
new file mode 100755
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 790f86b..9626837 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -1,6 +1,24 @@
<?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="vpn_connect_margin_right">10sp</dimen>
<dimen name="vpn_connect_normal_text_size">16sp</dimen>
<dimen name="vpn_connect_input_box_label_width">90sp</dimen>
+
+ <dimen name="appwidget_width">311dip</dimen>
+ <dimen name="appwidget_height">80dip</dimen>
</resources>