New widgets
diff --git a/res/drawable-hdpi/appwidget_bg.9.png b/res/drawable-hdpi/appwidget_bg.9.png
index 6861664..d9af8fb 100644
--- a/res/drawable-hdpi/appwidget_bg.9.png
+++ b/res/drawable-hdpi/appwidget_bg.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_bg_focus.9.png b/res/drawable-hdpi/appwidget_bg_focus.9.png
index 3fd098a..ee098af 100644
--- a/res/drawable-hdpi/appwidget_bg_focus.9.png
+++ b/res/drawable-hdpi/appwidget_bg_focus.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_bg_press.9.png b/res/drawable-hdpi/appwidget_bg_press.9.png
index dbc6235..03ca2a1 100644
--- a/res/drawable-hdpi/appwidget_bg_press.9.png
+++ b/res/drawable-hdpi/appwidget_bg_press.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_calendar_bgtop_blue.9.png b/res/drawable-hdpi/appwidget_calendar_bgtop_blue.9.png
new file mode 100644
index 0000000..c55f808
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_calendar_bgtop_blue.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_bg.9.png b/res/drawable-mdpi/appwidget_bg.9.png
index 8e7e3d7..8049191 100644
--- a/res/drawable-mdpi/appwidget_bg.9.png
+++ b/res/drawable-mdpi/appwidget_bg.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_bg_focus.9.png b/res/drawable-mdpi/appwidget_bg_focus.9.png
index 54ef559..f4bbb08 100644
--- a/res/drawable-mdpi/appwidget_bg_focus.9.png
+++ b/res/drawable-mdpi/appwidget_bg_focus.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_bg_press.9.png b/res/drawable-mdpi/appwidget_bg_press.9.png
index 93f9302..d060b77 100644
--- a/res/drawable-mdpi/appwidget_bg_press.9.png
+++ b/res/drawable-mdpi/appwidget_bg_press.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_calendar_bgtop_blue.9.png b/res/drawable-mdpi/appwidget_calendar_bgtop_blue.9.png
new file mode 100644
index 0000000..af0f466
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_calendar_bgtop_blue.9.png
Binary files differ
diff --git a/res/drawable/appwidget_bg.xml b/res/drawable/appwidget_background.xml
similarity index 100%
rename from res/drawable/appwidget_bg.xml
rename to res/drawable/appwidget_background.xml
diff --git a/res/layout-land/agenda_appwidget.xml b/res/layout-land/agenda_appwidget.xml
index 9da7a5e..eb9734b 100644
--- a/res/layout-land/agenda_appwidget.xml
+++ b/res/layout-land/agenda_appwidget.xml
@@ -18,10 +18,20 @@
android:id="@+id/agenda_appwidget"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="@drawable/appwidget_bg"
+ android:background="@drawable/appwidget_background"
android:focusable="true"
android:clickable="true">
+ <ImageView
+ android:id="@+id/divider"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_alignParentLeft="true"
+ android:background="@drawable/appwidget_calendar_bgtop_blue"
+ android:visibility="gone"
+ />
+
<TextView
android:id="@+id/no_events"
android:layout_width="fill_parent"
@@ -33,21 +43,19 @@
android:textColor="@color/appwidget_no_events"
android:text="@string/gadget_no_events"
/>
-
+
<TextView
android:id="@+id/day_of_month"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
- android:layout_marginRight="7dip"
+ android:layout_marginRight="10dip"
+ android:layout_marginTop="8dip"
android:textSize="30sp"
android:textStyle="bold"
android:textColor="@color/appwidget_date"
android:singleLine="true"
- android:shadowColor="@color/appwidget_date_shadow"
- android:shadowDy="1"
- android:shadowRadius="0.9"
android:visibility="gone"
/>
@@ -55,31 +63,15 @@
android:id="@+id/day_of_week"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@id/day_of_month"
android:layout_alignBottom="@id/day_of_month"
android:layout_alignBaseline="@id/day_of_month"
- android:layout_marginLeft="7dip"
+ android:layout_marginLeft="10dip"
android:textSize="17sp"
android:textStyle="bold"
android:textColor="@color/appwidget_date"
android:singleLine="true"
- android:shadowColor="@color/appwidget_date_shadow"
- android:shadowDy="1"
- android:shadowRadius="0.9"
- android:visibility="gone"
- />
-
- <ImageView
- android:id="@+id/divider"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/day_of_week"
- android:layout_marginTop="2dip"
- android:layout_marginLeft="3dip"
- android:layout_marginRight="3dip"
- android:background="@drawable/white_list_rule_cal"
android:visibility="gone"
/>
@@ -88,9 +80,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/divider"
- android:layout_marginTop="5dip"
- android:layout_marginLeft="7dip"
- android:layout_marginRight="7dip"
+ android:layout_marginTop="6dip"
+ android:layout_marginLeft="10dip"
+ android:layout_marginRight="10dip"
android:textSize="14sp"
android:textStyle="bold"
android:textColor="@color/appwidget_when"
@@ -103,9 +95,9 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
- android:paddingBottom="4dip"
- android:layout_marginLeft="7dip"
- android:layout_marginRight="7dip"
+ android:paddingBottom="6dip"
+ android:layout_marginLeft="10dip"
+ android:layout_marginRight="10dip"
android:textSize="11sp"
android:textColor="@color/appwidget_where"
android:singleLine="true"
@@ -120,8 +112,8 @@
android:layout_toRightOf="@+id/when"
android:layout_alignParentRight="true"
android:layout_marginTop="5dip"
- android:layout_marginLeft="7dip"
- android:layout_marginRight="7dip"
+ android:layout_marginLeft="10dip"
+ android:layout_marginRight="10dip"
android:gravity="right"
android:textSize="11sp"
android:textColor="@color/appwidget_conflict"
@@ -137,8 +129,8 @@
android:layout_above="@id/where"
android:layout_alignWithParentIfMissing="true"
android:layout_marginTop="3dip"
- android:layout_marginLeft="7dip"
- android:layout_marginRight="7dip"
+ android:layout_marginLeft="10dip"
+ android:layout_marginRight="10dip"
android:textSize="14sp"
android:textStyle="bold"
android:textColor="@color/appwidget_title"
diff --git a/res/layout/agenda_appwidget.xml b/res/layout/agenda_appwidget.xml
index a210337..503fe18 100644
--- a/res/layout/agenda_appwidget.xml
+++ b/res/layout/agenda_appwidget.xml
@@ -16,12 +16,22 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/agenda_appwidget"
- android:layout_width="@dimen/appwidget_width"
- android:layout_height="@dimen/appwidget_height"
- android:background="@drawable/appwidget_bg"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:background="@drawable/appwidget_background"
android:focusable="true"
android:clickable="true">
+ <ImageView
+ android:id="@+id/divider"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_alignParentLeft="true"
+ android:background="@drawable/appwidget_calendar_bgtop_blue"
+ android:visibility="gone"
+ />
+
<TextView
android:id="@+id/no_events"
android:layout_width="fill_parent"
@@ -40,14 +50,12 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
- android:layout_marginRight="7dip"
+ android:layout_marginRight="10dip"
+ android:layout_marginTop="8dip"
android:textSize="30sp"
android:textStyle="bold"
android:textColor="@color/appwidget_date"
android:singleLine="true"
- android:shadowColor="@color/appwidget_date_shadow"
- android:shadowDy="1"
- android:shadowRadius="0.9"
android:visibility="gone"
/>
@@ -55,31 +63,15 @@
android:id="@+id/day_of_week"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@id/day_of_month"
android:layout_alignBottom="@id/day_of_month"
android:layout_alignBaseline="@id/day_of_month"
- android:layout_marginLeft="7dip"
+ android:layout_marginLeft="10dip"
android:textSize="17sp"
android:textStyle="bold"
android:textColor="@color/appwidget_date"
android:singleLine="true"
- android:shadowColor="@color/appwidget_date_shadow"
- android:shadowDy="1"
- android:shadowRadius="0.9"
- android:visibility="gone"
- />
-
- <ImageView
- android:id="@+id/divider"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/day_of_week"
- android:layout_marginTop="2dip"
- android:layout_marginLeft="3dip"
- android:layout_marginRight="3dip"
- android:background="@drawable/white_list_rule_cal"
android:visibility="gone"
/>
@@ -88,9 +80,9 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/divider"
- android:layout_marginTop="5dip"
- android:layout_marginLeft="7dip"
- android:layout_marginRight="7dip"
+ android:layout_marginTop="6dip"
+ android:layout_marginLeft="10dip"
+ android:layout_marginRight="10dip"
android:textSize="14sp"
android:textStyle="bold"
android:textColor="@color/appwidget_when"
@@ -103,9 +95,9 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
- android:layout_marginBottom="4dip"
- android:layout_marginLeft="7dip"
- android:layout_marginRight="7dip"
+ android:layout_marginBottom="6dip"
+ android:layout_marginLeft="10dip"
+ android:layout_marginRight="10dip"
android:textSize="11sp"
android:textColor="@color/appwidget_where"
android:maxLines="2"
@@ -119,8 +111,8 @@
android:layout_above="@id/where"
android:layout_alignWithParentIfMissing="true"
android:layout_marginBottom="4dip"
- android:layout_marginLeft="7dip"
- android:layout_marginRight="7dip"
+ android:layout_marginLeft="10dip"
+ android:layout_marginRight="10dip"
android:textSize="11sp"
android:textColor="@color/appwidget_conflict"
android:singleLine="true"
@@ -136,8 +128,8 @@
android:layout_alignWithParentIfMissing="true"
android:layout_marginTop="3dip"
android:layout_marginBottom="4dip"
- android:layout_marginLeft="7dip"
- android:layout_marginRight="7dip"
+ android:layout_marginLeft="10dip"
+ android:layout_marginRight="10dip"
android:textSize="14sp"
android:textStyle="bold"
android:textColor="@color/appwidget_title"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 959a9f4..fcc4c89 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,12 +15,11 @@
-->
<resources>
- <color name="appwidget_date">#ff666666</color>
- <color name="appwidget_date_shadow">#ffffffff</color>
+ <color name="appwidget_date">#ff000000</color>
- <color name="appwidget_when">#ff000000</color>
+ <color name="appwidget_when">#ff666666</color>
<color name="appwidget_title">#ff000000</color>
- <color name="appwidget_where">#ff000000</color>
+ <color name="appwidget_where">#ff666666</color>
<color name="appwidget_conflict">#ff666666</color>
<color name="appwidget_no_events">#bb000000</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
deleted file mode 100644
index 7eacd29..0000000
--- a/res/values/dimens.xml
+++ /dev/null
@@ -1,20 +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.
--->
-
-<resources>
- <dimen name="appwidget_width">151dip</dimen>
- <dimen name="appwidget_height">196dip</dimen>
-</resources>
diff --git a/src/com/android/providers/calendar/CalendarAppWidgetService.java b/src/com/android/providers/calendar/CalendarAppWidgetService.java
index bbae517..981ffcc 100644
--- a/src/com/android/providers/calendar/CalendarAppWidgetService.java
+++ b/src/com/android/providers/calendar/CalendarAppWidgetService.java
@@ -346,10 +346,12 @@
cursor.moveToPosition(events.primaryRow);
// Color stripe
+ /*
int colorFilter = cursor.getInt(INDEX_COLOR);
views.setTextColor(R.id.when, colorFilter);
views.setTextColor(R.id.title, colorFilter);
views.setTextColor(R.id.where, colorFilter);
+ */
// When
long start = cursor.getLong(INDEX_BEGIN);
