Merge branch 'new_list_style' into newchecklist (aae6ac17) · Commits · e / os / Tasks

AndroidManifest.xml

+15 −0

Original line number	Diff line number	Diff line
		@@ -216,11 +216,17 @@
		<intent-filter>
		<action android:name="android.intent.action.BOOT_COMPLETED" />
		</intent-filter>
		<intent-filter>
		<action android:name="org.dmfs.android.tasks.TASK_START" />
		</intent-filter>
		<intent-filter>
		<action android:name="android.intent.action.QUICKBOOT_POWERON" />
		</intent-filter>
		</receiver>
		<receiver android:name="org.dmfs.provider.tasks.broadcast.DueAlarmBroadcastHandler" >
		<intent-filter>
		<action android:name="org.dmfs.android.tasks.TASK_DUE" />
		</intent-filter>
		<intent-filter>
		<action android:name="android.intent.action.BOOT_COMPLETED" />
		</intent-filter>
		@@ -281,6 +287,15 @@
		<intent-filter>
		<action android:name="org.dmfs.tasks.action.notification.DELAY_1D" />
		</intent-filter>
		<intent-filter>
		<action android:name="org.dmfs.tasks.action.notification.UNDO" />
		</intent-filter>
		<intent-filter>
		<action android:name="org.dmfs.tasks.action.notification.DESTRUCT" />
		</intent-filter>
		<intent-filter>
		<action android:name="org.dmfs.tasks.action.notification.ACTION_UNDO_TIMEOUT" />
		</intent-filter>
		</service>

		<!-- Dashclock extension -->

project.properties

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,3 +15,4 @@ target=android-19
		android.library=false
		android.library.reference.1=../task-provider
		android.library.reference.2=../PagerSlidingTabStrip/library
		android.library.reference.3=../coloredshapecheckbox

res/layout-v11/fragment_task_list_selection.xml

+31 −27

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/edit_name"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:orientation="vertical"
		android:padding="8dp" >
		android:padding="16dp" >

		<TextView
		android:id="@android:id/title"
		style="@style/dialog_text_title"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:layout_alignParentTop="true"
		android:gravity="left\|center_vertical"
		android:padding="16dp"
		android:padding="8dp"
		android:text="@string/task_list_selection_title" />

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:layout_margin="16dp">

		<ListView
		android:id="@id/android:list"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:divider="@null"
		android:dividerHeight="0px"
		android:drawSelectorOnTop="false" />

		<TextView
		android:id="@id/android:empty"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/task_list_selection_empty" />
		</LinearLayout>

		<LinearLayout
		android:id="@+id/buttonArea"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_alignParentBottom="true"
		android:gravity="right"
		android:orientation="horizontal" >

		@@ -57,7 +37,31 @@
		style="@style/dialog_button_primary"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@android:string/ok" />
		android:text="@string/accept" />
		</LinearLayout>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_above="@id/buttonArea"
		android:layout_below="@android:id/title"
		android:orientation="vertical"
		android:paddingTop="8dp" >

		<ListView
		android:id="@id/android:list"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:divider="@null"
		android:dividerHeight="0px"
		android:drawSelectorOnTop="false" />

		<TextView
		android:id="@id/android:empty"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/task_list_selection_empty" />
		</LinearLayout>

		</RelativeLayout>
		No newline at end of file

res/layout-v11/list_item_selection.xml

0 → 100644

+54 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res/org.dmfs.tasks"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:paddingBottom="8dip"
		android:paddingTop="8dip" >

		<RelativeLayout
		android:id="@+id/list_color_layout"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentLeft="true"
		android:layout_centerVertical="true"
		android:layout_marginLeft="8dip" >

		<org.dmfs.android.widgets.ColoredShapeCheckBox
		android:id="@android:id/checkbox"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_centerInParent="true"
		android:checked="true"
		android:clickable="false"
		android:focusable="false"
		app:backgroundShape="@drawable/rect_shape" />
		</RelativeLayout>

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_centerVertical="true"
		android:layout_marginLeft="8dip"
		android:layout_marginRight="8dip"
		android:layout_toRightOf="@id/list_color_layout"
		android:orientation="vertical" >

		<TextView
		android:id="@android:id/text1"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:maxLines="1"
		android:singleLine="true"
		android:textAppearance="@android:style/TextAppearance.Medium" />

		<TextView
		android:id="@android:id/text2"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:maxLines="1"
		android:singleLine="true"
		android:textAppearance="@android:style/TextAppearance.Small" />
		</LinearLayout>

		</RelativeLayout>
		No newline at end of file

res/layout-v11/undo_notification.xml

0 → 100644

+85 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		**
		** Copyright 2012, Google Inc.
		**
		** 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.
		*/
		-->
		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:internal="http://schemas.android.com/apk/prv/res/android"
		android:id="@+id/status_bar_latest_event_content"
		android:layout_width="match_parent"
		android:layout_height="64dp"
		internal:layout_maxHeight="64dp"
		internal:layout_minHeight="64dp" >

		<ImageView
		android:layout_width="@android:dimen/notification_large_icon_width"
		android:layout_height="@android:dimen/notification_large_icon_height"
		android:background="@android:color/black"
		android:scaleType="center"
		android:src="@drawable/ic_notification_completed" />

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="fill_vertical"
		android:layout_marginLeft="@android:dimen/notification_large_icon_width"
		android:layout_marginStart="@android:dimen/notification_large_icon_width"
		android:gravity="top"
		android:minHeight="@android:dimen/notification_large_icon_height"
		android:orientation="horizontal"
		android:paddingBottom="2dp"
		android:paddingTop="2dp" >

		<TextView
		android:id="@+id/description_text"
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_marginLeft="8dp"
		android:layout_marginRight="8dp"
		android:layout_weight="1"
		android:ellipsize="marquee"
		android:fadingEdge="horizontal"
		android:gravity="center_vertical" />

		<ImageView
		android:layout_width="1dip"
		android:layout_height="match_parent"
		android:layout_marginBottom="10dip"
		android:layout_marginRight="12dip"
		android:layout_marginTop="10dip"
		android:src="#aaaaaa" />

		<ImageView
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_gravity="center_vertical"
		android:layout_marginRight="4dip"
		android:src="@drawable/ic_history" />

		<TextView
		android:textColor="@android:color/white"
		android:textSize="16sp"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_marginLeft="4dip"
		android:gravity="center_vertical"
		android:paddingEnd="16dip"
		android:paddingRight="16dip"
		android:text="@string/notification_undo"
		android:textAllCaps="true" />
		</LinearLayout>

		</FrameLayout>
		No newline at end of file