Merge "Remove calendar controls from 7 inch portrait" into jb-dev
diff --git a/res/layout-sw600dp/edit_event.xml b/res/layout-sw600dp/edit_event.xml
index 0dbf000..0e2a8fa 100644
--- a/res/layout-sw600dp/edit_event.xml
+++ b/res/layout-sw600dp/edit_event.xml
@@ -21,6 +21,7 @@
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:layout_marginTop="0dip"
+ android:background="#FFE9E9E9"
style="@style/EditEvent_Layout">
<TextView
android:id="@+id/loading_message"
diff --git a/res/layout-sw600dp/edit_event_1.xml b/res/layout-sw600dp/edit_event_1.xml
index 1e0488e..ec4d9e0 100644
--- a/res/layout-sw600dp/edit_event_1.xml
+++ b/res/layout-sw600dp/edit_event_1.xml
@@ -380,6 +380,7 @@
android:id="@+id/reminder_items_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginRight="8dip"
android:orientation="vertical"
android:gravity="center_vertical|right" />
<Button
diff --git a/res/layout/edit_reminder_item.xml b/res/layout/edit_reminder_item.xml
index d44782b..834364f 100644
--- a/res/layout/edit_reminder_item.xml
+++ b/res/layout/edit_reminder_item.xml
@@ -20,7 +20,7 @@
android:paddingTop="1dip"
android:gravity="center_vertical"
android:layout_height="wrap_content"
- android:minHeight="36dip">
+ android:minHeight="@dimen/edit_reminder_min_size">
<Spinner android:id="@+id/reminder_minutes_value"
style="@style/TextAppearance.EditEvent_Value"
diff --git a/res/values-w600dp-h879dp/dimens.xml b/res/values-w600dp-h879dp/dimens.xml
index d3d0968..28c8179 100644
--- a/res/values-w600dp-h879dp/dimens.xml
+++ b/res/values-w600dp-h879dp/dimens.xml
@@ -41,4 +41,6 @@
<dimen name="edit_event_view_width">600dip</dimen>
<dimen name="edit_event_view_padding_left">16dip</dimen>
<dimen name="edit_event_view_padding_right">16dip</dimen>
+ <dimen name="edit_reminder_min_size">48dip</dimen>
+
</resources>
diff --git a/res/values-w960dp-h527dp/dimens.xml b/res/values-w960dp-h527dp/dimens.xml
index dd8d440..563eecc 100644
--- a/res/values-w960dp-h527dp/dimens.xml
+++ b/res/values-w960dp-h527dp/dimens.xml
@@ -38,4 +38,5 @@
<dimen name="widget_day_num_size">42sp</dimen>
<dimen name="widget_day_num_top_padding">-8dip</dimen>
<dimen name="new_event_hint_text_size">14sp</dimen>
+ <dimen name="edit_reminder_min_size">48dip</dimen>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 6228326..4c47e42 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -24,8 +24,8 @@
<string name="attendees_label" msgid="2971281641565729725">"邀请对象"</string>
<string name="today" msgid="8577375020252453006">"今天"</string>
<string name="tomorrow" msgid="614434811813859237">"明天"</string>
- <string name="today_at_time_fmt" msgid="1981279213130049736">"今天<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"明天<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="today_at_time_fmt" msgid="1981279213130049736">"今天 <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="tomorrow_at_time_fmt" msgid="1330779112841767432">"明天 <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="date_time_fmt" msgid="1642972650061946484">"<xliff:g id="DATE">%s</xliff:g>，<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="repeats_label" msgid="7414023871434593196">"重复"</string>
<string name="no_title_label" msgid="302177118061368042">"（无标题）"</string>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4a2bb98..86e8a7e 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -41,6 +41,7 @@
<dimen name="edit_event_view_width">800dip</dimen>
<dimen name="edit_event_view_padding_left">80dip</dimen>
<dimen name="edit_event_view_padding_right">80dip</dimen>
+ <dimen name="edit_reminder_min_size">36dip</dimen>
<dimen name="event_info_text_size">14dip</dimen>
<dimen name="event_info_desc_margin_left">0dip</dimen>
<dimen name="event_info_desc_margin_right">0dip</dimen>
diff --git a/src/com/android/calendar/Utils.java b/src/com/android/calendar/Utils.java
index 5324551..c8944d8 100644
--- a/src/com/android/calendar/Utils.java
+++ b/src/com/android/calendar/Utils.java
@@ -285,7 +285,11 @@
}
public static MatrixCursor matrixCursorFromCursor(Cursor cursor) {
- MatrixCursor newCursor = new MatrixCursor(cursor.getColumnNames());
+ String[] columnNames = cursor.getColumnNames();
+ if (columnNames == null) {
+ columnNames = new String[] {};
+ }
+ MatrixCursor newCursor = new MatrixCursor(columnNames);
int numColumns = cursor.getColumnCount();
String data[] = new String[numColumns];
cursor.moveToPosition(-1);