New agenda view support for tablet
Change-Id: I18c1df3d02d6e12b8f65dd67830fd25a00f538c6
diff --git a/res/layout/actionbar_pulldown_menu_top_button.xml b/res/layout/actionbar_pulldown_menu_top_button.xml
index 5d2c614..1ce2633 100644
--- a/res/layout/actionbar_pulldown_menu_top_button.xml
+++ b/res/layout/actionbar_pulldown_menu_top_button.xml
@@ -18,7 +18,7 @@
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="48dip"
- android:layout_gravity="center_vertical"
+ android:gravity="center_vertical"
android:layout_marginLeft="16dip">
<TextView android:id="@+id/top_button_weekday"
diff --git a/res/layout/contact_item.xml b/res/layout/contact_item.xml
index 7f70137..0362ddd 100644
--- a/res/layout/contact_item.xml
+++ b/res/layout/contact_item.xml
@@ -18,48 +18,57 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:minHeight="48dip">
+ android:orientation="vertical">
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="48dip"
+ android:orientation="horizontal" >
- <QuickContactBadge
- android:id="@+id/badge"
- android:layout_marginLeft="5dip"
- android:layout_marginRight="5dip"
- android:layout_gravity="center_vertical"
- android:layout_width="40dip"
- android:layout_height="40dip"
- android:src="@drawable/ic_contact_picture"
- style="?android:attr/quickContactBadgeStyleWindowMedium" />
+ <TextView
+ android:id="@+id/name"
+ android:layout_height="wrap_content"
+ android:layout_width="0dip"
+ android:layout_weight="1"
+ android:textSize="18sp"
+ android:layout_gravity="center_vertical"
+ android:gravity="center_vertical"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:focusable="true"
+ style="@style/TextAppearance.EditEvent_Value" />
- <TextView
- android:id="@+id/name"
- android:layout_height="wrap_content"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:layout_gravity="center_vertical"
- android:gravity="center_vertical"
- android:paddingRight="3dip"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:focusable="true"
- style="@style/TextAppearance.EditEvent_Value" />
+ <ImageView
+ android:id="@+id/presence"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:paddingRight="3dip"
+ android:scaleType="fitXY"
+ android:visibility="gone" />
- <ImageView
- android:id="@+id/presence"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingRight="3dip"
- android:scaleType="fitXY"
- android:visibility="gone" />
+ <ImageButton
+ android:id="@+id/contact_remove"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:paddingRight="3dip"
+ android:visibility="gone"
+ android:contentDescription="@string/accessibility_remove_attendee"
+ style="@style/MinusButton" />
- <ImageButton
- android:id="@+id/contact_remove"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingRight="3dip"
+ <QuickContactBadge
+ android:id="@+id/badge"
+ android:layout_gravity="center_vertical"
+ android:layout_width="48dip"
+ android:layout_height="48dip"
+ android:src="@drawable/ic_contact_picture"
+ style="?android:attr/quickContactBadgeStyleWindowMedium" />
+ </LinearLayout>
+
+ <View
+ android:id="@+id/contact_separator"
+ android:background="?android:attr/listDivider"
android:visibility="gone"
- android:contentDescription="@string/accessibility_remove_attendee"
- style="@style/MinusButton" />
+ android:layout_height="1px"
+ android:layout_width="match_parent" />
</LinearLayout>
diff --git a/res/layout/event_info.xml b/res/layout/event_info.xml
index 9b9eceb..24c78e4 100644
--- a/res/layout/event_info.xml
+++ b/res/layout/event_info.xml
@@ -195,8 +195,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:layout_marginTop="-2dip"
- android:layout_marginBottom="13dip"
+ android:layout_marginTop="8dip"
+ android:layout_marginBottom="8dip"
android:orientation="horizontal">
<RadioButton
android:id="@+id/response_yes"
@@ -237,6 +237,7 @@
android:paddingLeft="10dip"
android:maxLines="2"
android:ellipsize="end"
+ android.visibility="gone"
style="?android:attr/textAppearanceMedium" />
<com.android.calendar.event.AttendeesView
android:id="@+id/long_attendee_list"
diff --git a/res/layout/event_info_label.xml b/res/layout/event_info_label.xml
new file mode 100644
index 0000000..15224cb
--- /dev/null
+++ b/res/layout/event_info_label.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<TextView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="32dip"
+ android:background="#FFDDDDDD"
+ android:layout_gravity="center_vertical"
+ android:layout_marginTop="4dip"
+ android:layout_marginBottom="4dip"
+ android:paddingLeft="8dip"
+ style="?android:attr/textAppearanceMedium"
+ android:textColor="@android:color/black" />
+