Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67953c5d authored by tobias's avatar tobias
Browse files

- fixed EditTaskActivity title

parent f115bde2

AndroidManifest.xml

+2 −6
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
        <!-- EditTaskActivity listens for EDIT, INSERT and INDERT_OR_EDIT intents -->

        <activity

            android:name="org.dmfs.tasks.EditTaskActivity"

            android:label="@string/activity_edit_task_title"

            android:label="@string/activity_add_task_title"

            android:parentActivityName="org.dmfs.tasks.TaskListActivity"

            android:theme="@style/DetailsTheme" >

            <meta-data
@@ -89,7 +89,7 @@ 
            </intent-filter>

            

            <!-- Voice command "note to self" in google search -->

            <intent-filter>

            <intent-filter android:label="@string/activity_add_task_title">

                <action android:name="com.google.android.gm.action.AUTO_SEND" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:mimeType="text/*" />
@@ -106,16 +106,12 @@ 
            </intent-filter>

            <intent-filter android:label="@string/activity_add_task_title" >

                <action android:name="android.intent.action.INSERT" />



                <category android:name="android.intent.category.DEFAULT" />



                <data android:mimeType="vnd.android.cursor.dir/org.dmfs.tasks.tasks" />

            </intent-filter>

            <intent-filter android:label="@string/activity_add_task_title" >

                <action android:name="android.intent.action.INSERT_OR_EDIT" />



                <category android:name="android.intent.category.DEFAULT" />



                <data android:mimeType="vnd.android.cursor.dir/org.dmfs.tasks.tasks" />

                <data

                    android:host="@string/org_dmfs_tasks_authority"

src/org/dmfs/tasks/EditTaskActivity.java

+15 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ public class EditTaskActivity extends FragmentActivity 
			Intent intent = getIntent();

			String action = intent.getAction();



			setActivityTitle(action);



			if (Intent.ACTION_SEND.equals(action))

			{
@@ -203,4 +205,17 @@ public class EditTaskActivity extends FragmentActivity 
		return super.onOptionsItemSelected(item);

	}





	private void setActivityTitle(String action)

	{

		if (Intent.ACTION_EDIT.equals(action))

		{

			setTitle(R.string.activity_edit_task_title);

		}

		else

		{

			setTitle(R.string.activity_add_task_title);

		}

	}



}

src/org/dmfs/tasks/notification/AlarmBroadcastReceiver.java

+6 −2
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ public class AlarmBroadcastReceiver extends BroadcastReceiver 
				String title = intent.getStringExtra(StartAlarmBroadcastHandler.EXTRA_TASK_TITLE);

				long startDate = intent.getLongExtra(StartAlarmBroadcastHandler.EXTRA_TASK_START_TIME, Long.MIN_VALUE);

				boolean startAllDay = intent.getBooleanExtra(StartAlarmBroadcastHandler.EXTRA_TASK_START_ALLDAY, false);

				int notificationId = (int) taskId;



				String startString = context.getString(R.string.notification_task_start_date,

					new DueDateFormatter(context, NOTIFICATION_DATE_FORMAT).format(makeTime(startDate, startAllDay), false));
@@ -88,6 +89,9 @@ public class AlarmBroadcastReceiver extends BroadcastReceiver 
				// enable light, sound and vibration

				mBuilder.setDefaults(Notification.DEFAULT_ALL);



				// add actions

				mBuilder.addAction(NotificationActionIntentService.getCompleteAction(context, notificationId, taskId));



				// Creates an explicit intent for an Activity in your app

				Intent resultIntent = new Intent(Intent.ACTION_VIEW);

				resultIntent.setData(intent.getData());
@@ -102,7 +106,7 @@ public class AlarmBroadcastReceiver extends BroadcastReceiver 
				PendingIntent resultPendingIntent = stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);



				mBuilder.setContentIntent(resultPendingIntent);

				notificationManager.notify((int) taskId, mBuilder.build());

				notificationManager.notify(notificationId, mBuilder.build());



			}

		}
@@ -150,12 +154,12 @@ public class AlarmBroadcastReceiver extends BroadcastReceiver 
				PendingIntent resultPendingIntent = stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);



				// add actions

				mBuilder.addAction(NotificationActionIntentService.getCompleteAction(context, notificationId, taskId));

				if (!dueAllDay)

				{

					mBuilder.addAction(NotificationActionIntentService.getDelay1hAction(context, notificationId, taskId, dueDate, timezone));

				}

				mBuilder.addAction(NotificationActionIntentService.getDelay1dAction(context, notificationId, taskId, dueDate, timezone));

				mBuilder.addAction(NotificationActionIntentService.getCompleteAction(context, notificationId, taskId));



				mBuilder.setContentIntent(resultPendingIntent);

				notificationManager.notify(notificationId, mBuilder.build());