From e41ceafe921980995a8db494aa9dcb8f835b5adf Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 25 Nov 2014 11:45:35 -0600 Subject: [PATCH] Remove api module --- api/LICENSE | 24 ---- api/build.gradle | 33 ----- api/project.properties | 12 -- api/src/main/AndroidManifest.xml | 11 -- api/src/main/res/values-ar/strings.xml | 43 ------ api/src/main/res/values-bg-rBG/strings.xml | 54 -------- api/src/main/res/values-ca/strings.xml | 45 ------ api/src/main/res/values-cs/strings.xml | 57 -------- api/src/main/res/values-da/strings.xml | 37 ----- api/src/main/res/values-de/strings.xml | 54 -------- api/src/main/res/values-el/strings.xml | 13 -- api/src/main/res/values-es/strings.xml | 57 -------- api/src/main/res/values-fi/strings.xml | 8 -- api/src/main/res/values-fr/strings.xml | 56 -------- api/src/main/res/values-it/strings.xml | 56 -------- api/src/main/res/values-iw/strings.xml | 57 -------- api/src/main/res/values-ja/strings.xml | 58 -------- api/src/main/res/values-ko/strings.xml | 57 -------- api/src/main/res/values-nb/strings.xml | 47 ------- api/src/main/res/values-nl/strings.xml | 55 -------- api/src/main/res/values-pl/strings.xml | 56 -------- api/src/main/res/values-pt-rBR/strings.xml | 56 -------- api/src/main/res/values-pt/strings.xml | 58 -------- api/src/main/res/values-ru/strings.xml | 57 -------- api/src/main/res/values-sl-rSI/strings.xml | 56 -------- api/src/main/res/values-sv/strings.xml | 55 -------- api/src/main/res/values-th/strings.xml | 14 -- api/src/main/res/values-tr/strings.xml | 55 -------- api/src/main/res/values-uk/strings.xml | 53 ------- api/src/main/res/values-zh-rCN/strings.xml | 57 -------- api/src/main/res/values-zh-rTW/strings.xml | 57 -------- api/src/main/res/values/colors.xml | 17 --- api/src/main/res/values/keys.xml | 33 ----- api/src/main/res/values/strings.xml | 123 ---------------- astrid/build.gradle | 86 ------------ astrid/src/main/res/values/strings.xml | 11 -- build.gradle | 92 +++++++++++- .../checkmark-notification.ai | 0 .../checkmark-notification.png | Bin {astrid/graphics => graphics}/checkmark.ai | 0 {astrid/graphics => graphics}/checkmark.png | Bin .../project.properties => project.properties | 0 scripts/clean_translations.rb | 7 +- scripts/find-unused-strings.rb | 10 +- scripts/getloc.rb | 8 +- scripts/resize-launcher.sh | 2 +- scripts/resize-notification.sh | 2 +- settings.gradle | 2 - .../todoroo/andlib/test/TranslationTests.java | 0 .../andlib/utility/DateUtilitiesTest.java | 0 .../andlib/utility/RelativeDayTest.java | 0 .../astrid/backup/BackupServiceTests.java | 0 .../todoroo/astrid/dao/MetadataDaoTests.java | 0 .../com/todoroo/astrid/dao/TaskDaoTests.java | 0 .../com/todoroo/astrid/data/TaskTest.java | 0 .../astrid/gtasks/GtasksIndentActionTest.java | 0 .../gtasks/GtasksMetadataServiceTest.java | 0 .../gtasks/GtasksTaskListUpdaterTest.java | 0 .../astrid/gtasks/GtasksTaskMovingTest.java | 0 .../gtasks/GtasksTestPreferenceService.java | 0 .../gtasks/api/GtasksApiUtilitiesTest.java | 0 .../com/todoroo/astrid/model/TaskTest.java | 0 .../astrid/provider/Astrid3ProviderTests.java | 0 .../astrid/reminders/NotificationTests.java | 0 .../astrid/reminders/NotificationsTest.java | 0 .../reminders/NotifyAtDeadlineTest.java | 0 .../astrid/reminders/ReminderServiceTest.java | 0 .../astrid/repeats/AdvancedRepeatTest.java | 0 .../astrid/repeats/NewRepeatTests.java | 0 .../RepeatTaskCompleteListenerTest.java | 0 .../astrid/service/QuickAddMarkupTest.java | 0 .../astrid/service/TitleParserTest.java | 0 .../astrid/subtasks/SubtasksHelperTest.java | 0 .../astrid/subtasks/SubtasksMovingTest.java | 0 .../astrid/subtasks/SubtasksTestCase.java | 0 .../todoroo/astrid/sync/NewSyncTestCase.java | 0 .../todoroo/astrid/sync/SyncModelTest.java | 0 .../astrid/test/AstridTranslationTest.java | 0 .../todoroo/astrid/test/DatabaseTestCase.java | 0 .../AstridDefaultPreferenceSpecTest.java | 0 .../androidTest/java/org/tasks/Freeze.java | 0 .../java/org/tasks/RemoteModelHelpers.java | 0 .../androidTest/java/org/tasks/Snippet.java | 0 .../java/org/tasks/TestUtilities.java | 0 .../org/tasks/date/DateTimeUtilsTest.java | 0 .../tasks/injection/InjectingTestCase.java | 0 .../java/org/tasks/injection/TestModule.java | 0 .../androidTest/res/.do.not.delete | 0 {astrid/src => src}/main/AndroidManifest.xml | 0 {astrid/src => src}/main/assets/logback.xml | 0 .../commonsware/cwac/tlv/TouchListView.java | 0 .../FloatingActionButton.java | 0 .../mdimension/jchronic/AstridChronic.java | 0 .../todoroo/andlib/data/AbstractDatabase.java | 0 .../todoroo/andlib/data/AbstractModel.java | 0 .../com/todoroo/andlib/data/Callback.java | 0 .../com/todoroo/andlib/data/DatabaseDao.java | 0 .../com/todoroo/andlib/data/Property.java | 0 .../java/com/todoroo/andlib/data/Table.java | 0 .../todoroo/andlib/data/TodorooCursor.java | 0 .../andlib/service/ContextManager.java | 0 .../com/todoroo/andlib/sql/Criterion.java | 0 .../java/com/todoroo/andlib/sql/DBObject.java | 0 .../java/com/todoroo/andlib/sql/Field.java | 0 .../com/todoroo/andlib/sql/Functions.java | 0 .../java/com/todoroo/andlib/sql/Join.java | 0 .../java/com/todoroo/andlib/sql/JoinType.java | 0 .../java/com/todoroo/andlib/sql/Operator.java | 0 .../java/com/todoroo/andlib/sql/Order.java | 0 .../com/todoroo/andlib/sql/OrderType.java | 0 .../java/com/todoroo/andlib/sql/Query.java | 0 .../com/todoroo/andlib/sql/QueryTemplate.java | 0 .../com/todoroo/andlib/sql/SqlConstants.java | 0 .../java/com/todoroo/andlib/sql/SqlTable.java | 0 .../todoroo/andlib/sql/UnaryCriterion.java | 0 .../andlib/utility/AndroidUtilities.java | 0 .../todoroo/andlib/utility/DateUtilities.java | 2 +- .../andlib/utility/DialogUtilities.java | 2 +- .../java/com/todoroo/andlib/utility/Pair.java | 0 .../todoroo/andlib/utility/Preferences.java | 0 .../astrid/actfm/ActFmCameraModule.java | 0 .../astrid/actfm/ActFmGoogleAuthActivity.java | 0 .../astrid/actfm/TagSettingsActivity.java | 0 .../actfm/TagSettingsActivityTablet.java | 0 .../todoroo/astrid/actfm/TagViewFragment.java | 1 - .../astrid/activity/AstridActivity.java | 0 .../astrid/activity/BeastModePreferences.java | 0 .../astrid/activity/EditPreferences.java | 0 .../activity/FilterShortcutActivity.java | 0 .../astrid/activity/ShareLinkActivity.java | 0 .../astrid/activity/ShortcutActivity.java | 0 .../activity/SortSelectionActivity.java | 0 .../astrid/activity/TaskEditActivity.java | 0 .../astrid/activity/TaskEditFragment.java | 3 - .../astrid/activity/TaskEditViewPager.java | 0 .../astrid/activity/TaskListActivity.java | 0 .../astrid/activity/TaskListFragment.java | 0 .../todoroo/astrid/adapter/FilterAdapter.java | 0 .../todoroo/astrid/adapter/TaskAdapter.java | 0 .../astrid/alarms/AlarmControlSet.java | 0 .../todoroo/astrid/alarms/AlarmFields.java | 0 .../todoroo/astrid/alarms/AlarmService.java | 0 .../alarms/AlarmTaskRepeatListener.java | 0 .../java/com/todoroo/astrid/api/Addon.java | 0 .../astrid/api/AstridApiConstants.java | 0 .../astrid/api/AstridFilterExposer.java | 0 .../astrid/api/CustomFilterCriterion.java | 0 .../java/com/todoroo/astrid/api/Filter.java | 0 .../todoroo/astrid/api/FilterListItem.java | 0 .../astrid/api/FilterWithCustomIntent.java | 0 .../todoroo/astrid/api/FilterWithUpdate.java | 0 .../astrid/api/MultipleSelectCriterion.java | 0 .../java/com/todoroo/astrid/api/PermaSql.java | 0 .../com/todoroo/astrid/api/TaskAction.java | 0 .../astrid/api/TextInputCriterion.java | 0 .../astrid/backup/BackupConstants.java | 0 .../astrid/backup/BackupPreferences.java | 0 .../todoroo/astrid/backup/BackupService.java | 0 .../astrid/backup/BackupStartupReceiver.java | 0 .../astrid/backup/FilePickerBuilder.java | 0 .../astrid/backup/TasksXmlExporter.java | 0 .../astrid/backup/TasksXmlImporter.java | 0 .../astrid/calls/MissedCallActivity.java | 0 .../calls/PhoneStateChangedReceiver.java | 0 .../astrid/core/CoreFilterExposer.java | 0 .../astrid/core/CustomFilterActivity.java | 0 .../astrid/core/CustomFilterAdapter.java | 0 .../astrid/core/CustomFilterExposer.java | 0 .../astrid/core/DefaultsPreferences.java | 0 .../com/todoroo/astrid/core/FilterView.java | 0 .../astrid/core/LinkActionExposer.java | 0 .../astrid/core/OldTaskPreferences.java | 0 .../com/todoroo/astrid/core/SavedFilter.java | 0 .../com/todoroo/astrid/core/SortHelper.java | 0 .../java/com/todoroo/astrid/dao/Database.java | 0 .../com/todoroo/astrid/dao/MetadataDao.java | 0 .../todoroo/astrid/dao/RemoteModelDao.java | 0 .../todoroo/astrid/dao/StoreObjectDao.java | 0 .../com/todoroo/astrid/dao/TagDataDao.java | 0 .../todoroo/astrid/dao/TaskAttachmentDao.java | 0 .../java/com/todoroo/astrid/dao/TaskDao.java | 0 .../astrid/dao/TaskListMetadataDao.java | 0 .../todoroo/astrid/dao/UserActivityDao.java | 0 .../com/todoroo/astrid/data/Metadata.java | 0 .../com/todoroo/astrid/data/RemoteModel.java | 0 .../com/todoroo/astrid/data/StoreObject.java | 0 .../com/todoroo/astrid/data/SyncFlags.java | 0 .../java/com/todoroo/astrid/data/TagData.java | 0 .../java/com/todoroo/astrid/data/Task.java | 2 +- .../com/todoroo/astrid/data/TaskApiDao.java | 0 .../todoroo/astrid/data/TaskAttachment.java | 0 .../todoroo/astrid/data/TaskListMetadata.java | 0 .../com/todoroo/astrid/data/UserActivity.java | 0 .../astrid/files/AACRecordingActivity.java | 0 .../com/todoroo/astrid/files/FileExplore.java | 0 .../todoroo/astrid/files/FileUtilities.java | 0 .../com/todoroo/astrid/files/FilesAction.java | 0 .../todoroo/astrid/files/FilesControlSet.java | 0 .../astrid/gcal/CalendarAlarmListCreator.java | 0 .../astrid/gcal/CalendarAlarmReceiver.java | 0 .../astrid/gcal/CalendarAlarmScheduler.java | 0 .../astrid/gcal/CalendarReminderActivity.java | 0 .../astrid/gcal/CalendarStartupReceiver.java | 0 .../com/todoroo/astrid/gcal/Calendars.java | 0 .../todoroo/astrid/gcal/GCalControlSet.java | 0 .../com/todoroo/astrid/gcal/GCalHelper.java | 0 .../astrid/gcal/GCalTaskCompleteListener.java | 0 .../gtasks/GtasksBackgroundService.java | 0 .../GtasksCustomFilterCriteriaExposer.java | 0 .../astrid/gtasks/GtasksFilterExposer.java | 0 .../com/todoroo/astrid/gtasks/GtasksList.java | 0 .../astrid/gtasks/GtasksListFragment.java | 0 .../astrid/gtasks/GtasksListService.java | 0 .../todoroo/astrid/gtasks/GtasksMetadata.java | 0 .../astrid/gtasks/GtasksMetadataService.java | 0 .../gtasks/GtasksPreferenceService.java | 0 .../astrid/gtasks/GtasksPreferences.java | 58 ++++---- .../astrid/gtasks/GtasksScheduler.java | 0 .../astrid/gtasks/GtasksStartupReceiver.java | 0 .../astrid/gtasks/GtasksTaskListUpdater.java | 0 .../OrderedMetadataListFragmentHelper.java | 0 .../gtasks/OrderedMetadataListUpdater.java | 0 .../gtasks/api/GoogleTasksException.java | 0 .../astrid/gtasks/api/GtasksApiUtilities.java | 0 .../astrid/gtasks/api/GtasksInvoker.java | 0 .../gtasks/api/HttpNotFoundException.java | 0 .../astrid/gtasks/api/MoveRequest.java | 0 .../gtasks/auth/GtasksLoginActivity.java | 0 .../gtasks/auth/GtasksTokenValidator.java | 0 .../astrid/gtasks/sync/GtasksSyncService.java | 0 .../gtasks/sync/GtasksSyncV2Provider.java | 0 .../gtasks/sync/GtasksTaskContainer.java | 0 .../todoroo/astrid/helper/MetadataHelper.java | 0 .../astrid/helper/SyncActionHelper.java | 0 .../astrid/helper/TaskEditControlSet.java | 0 .../com/todoroo/astrid/helper/UUIDHelper.java | 0 .../astrid/notes/EditNoteActivity.java | 0 .../todoroo/astrid/notes/NoteMetadata.java | 0 .../com/todoroo/astrid/notes/NotesAction.java | 0 .../astrid/provider/Astrid2TaskProvider.java | 0 .../provider/Astrid3ContentProvider.java | 0 .../astrid/provider/SqlContentProvider.java | 0 .../reminders/NotificationFragment.java | 0 .../astrid/reminders/Notifications.java | 0 .../astrid/reminders/ReminderDialog.java | 0 .../astrid/reminders/ReminderPreferences.java | 0 .../reminders/ReminderSchedulingService.java | 0 .../astrid/reminders/ReminderService.java | 0 .../reminders/ReminderStartupReceiver.java | 0 .../reminders/ShowNotificationReceiver.java | 0 .../astrid/reminders/SnoozeCallback.java | 0 .../astrid/reminders/SnoozeDialog.java | 0 .../astrid/repeats/RepeatControlSet.java | 0 .../repeats/RepeatTaskCompleteListener.java | 0 .../astrid/service/MarketStrategy.java | 0 .../astrid/service/StartupService.java | 0 .../todoroo/astrid/service/SyncV2Service.java | 0 .../service/SynchronizeMetadataCallback.java | 0 .../todoroo/astrid/service/TaskCreator.java | 0 .../todoroo/astrid/service/TaskDeleter.java | 0 .../astrid/service/TaskDuplicator.java | 0 .../todoroo/astrid/service/TaskService.java | 0 .../astrid/service/UpdateScreenFlow.java | 0 .../astrid/service/UpgradeService.java | 0 .../WidgetUpdatingCallbackWrapper.java | 0 .../AstridOrderedListFragmentHelper.java | 0 .../subtasks/AstridOrderedListUpdater.java | 0 .../OrderedListFragmentHelperInterface.java | 0 .../subtasks/SubtasksFilterUpdater.java | 0 .../astrid/subtasks/SubtasksHelper.java | 0 .../astrid/subtasks/SubtasksListFragment.java | 0 .../subtasks/SubtasksTagListFragment.java | 0 .../astrid/subtasks/SubtasksUpdater.java | 0 .../astrid/sync/SyncResultCallback.java | 0 .../astrid/tags/DeleteTagActivity.java | 0 .../astrid/tags/RenameTagActivity.java | 0 .../com/todoroo/astrid/tags/TagActivity.java | 0 .../tags/TagCustomFilterCriteriaExposer.java | 0 .../todoroo/astrid/tags/TagFilterExposer.java | 0 .../com/todoroo/astrid/tags/TagService.java | 0 .../todoroo/astrid/tags/TagsControlSet.java | 0 .../astrid/tags/TaskToTagMetadata.java | 0 .../astrid/timers/TimerActionControlSet.java | 0 .../astrid/timers/TimerControlSet.java | 0 .../astrid/timers/TimerFilterExposer.java | 0 .../todoroo/astrid/timers/TimerPlugin.java | 0 .../timers/TimerTaskCompleteListener.java | 0 .../todoroo/astrid/ui/AstridTimePicker.java | 0 .../com/todoroo/astrid/ui/CalendarView.java | 0 .../todoroo/astrid/ui/CheckableImageView.java | 0 .../astrid/ui/CustomBorderDrawable.java | 0 .../todoroo/astrid/ui/DateAndTimeDialog.java | 0 .../todoroo/astrid/ui/DateAndTimePicker.java | 0 .../todoroo/astrid/ui/DateChangedAlerts.java | 0 .../todoroo/astrid/ui/DeadlineControlSet.java | 0 .../astrid/ui/DeadlineNumberPicker.java | 0 .../astrid/ui/DescriptionControlSet.java | 0 .../todoroo/astrid/ui/DraggableListView.java | 0 .../astrid/ui/EditDialogOkBackground.java | 0 .../astrid/ui/EditTitleControlSet.java | 0 .../astrid/ui/HideUntilControlSet.java | 0 .../astrid/ui/ImportanceControlSet.java | 0 .../ui/MultilineCheckboxPreference.java | 0 .../todoroo/astrid/ui/MultilineHelper.java | 0 .../astrid/ui/MultilineListPreference.java | 0 .../astrid/ui/MultilinePreference.java | 0 .../astrid/ui/NNumberPickerDialog.java | 0 .../com/todoroo/astrid/ui/NumberPicker.java | 0 .../todoroo/astrid/ui/NumberPickerButton.java | 0 .../todoroo/astrid/ui/NumberPickerDialog.java | 0 .../todoroo/astrid/ui/PopupControlSet.java | 0 .../com/todoroo/astrid/ui/QuickAddBar.java | 0 .../astrid/ui/RandomReminderControlSet.java | 0 .../todoroo/astrid/ui/ReminderControlSet.java | 0 .../astrid/ui/TimeDurationControlSet.java | 0 .../utility/AstridDefaultPreferenceSpec.java | 0 .../com/todoroo/astrid/utility/Constants.java | 0 .../com/todoroo/astrid/utility/Flags.java | 0 .../todoroo/astrid/utility/TitleParser.java | 0 .../utility/TodorooPreferenceActivity.java | 0 .../com/todoroo/astrid/voice/AACRecorder.java | 0 .../astrid/voice/VoiceInputAssistant.java | 11 -- .../astrid/voice/VoiceOutputAssistant.java | 0 .../todoroo/astrid/widget/TasksWidget.java | 0 .../astrid/widget/WidgetConfigActivity.java | 0 .../astrid/widget/WidgetUpdateService.java | 0 .../main/java/org/tasks/Broadcaster.java | 0 .../main/java/org/tasks/Tasks.java | 0 .../java/org/tasks/date/DateTimeUtils.java | 0 .../main/java/org/tasks/files/FileHelper.java | 0 .../java/org/tasks/files/ImageHelper.java | 0 .../java/org/tasks/filters/FilterCounter.java | 0 .../org/tasks/injection/ActivityModule.java | 0 .../org/tasks/injection/BroadcastModule.java | 0 .../injection/ContentProviderModule.java | 0 .../main/java/org/tasks/injection/Dagger.java | 0 .../java/org/tasks/injection/ForActivity.java | 0 .../org/tasks/injection/ForApplication.java | 0 .../org/tasks/injection/FragmentModule.java | 0 .../injection/InjectingActionBarActivity.java | 0 .../tasks/injection/InjectingActivity.java | 0 .../injection/InjectingAppWidgetProvider.java | 0 .../tasks/injection/InjectingApplication.java | 0 .../injection/InjectingBroadcastReceiver.java | 0 .../injection/InjectingContentProvider.java | 0 .../tasks/injection/InjectingFragment.java | 0 .../injection/InjectingListActivity.java | 0 .../injection/InjectingListFragment.java | 0 .../InjectingPreferenceActivity.java | 0 .../InjectingRemoteViewsService.java | 0 .../org/tasks/injection/InjectingService.java | 0 .../InjectingSyncProviderPreferences.java | 0 .../java/org/tasks/injection/Injector.java | 0 .../org/tasks/injection/ServiceModule.java | 0 .../java/org/tasks/injection/TasksModule.java | 0 .../notifications/NotificationManager.java | 0 .../preferences/ActivityPreferences.java | 0 .../org/tasks/preferences/Preferences.java | 0 .../tasks/preferences/ResourceResolver.java | 0 .../scheduling/RefreshBroadcastReceiver.java | 0 .../tasks/scheduling/RefreshScheduler.java | 0 ...erminateProgressBarSyncResultCallback.java | 0 .../tasks/sync/RecordSyncStatusCallback.java | 0 .../java/org/tasks/sync/SyncExecutor.java | 0 .../java/org/tasks/sync/SyncThrottle.java | 0 .../tasks/ui/DraggableSwipeRefreshLayout.java | 0 .../tasks/ui/NavigationDrawerFragment.java | 0 .../java/org/tasks/ui/TimePreference.java | 0 .../org/tasks/voice/VoiceCommandActivity.java | 0 .../tasks/widget/ScrollableViewsFactory.java | 0 .../widget/ScrollableWidgetUpdateService.java | 0 .../java/org/tasks/widget/WidgetHelper.java | 0 .../main/res/anim/slide_left_in.xml | 0 .../main/res/anim/slide_left_out.xml | 0 .../main/res/anim/slide_right_in.xml | 0 .../main/res/anim/slide_right_out.xml | 0 .../color/task_edit_toggle_button_text.xml | 0 .../res/drawable-hdpi/btn_dismiss_normal.png | Bin .../res/drawable-hdpi/btn_dismiss_pressed.png | Bin .../main/res/drawable-hdpi/check_box_1.png | Bin .../main/res/drawable-hdpi/check_box_2.png | Bin .../main/res/drawable-hdpi/check_box_3.png | Bin .../main/res/drawable-hdpi/check_box_4.png | Bin .../res/drawable-hdpi/check_box_checked_1.png | Bin .../res/drawable-hdpi/check_box_checked_2.png | Bin .../res/drawable-hdpi/check_box_checked_3.png | Bin .../res/drawable-hdpi/check_box_checked_4.png | Bin .../res/drawable-hdpi/check_box_large_1.png | Bin .../res/drawable-hdpi/check_box_large_2.png | Bin .../res/drawable-hdpi/check_box_large_3.png | Bin .../res/drawable-hdpi/check_box_large_4.png | Bin .../res/drawable-hdpi/check_box_repeat_1.png | Bin .../res/drawable-hdpi/check_box_repeat_2.png | Bin .../res/drawable-hdpi/check_box_repeat_3.png | Bin .../res/drawable-hdpi/check_box_repeat_4.png | Bin .../check_box_repeat_checked_1.png | Bin .../check_box_repeat_checked_2.png | Bin .../check_box_repeat_checked_3.png | Bin .../check_box_repeat_checked_4.png | Bin .../dialog_full_holo_light.9.png | Bin .../main/res/drawable-hdpi/directory_icon.png | Bin .../main/res/drawable-hdpi/directory_up.png | Bin .../res/drawable-hdpi/drawer_shadow.9.png | Bin .../main/res/drawable-hdpi/file_icon.png | Bin .../main/res/drawable-hdpi/google.png | Bin .../main/res/drawable-hdpi/ic_action_add.png | Bin .../res/drawable-hdpi/ic_action_add_light.png | Bin .../drawable-hdpi/ic_action_attachment_2.png | Bin .../res/drawable-hdpi/ic_action_camera.png | Bin .../res/drawable-hdpi/ic_action_cancel.png | Bin .../res/drawable-hdpi/ic_action_discard.png | Bin .../main/res/drawable-hdpi/ic_action_gear.png | Bin .../main/res/drawable-hdpi/ic_action_mic.png | Bin .../main/res/drawable-hdpi/ic_action_save.png | Bin .../res/drawable-hdpi/ic_action_search.png | Bin .../main/res/drawable-hdpi/ic_menu_close.png | Bin .../main/res/drawable-hdpi/icon.png | Bin .../main/res/drawable-hdpi/notif_astrid.png | Bin .../main/res/drawable-hdpi/single_gear.png | Bin .../main/res/drawable-hdpi/tea_icn_addcal.png | Bin .../res/drawable-hdpi/tea_icn_addcal_gray.png | Bin .../main/res/drawable-hdpi/tea_icn_date.png | Bin .../res/drawable-hdpi/tea_icn_date_gray.png | Bin .../res/drawable-hdpi/tea_icn_date_red.png | Bin .../main/res/drawable-hdpi/tea_icn_edit.png | Bin .../res/drawable-hdpi/tea_icn_edit_gray.png | Bin .../main/res/drawable-hdpi/tea_icn_files.png | Bin .../res/drawable-hdpi/tea_icn_files_gray.png | Bin .../main/res/drawable-hdpi/tea_icn_hide.png | Bin .../res/drawable-hdpi/tea_icn_hide_gray.png | Bin .../main/res/drawable-hdpi/tea_icn_lists.png | Bin .../res/drawable-hdpi/tea_icn_lists_gray.png | Bin .../res/drawable-hdpi/tea_icn_priority.png | Bin .../drawable-hdpi/tea_icn_priority_gray.png | Bin .../res/drawable-hdpi/tea_icn_reminder.png | Bin .../drawable-hdpi/tea_icn_reminder_gray.png | Bin .../main/res/drawable-hdpi/tea_icn_repeat.png | Bin .../res/drawable-hdpi/tea_icn_repeat_gray.png | Bin .../main/res/drawable-hdpi/tea_icn_timer.png | Bin .../res/drawable-hdpi/tea_icn_timer_gray.png | Bin .../main/res/drawable-land/separator.png | Bin .../res/drawable-v21/filter_row_selector.xml | 0 .../main/res/drawable-v21/ripple.xml | 0 .../res/drawable-xhdpi/btn_dismiss_normal.png | Bin .../drawable-xhdpi/btn_dismiss_pressed.png | Bin .../main/res/drawable-xhdpi/check_box_1.png | Bin .../main/res/drawable-xhdpi/check_box_2.png | Bin .../main/res/drawable-xhdpi/check_box_3.png | Bin .../main/res/drawable-xhdpi/check_box_4.png | Bin .../drawable-xhdpi/check_box_checked_1.png | Bin .../drawable-xhdpi/check_box_checked_2.png | Bin .../drawable-xhdpi/check_box_checked_3.png | Bin .../drawable-xhdpi/check_box_checked_4.png | Bin .../res/drawable-xhdpi/check_box_repeat_1.png | Bin .../res/drawable-xhdpi/check_box_repeat_2.png | Bin .../res/drawable-xhdpi/check_box_repeat_3.png | Bin .../res/drawable-xhdpi/check_box_repeat_4.png | Bin .../check_box_repeat_checked_1.png | Bin .../check_box_repeat_checked_2.png | Bin .../check_box_repeat_checked_3.png | Bin .../check_box_repeat_checked_4.png | Bin .../dialog_full_holo_light.9.png | Bin .../res/drawable-xhdpi/drawer_shadow.9.png | Bin .../main/res/drawable-xhdpi/ic_action_add.png | Bin .../drawable-xhdpi/ic_action_add_light.png | Bin .../drawable-xhdpi/ic_action_attachment_2.png | Bin .../res/drawable-xhdpi/ic_action_camera.png | Bin .../res/drawable-xhdpi/ic_action_cancel.png | Bin .../res/drawable-xhdpi/ic_action_discard.png | Bin .../res/drawable-xhdpi/ic_action_gear.png | Bin .../main/res/drawable-xhdpi/ic_action_mic.png | Bin .../res/drawable-xhdpi/ic_action_save.png | Bin .../res/drawable-xhdpi/ic_action_search.png | Bin .../main/res/drawable-xhdpi/icon.png | Bin .../main/res/drawable-xhdpi/notif_astrid.png | Bin .../res/drawable-xhdpi/tea_icn_addcal.png | Bin .../drawable-xhdpi/tea_icn_addcal_gray.png | Bin .../main/res/drawable-xhdpi/tea_icn_date.png | Bin .../res/drawable-xhdpi/tea_icn_date_gray.png | Bin .../res/drawable-xhdpi/tea_icn_date_red.png | Bin .../main/res/drawable-xhdpi/tea_icn_edit.png | Bin .../res/drawable-xhdpi/tea_icn_edit_gray.png | Bin .../main/res/drawable-xhdpi/tea_icn_files.png | Bin .../res/drawable-xhdpi/tea_icn_files_gray.png | Bin .../main/res/drawable-xhdpi/tea_icn_hide.png | Bin .../res/drawable-xhdpi/tea_icn_hide_gray.png | Bin .../main/res/drawable-xhdpi/tea_icn_lists.png | Bin .../res/drawable-xhdpi/tea_icn_lists_gray.png | Bin .../res/drawable-xhdpi/tea_icn_priority.png | Bin .../drawable-xhdpi/tea_icn_priority_gray.png | Bin .../res/drawable-xhdpi/tea_icn_reminder.png | Bin .../drawable-xhdpi/tea_icn_reminder_gray.png | Bin .../res/drawable-xhdpi/tea_icn_repeat.png | Bin .../drawable-xhdpi/tea_icn_repeat_gray.png | Bin .../main/res/drawable-xhdpi/tea_icn_timer.png | Bin .../res/drawable-xhdpi/tea_icn_timer_gray.png | Bin .../res/drawable-xxhdpi/drawer_shadow.9.png | Bin .../res/drawable-xxhdpi/ic_action_add.png | Bin .../drawable-xxhdpi/ic_action_add_light.png | Bin .../ic_action_attachment_2.png | Bin .../res/drawable-xxhdpi/ic_action_camera.png | Bin .../res/drawable-xxhdpi/ic_action_cancel.png | Bin .../res/drawable-xxhdpi/ic_action_discard.png | Bin .../res/drawable-xxhdpi/ic_action_gear.png | Bin .../res/drawable-xxhdpi/ic_action_mic.png | Bin .../res/drawable-xxhdpi/ic_action_save.png | Bin .../res/drawable-xxhdpi/ic_action_search.png | Bin .../main/res/drawable-xxhdpi/icon.png | Bin .../main/res/drawable-xxhdpi/notif_astrid.png | Bin .../main/res/drawable/action_attachments.png | Bin .../main/res/drawable/action_mail.png | Bin .../main/res/drawable/action_notes.png | Bin .../main/res/drawable/action_tel.png | Bin .../main/res/drawable/action_web.png | Bin .../main/res/drawable/arrow_branch.png | Bin .../main/res/drawable/arrow_down.png | Bin .../main/res/drawable/arrow_join.png | Bin .../main/res/drawable/btn_check.xml | 0 .../main/res/drawable/btn_check_small.xml | 0 .../main/res/drawable/btn_dismiss.xml | 0 .../main/res/drawable/btn_dismiss_normal.png | Bin .../main/res/drawable/btn_dismiss_pressed.png | Bin .../main/res/drawable/check_box_1.png | Bin .../main/res/drawable/check_box_2.png | Bin .../main/res/drawable/check_box_3.png | Bin .../main/res/drawable/check_box_4.png | Bin .../main/res/drawable/check_box_checked_1.png | Bin .../main/res/drawable/check_box_checked_2.png | Bin .../main/res/drawable/check_box_checked_3.png | Bin .../main/res/drawable/check_box_checked_4.png | Bin .../main/res/drawable/check_box_large_1.png | Bin .../main/res/drawable/check_box_large_2.png | Bin .../main/res/drawable/check_box_large_3.png | Bin .../main/res/drawable/check_box_large_4.png | Bin .../main/res/drawable/check_box_repeat_1.png | Bin .../main/res/drawable/check_box_repeat_2.png | Bin .../main/res/drawable/check_box_repeat_3.png | Bin .../main/res/drawable/check_box_repeat_4.png | Bin .../drawable/check_box_repeat_checked_1.png | Bin .../drawable/check_box_repeat_checked_2.png | Bin .../drawable/check_box_repeat_checked_3.png | Bin .../drawable/check_box_repeat_checked_4.png | Bin .../main/res/drawable/default_list_0.png | Bin .../main/res/drawable/default_list_1.png | Bin .../main/res/drawable/default_list_2.png | Bin .../main/res/drawable/default_list_3.png | Bin .../res/drawable/dialog_full_holo_light.9.png | Bin .../main/res/drawable/drawer_shadow.9.png | Bin .../res/drawable/file_type_background.xml | 0 .../main/res/drawable/filter_row_selector.xml | 0 .../res/drawable/filter_selected_icon.png | Bin .../drawable/filter_selected_icon_black.png | Bin .../main/res/drawable/footer_editbutton.xml | 0 .../drawable/footer_editbutton_normal.9.png | Bin .../drawable/footer_editbutton_pressed.9.png | Bin .../src => src}/main/res/drawable/google.png | Bin .../src => src}/main/res/drawable/grabber.png | Bin .../main/res/drawable/gtasks_icon.png | Bin .../main/res/drawable/ic_action_add.png | Bin .../main/res/drawable/ic_action_add_light.png | Bin .../res/drawable/ic_action_attachment_2.png | Bin .../main/res/drawable/ic_action_camera.png | Bin .../main/res/drawable/ic_action_cancel.png | Bin .../main/res/drawable/ic_action_discard.png | Bin .../main/res/drawable/ic_action_gear.png | Bin .../main/res/drawable/ic_action_mic.png | Bin .../main/res/drawable/ic_action_save.png | Bin .../main/res/drawable/ic_action_search.png | Bin .../main/res/drawable/ic_menu_close.png | Bin .../main/res/drawable/icn_arrow_down.png | Bin .../main/res/drawable/icn_arrow_left.png | Bin .../main/res/drawable/icn_arrow_right.png | Bin .../main/res/drawable/icn_arrow_up.png | Bin .../main/res/drawable/icn_check_off.png | Bin .../main/res/drawable/icn_check_on.png | Bin .../main/res/drawable/icn_edit_timer.png | Bin .../main/res/drawable/icn_timer_stop.png | Bin .../src => src}/main/res/drawable/icon.png | Bin .../importance_background_selected.xml | 0 .../src => src}/main/res/drawable/none.png | Bin .../main/res/drawable/notif_astrid.png | Bin .../main/res/drawable/panel_background.9.png | Bin .../drawable/reminder_dialog_background.xml | 0 .../reminder_dialog_inset_background.xml | 0 .../main/res/drawable/single_gear.png | Bin .../res/drawable/speech_bubble_reminder.9.png | Bin .../main/res/drawable/tango_alpha.png | Bin .../main/res/drawable/tango_calendar.png | Bin .../main/res/drawable/tango_warning.png | Bin .../res/drawable/task_edit_background.xml | 0 ...task_edit_background_transparent_white.xml | 0 .../drawable/task_edit_background_white.xml | 0 .../main/res/drawable/task_row_bg_dark.xml | 0 .../main/res/drawable/task_row_bg_white.xml | 0 .../main/res/drawable/tea_icn_addcal.png | Bin .../main/res/drawable/tea_icn_addcal_gray.png | Bin .../main/res/drawable/tea_icn_date.png | Bin .../main/res/drawable/tea_icn_date_gray.png | Bin .../main/res/drawable/tea_icn_date_red.png | Bin .../main/res/drawable/tea_icn_edit.png | Bin .../main/res/drawable/tea_icn_edit_gray.png | Bin .../main/res/drawable/tea_icn_files.png | Bin .../main/res/drawable/tea_icn_files_gray.png | Bin .../main/res/drawable/tea_icn_hide.png | Bin .../main/res/drawable/tea_icn_hide_gray.png | Bin .../main/res/drawable/tea_icn_lists.png | Bin .../main/res/drawable/tea_icn_lists_gray.png | Bin .../main/res/drawable/tea_icn_priority.png | Bin .../res/drawable/tea_icn_priority_gray.png | Bin .../main/res/drawable/tea_icn_reminder.png | Bin .../res/drawable/tea_icn_reminder_gray.png | Bin .../main/res/drawable/tea_icn_repeat.png | Bin .../main/res/drawable/tea_icn_repeat_gray.png | Bin .../main/res/drawable/tea_icn_timer.png | Bin .../main/res/drawable/tea_icn_timer_gray.png | Bin .../main/res/drawable/timepicker_down_btn.xml | 0 .../drawable/timepicker_down_disabled.9.png | Bin .../res/drawable/timepicker_down_normal.9.png | Bin .../drawable/timepicker_down_pressed.9.png | Bin .../drawable/timepicker_down_selected.9.png | Bin .../main/res/drawable/timepicker_input.xml | 0 .../drawable/timepicker_input_disabled.9.png | Bin .../drawable/timepicker_input_normal.9.png | Bin .../drawable/timepicker_input_pressed.9.png | Bin .../drawable/timepicker_input_selected.9.png | Bin .../main/res/drawable/timepicker_up_btn.xml | 0 .../res/drawable/timepicker_up_disabled.9.png | Bin .../res/drawable/timepicker_up_normal.9.png | Bin .../res/drawable/timepicker_up_pressed.9.png | Bin .../res/drawable/timepicker_up_selected.9.png | Bin .../main/res/drawable/timers_notification.png | Bin .../res/layout-land/astrid_reminder_view.xml | 0 .../date_time_picker_no_shortcuts.xml | 0 .../task_edit_wrapper_activity.xml | 0 .../res/layout-w820dp/task_list_wrapper.xml | 0 .../main/res/layout/aac_record_activity.xml | 0 .../main/res/layout/alarm_edit_row.xml | 0 .../astrid_calendar_list_creator_view.xml | 0 .../layout/astrid_calendar_reminder_view.xml | 0 .../res/layout/astrid_missed_call_view.xml | 0 .../res/layout/astrid_record_audio_view.xml | 0 .../main/res/layout/astrid_reminder_view.xml | 0 .../layout/astrid_reminder_view_portrait.xml | 0 .../main/res/layout/astrid_speech_bubble.xml | 0 .../layout/astrid_time_picker_horizontal.xml | 0 .../res/layout/beast_mode_pref_activity.xml | 0 .../layout/calendar_alarm_list_creator.xml | 0 .../res/layout/calendar_reminder_activity.xml | 0 .../main/res/layout/control_dialog_ok.xml | 0 .../main/res/layout/control_set_alarms.xml | 0 .../main/res/layout/control_set_deadline.xml | 0 .../layout/control_set_deadline_display.xml | 0 .../layout/control_set_default_display.xml | 0 .../main/res/layout/control_set_files.xml | 0 .../res/layout/control_set_files_display.xml | 0 .../main/res/layout/control_set_gcal.xml | 0 .../res/layout/control_set_gcal_display.xml | 0 .../main/res/layout/control_set_hide.xml | 0 .../res/layout/control_set_importance.xml | 0 .../main/res/layout/control_set_notes.xml | 0 .../res/layout/control_set_notes_display.xml | 0 .../main/res/layout/control_set_reminders.xml | 0 .../main/res/layout/control_set_repeat.xml | 0 .../res/layout/control_set_repeat_display.xml | 0 .../main/res/layout/control_set_tags.xml | 0 .../main/res/layout/control_set_timers.xml | 0 .../main/res/layout/control_set_title.xml | 0 .../res/layout/custom_filter_activity.xml | 0 .../main/res/layout/custom_filter_row.xml | 0 .../main/res/layout/date_time_dialog.xml | 0 .../layout/date_time_picker_no_shortcuts.xml | 0 .../res/layout/deadline_number_picker.xml | 0 .../main/res/layout/file_display_row.xml | 0 .../src => src}/main/res/layout/file_row.xml | 0 .../main/res/layout/filter_adapter_row.xml | 0 .../res/layout/fragment_navigation_drawer.xml | 0 .../main/res/layout/gtasks_login_activity.xml | 0 .../main/res/layout/missed_call_activity.xml | 0 .../res/layout/n_number_picker_dialog.xml | 0 .../main/res/layout/notes_view_dialog.xml | 0 .../main/res/layout/number_picker.xml | 0 .../main/res/layout/number_picker_dialog.xml | 0 .../res/layout/preference_draggable_row.xml | 0 .../main/res/layout/repeat_until_dialog.xml | 0 .../res/layout/scrollable_widget_dark.xml | 0 .../res/layout/scrollable_widget_light.xml | 0 ...imple_list_item_multiple_choice_themed.xml | 0 .../main/res/layout/snooze_dialog.xml | 0 .../main/res/layout/sort_selection_dialog.xml | 0 .../main/res/layout/status_preference.xml | 0 .../main/res/layout/tag_edit_row.xml | 0 .../main/res/layout/tag_settings_activity.xml | 0 .../res/layout/task_adapter_row_simple.xml | 0 .../main/res/layout/task_edit_activity.xml | 0 .../res/layout/task_edit_when_controls.xml | 0 .../res/layout/task_edit_wrapper_activity.xml | 0 .../main/res/layout/task_list_activity.xml | 0 .../res/layout/task_list_body_standard.xml | 0 .../res/layout/task_list_body_subtasks.xml | 0 .../layout/task_list_swipe_layout_empty.xml | 0 .../main/res/layout/task_list_wrapper.xml | 0 .../src => src}/main/res/layout/toolbar.xml | 0 .../main/res/layout/update_adapter_row.xml | 0 .../res/layout/widget_config_activity.xml | 0 .../main/res/layout/widget_initialized.xml | 0 .../res/layout/widget_initialized_dark.xml | 0 .../main/res/layout/widget_loading.xml | 0 .../main/res/layout/widget_row.xml | 0 .../main/res/layout/widget_separator.xml | 0 .../main/res/menu/tag_settings_activity.xml | 0 .../main/res/menu/task_edit_fragment.xml | 0 .../main/res/menu/task_list_activity.xml | 0 {astrid/src => src}/main/res/raw/gestures | Bin .../main/res/values-ar/strings.xml | 35 +++++ .../main/res/values-bg-rBG/strings.xml | 46 ++++++ .../main/res/values-ca/strings.xml | 37 +++++ .../main/res/values-cs/strings.xml | 49 +++++++ .../main/res/values-da/strings.xml | 29 ++++ .../main/res/values-de/strings.xml | 46 ++++++ .../main/res/values-el/strings.xml | 5 + .../main/res/values-es/strings.xml | 49 +++++++ .../main/res/values-fi/strings.xml | 0 .../main/res/values-fr/strings.xml | 48 +++++++ .../main/res/values-it/strings.xml | 48 +++++++ .../main/res/values-iw/strings.xml | 49 +++++++ .../main/res/values-ja/strings.xml | 50 +++++++ .../main/res/values-ko/strings.xml | 49 +++++++ .../main/res/values-nb/strings.xml | 39 ++++++ .../main/res/values-nl/strings.xml | 47 +++++++ .../main/res/values-pl/strings.xml | 48 +++++++ .../main/res/values-pt-rBR/strings.xml | 48 +++++++ .../main/res/values-pt/strings.xml | 50 +++++++ .../main/res/values-ru/strings.xml | 49 +++++++ .../main/res/values-sl-rSI/strings.xml | 48 +++++++ .../main/res/values-sv/strings.xml | 47 +++++++ .../main/res/values-th/strings.xml | 6 + .../main/res/values-tr/strings.xml | 47 +++++++ .../main/res/values-uk/strings.xml | 45 ++++++ .../main/res/values-v11/styles.xml | 0 .../main/res/values-v14/dimens.xml | 0 .../main/res/values-v21/styles.xml | 0 .../main/res/values-w820dp/dimens.xml | 0 .../main/res/values-zh-rCN/strings.xml | 49 +++++++ .../main/res/values-zh-rTW/strings.xml | 49 +++++++ {astrid/src => src}/main/res/values/attrs.xml | 0 .../src => src}/main/res/values/colors.xml | 8 ++ .../main/res/values/cwac_touchlist_attrs.xml | 0 .../src => src}/main/res/values/dimens.xml | 0 .../src => src}/main/res/values/integers.xml | 0 {astrid/src => src}/main/res/values/keys.xml | 0 .../main/res/values/strings-actfm.xml | 0 .../main/res/values/strings-alarms.xml | 0 .../main/res/values/strings-backup.xml | 0 .../main/res/values/strings-core.xml | 0 .../main/res/values/strings-defaults.xml | 0 .../main/res/values/strings-filters.xml | 0 .../main/res/values/strings-gcal.xml | 0 .../main/res/values/strings-gtasks.xml | 0 .../main/res/values/strings-locale.xml | 0 .../main/res/values/strings-ppack.xml | 0 .../main/res/values/strings-premium.xml | 0 .../main/res/values/strings-reminders.xml | 0 .../main/res/values/strings-repeat.xml | 0 .../main/res/values/strings-tags.xml | 0 .../main/res/values/strings-timers.xml | 0 .../main/res/values/strings-voice.xml | 0 .../main/res/values/strings-widget.xml | 0 src/main/res/values/strings.xml | 131 ++++++++++++++++++ .../src => src}/main/res/values/styles.xml | 0 .../src => src}/main/res/xml/preferences.xml | 0 .../main/res/xml/preferences_backup.xml | 0 .../main/res/xml/preferences_blank.xml | 0 .../main/res/xml/preferences_defaults.xml | 0 .../main/res/xml/preferences_gtasks.xml | 0 .../main/res/xml/preferences_misc.xml | 0 .../main/res/xml/preferences_oldtasks.xml | 0 .../main/res/xml/preferences_reminders.xml | 0 .../xml/scrollable_widget_provider_info.xml | 0 .../main/res/xml/widget_provider_info.xml | 0 779 files changed, 1388 insertions(+), 1743 deletions(-) delete mode 100644 api/LICENSE delete mode 100644 api/build.gradle delete mode 100644 api/project.properties delete mode 100644 api/src/main/AndroidManifest.xml delete mode 100644 api/src/main/res/values-ar/strings.xml delete mode 100644 api/src/main/res/values-bg-rBG/strings.xml delete mode 100644 api/src/main/res/values-ca/strings.xml delete mode 100644 api/src/main/res/values-cs/strings.xml delete mode 100644 api/src/main/res/values-da/strings.xml delete mode 100644 api/src/main/res/values-de/strings.xml delete mode 100644 api/src/main/res/values-el/strings.xml delete mode 100644 api/src/main/res/values-es/strings.xml delete mode 100644 api/src/main/res/values-fi/strings.xml delete mode 100644 api/src/main/res/values-fr/strings.xml delete mode 100644 api/src/main/res/values-it/strings.xml delete mode 100644 api/src/main/res/values-iw/strings.xml delete mode 100644 api/src/main/res/values-ja/strings.xml delete mode 100644 api/src/main/res/values-ko/strings.xml delete mode 100644 api/src/main/res/values-nb/strings.xml delete mode 100644 api/src/main/res/values-nl/strings.xml delete mode 100644 api/src/main/res/values-pl/strings.xml delete mode 100644 api/src/main/res/values-pt-rBR/strings.xml delete mode 100644 api/src/main/res/values-pt/strings.xml delete mode 100644 api/src/main/res/values-ru/strings.xml delete mode 100644 api/src/main/res/values-sl-rSI/strings.xml delete mode 100644 api/src/main/res/values-sv/strings.xml delete mode 100644 api/src/main/res/values-th/strings.xml delete mode 100644 api/src/main/res/values-tr/strings.xml delete mode 100644 api/src/main/res/values-uk/strings.xml delete mode 100644 api/src/main/res/values-zh-rCN/strings.xml delete mode 100644 api/src/main/res/values-zh-rTW/strings.xml delete mode 100644 api/src/main/res/values/colors.xml delete mode 100644 api/src/main/res/values/keys.xml delete mode 100644 api/src/main/res/values/strings.xml delete mode 100644 astrid/build.gradle delete mode 100644 astrid/src/main/res/values/strings.xml rename {astrid/graphics => graphics}/checkmark-notification.ai (100%) rename {astrid/graphics => graphics}/checkmark-notification.png (100%) rename {astrid/graphics => graphics}/checkmark.ai (100%) rename {astrid/graphics => graphics}/checkmark.png (100%) rename astrid/project.properties => project.properties (100%) delete mode 100644 settings.gradle rename {astrid/src => src}/androidTest/java/com/todoroo/andlib/test/TranslationTests.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/andlib/utility/RelativeDayTest.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/backup/BackupServiceTests.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/data/TaskTest.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/gtasks/GtasksTestPreferenceService.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilitiesTest.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/model/TaskTest.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/provider/Astrid3ProviderTests.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/reminders/NotificationsTest.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/reminders/NotifyAtDeadlineTest.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListenerTest.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/sync/SyncModelTest.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/test/AstridTranslationTest.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/test/DatabaseTestCase.java (100%) rename {astrid/src => src}/androidTest/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpecTest.java (100%) rename {astrid/src => src}/androidTest/java/org/tasks/Freeze.java (100%) rename {astrid/src => src}/androidTest/java/org/tasks/RemoteModelHelpers.java (100%) rename {astrid/src => src}/androidTest/java/org/tasks/Snippet.java (100%) rename {astrid/src => src}/androidTest/java/org/tasks/TestUtilities.java (100%) rename {astrid/src => src}/androidTest/java/org/tasks/date/DateTimeUtilsTest.java (100%) rename {astrid/src => src}/androidTest/java/org/tasks/injection/InjectingTestCase.java (100%) rename {astrid/src => src}/androidTest/java/org/tasks/injection/TestModule.java (100%) rename {astrid/src => src}/androidTest/res/.do.not.delete (100%) rename {astrid/src => src}/main/AndroidManifest.xml (100%) rename {astrid/src => src}/main/assets/logback.xml (100%) rename {astrid/src => src}/main/java/com/commonsware/cwac/tlv/TouchListView.java (100%) rename {astrid/src => src}/main/java/com/faizmalkani/floatingactionbutton/FloatingActionButton.java (100%) rename {astrid/src => src}/main/java/com/mdimension/jchronic/AstridChronic.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/data/AbstractDatabase.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/data/AbstractModel.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/data/Callback.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/data/DatabaseDao.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/data/Property.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/data/Table.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/data/TodorooCursor.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/service/ContextManager.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/sql/Criterion.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/sql/DBObject.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/sql/Field.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/sql/Functions.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/sql/Join.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/sql/JoinType.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/sql/Operator.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/sql/Order.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/sql/OrderType.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/sql/Query.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/sql/QueryTemplate.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/sql/SqlConstants.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/sql/SqlTable.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/sql/UnaryCriterion.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/utility/AndroidUtilities.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/utility/DateUtilities.java (99%) rename {api/src => src}/main/java/com/todoroo/andlib/utility/DialogUtilities.java (99%) rename {api/src => src}/main/java/com/todoroo/andlib/utility/Pair.java (100%) rename {api/src => src}/main/java/com/todoroo/andlib/utility/Preferences.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/actfm/TagSettingsActivityTablet.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/actfm/TagViewFragment.java (99%) rename {astrid/src => src}/main/java/com/todoroo/astrid/activity/AstridActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/activity/BeastModePreferences.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/activity/EditPreferences.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/activity/ShortcutActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/activity/TaskEditActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/activity/TaskEditFragment.java (99%) rename {astrid/src => src}/main/java/com/todoroo/astrid/activity/TaskEditViewPager.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/activity/TaskListActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/activity/TaskListFragment.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/adapter/FilterAdapter.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/adapter/TaskAdapter.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/alarms/AlarmFields.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/alarms/AlarmService.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/api/Addon.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/api/AstridApiConstants.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/api/AstridFilterExposer.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/api/Filter.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/api/FilterListItem.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/api/FilterWithCustomIntent.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/api/FilterWithUpdate.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/api/PermaSql.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/api/TaskAction.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/api/TextInputCriterion.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/backup/BackupConstants.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/backup/BackupPreferences.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/backup/BackupService.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/backup/BackupStartupReceiver.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/backup/FilePickerBuilder.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/calls/MissedCallActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/core/CoreFilterExposer.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/core/CustomFilterActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/core/CustomFilterExposer.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/core/DefaultsPreferences.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/core/FilterView.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/core/LinkActionExposer.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/core/OldTaskPreferences.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/core/SavedFilter.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/core/SortHelper.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/dao/Database.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/dao/MetadataDao.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/dao/RemoteModelDao.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/dao/StoreObjectDao.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/dao/TagDataDao.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/dao/TaskAttachmentDao.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/dao/TaskDao.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/dao/TaskListMetadataDao.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/dao/UserActivityDao.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/data/Metadata.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/data/RemoteModel.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/data/StoreObject.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/data/SyncFlags.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/data/TagData.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/data/Task.java (99%) rename {api/src => src}/main/java/com/todoroo/astrid/data/TaskApiDao.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/data/TaskAttachment.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/data/TaskListMetadata.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/data/UserActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/files/AACRecordingActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/files/FileExplore.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/files/FileUtilities.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/files/FilesAction.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/files/FilesControlSet.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gcal/CalendarStartupReceiver.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gcal/Calendars.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gcal/GCalControlSet.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gcal/GCalHelper.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/GtasksBackgroundService.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/GtasksList.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/GtasksListService.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/GtasksMetadata.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/GtasksPreferences.java (79%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/GtasksScheduler.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/GtasksStartupReceiver.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListUpdater.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/api/GoogleTasksException.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/api/HttpNotFoundException.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/api/MoveRequest.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/helper/MetadataHelper.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/helper/SyncActionHelper.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/helper/TaskEditControlSet.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/helper/UUIDHelper.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/notes/EditNoteActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/notes/NoteMetadata.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/notes/NotesAction.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/provider/SqlContentProvider.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/reminders/NotificationFragment.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/reminders/Notifications.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/reminders/ReminderDialog.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/reminders/ReminderSchedulingService.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/reminders/ReminderService.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/reminders/ReminderStartupReceiver.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/reminders/ShowNotificationReceiver.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/reminders/SnoozeCallback.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/reminders/SnoozeDialog.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/service/MarketStrategy.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/service/StartupService.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/service/SyncV2Service.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/service/SynchronizeMetadataCallback.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/service/TaskCreator.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/service/TaskDeleter.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/service/TaskDuplicator.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/service/TaskService.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/service/UpdateScreenFlow.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/service/UpgradeService.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/service/WidgetUpdatingCallbackWrapper.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/subtasks/OrderedListFragmentHelperInterface.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/subtasks/SubtasksUpdater.java (100%) rename {api/src => src}/main/java/com/todoroo/astrid/sync/SyncResultCallback.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/tags/DeleteTagActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/tags/RenameTagActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/tags/TagActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/tags/TagFilterExposer.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/tags/TagService.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/tags/TagsControlSet.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/tags/TaskToTagMetadata.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/timers/TimerControlSet.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/timers/TimerPlugin.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/timers/TimerTaskCompleteListener.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/AstridTimePicker.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/CalendarView.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/CheckableImageView.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/CustomBorderDrawable.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/DateAndTimeDialog.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/DeadlineNumberPicker.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/DraggableListView.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/EditDialogOkBackground.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/MultilineCheckboxPreference.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/MultilineHelper.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/MultilineListPreference.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/MultilinePreference.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/NumberPicker.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/NumberPickerButton.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/NumberPickerDialog.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/PopupControlSet.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/QuickAddBar.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/ReminderControlSet.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/utility/Constants.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/utility/Flags.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/utility/TitleParser.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/utility/TodorooPreferenceActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/voice/AACRecorder.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java (94%) rename {astrid/src => src}/main/java/com/todoroo/astrid/voice/VoiceOutputAssistant.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/widget/TasksWidget.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/widget/WidgetConfigActivity.java (100%) rename {astrid/src => src}/main/java/com/todoroo/astrid/widget/WidgetUpdateService.java (100%) rename {astrid/src => src}/main/java/org/tasks/Broadcaster.java (100%) rename {astrid/src => src}/main/java/org/tasks/Tasks.java (100%) rename {api/src => src}/main/java/org/tasks/date/DateTimeUtils.java (100%) rename {api/src => src}/main/java/org/tasks/files/FileHelper.java (100%) rename {api/src => src}/main/java/org/tasks/files/ImageHelper.java (100%) rename {astrid/src => src}/main/java/org/tasks/filters/FilterCounter.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/ActivityModule.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/BroadcastModule.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/ContentProviderModule.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/Dagger.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/ForActivity.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/ForApplication.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/FragmentModule.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/InjectingActionBarActivity.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/InjectingActivity.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/InjectingAppWidgetProvider.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/InjectingApplication.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/InjectingBroadcastReceiver.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/InjectingContentProvider.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/InjectingFragment.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/InjectingListActivity.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/InjectingListFragment.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/InjectingPreferenceActivity.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/InjectingRemoteViewsService.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/InjectingService.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/InjectingSyncProviderPreferences.java (100%) rename {api/src => src}/main/java/org/tasks/injection/Injector.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/ServiceModule.java (100%) rename {astrid/src => src}/main/java/org/tasks/injection/TasksModule.java (100%) rename {astrid/src => src}/main/java/org/tasks/notifications/NotificationManager.java (100%) rename {astrid/src => src}/main/java/org/tasks/preferences/ActivityPreferences.java (100%) rename {astrid/src => src}/main/java/org/tasks/preferences/Preferences.java (100%) rename {astrid/src => src}/main/java/org/tasks/preferences/ResourceResolver.java (100%) rename {astrid/src => src}/main/java/org/tasks/scheduling/RefreshBroadcastReceiver.java (100%) rename {astrid/src => src}/main/java/org/tasks/scheduling/RefreshScheduler.java (100%) rename {astrid/src => src}/main/java/org/tasks/sync/IndeterminateProgressBarSyncResultCallback.java (100%) rename {astrid/src => src}/main/java/org/tasks/sync/RecordSyncStatusCallback.java (100%) rename {astrid/src => src}/main/java/org/tasks/sync/SyncExecutor.java (100%) rename {astrid/src => src}/main/java/org/tasks/sync/SyncThrottle.java (100%) rename {astrid/src => src}/main/java/org/tasks/ui/DraggableSwipeRefreshLayout.java (100%) rename {astrid/src => src}/main/java/org/tasks/ui/NavigationDrawerFragment.java (100%) rename {api/src => src}/main/java/org/tasks/ui/TimePreference.java (100%) rename {astrid/src => src}/main/java/org/tasks/voice/VoiceCommandActivity.java (100%) rename {astrid/src => src}/main/java/org/tasks/widget/ScrollableViewsFactory.java (100%) rename {astrid/src => src}/main/java/org/tasks/widget/ScrollableWidgetUpdateService.java (100%) rename {astrid/src => src}/main/java/org/tasks/widget/WidgetHelper.java (100%) rename {astrid/src => src}/main/res/anim/slide_left_in.xml (100%) rename {astrid/src => src}/main/res/anim/slide_left_out.xml (100%) rename {astrid/src => src}/main/res/anim/slide_right_in.xml (100%) rename {astrid/src => src}/main/res/anim/slide_right_out.xml (100%) rename {astrid/src => src}/main/res/color/task_edit_toggle_button_text.xml (100%) rename {astrid/src => src}/main/res/drawable-hdpi/btn_dismiss_normal.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/btn_dismiss_pressed.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/check_box_1.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/check_box_2.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/check_box_3.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/check_box_4.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/check_box_checked_1.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/check_box_checked_2.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/check_box_checked_3.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/check_box_checked_4.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/check_box_large_1.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/check_box_large_2.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/check_box_large_3.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/check_box_large_4.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/check_box_repeat_1.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/check_box_repeat_2.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/check_box_repeat_3.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/check_box_repeat_4.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/check_box_repeat_checked_1.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/check_box_repeat_checked_2.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/check_box_repeat_checked_3.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/check_box_repeat_checked_4.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/dialog_full_holo_light.9.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/directory_icon.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/directory_up.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/drawer_shadow.9.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/file_icon.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/google.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/ic_action_add.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/ic_action_add_light.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/ic_action_attachment_2.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/ic_action_camera.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/ic_action_cancel.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/ic_action_discard.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/ic_action_gear.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/ic_action_mic.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/ic_action_save.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/ic_action_search.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/ic_menu_close.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/icon.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/notif_astrid.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/single_gear.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_addcal.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_addcal_gray.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_date.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_date_gray.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_date_red.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_edit.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_edit_gray.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_files.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_files_gray.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_hide.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_hide_gray.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_lists.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_lists_gray.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_priority.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_priority_gray.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_reminder.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_reminder_gray.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_repeat.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_repeat_gray.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_timer.png (100%) rename {astrid/src => src}/main/res/drawable-hdpi/tea_icn_timer_gray.png (100%) rename {astrid/src => src}/main/res/drawable-land/separator.png (100%) rename {astrid/src => src}/main/res/drawable-v21/filter_row_selector.xml (100%) rename {astrid/src => src}/main/res/drawable-v21/ripple.xml (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/btn_dismiss_normal.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/btn_dismiss_pressed.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/check_box_1.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/check_box_2.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/check_box_3.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/check_box_4.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/check_box_checked_1.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/check_box_checked_2.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/check_box_checked_3.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/check_box_checked_4.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/check_box_repeat_1.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/check_box_repeat_2.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/check_box_repeat_3.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/check_box_repeat_4.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/check_box_repeat_checked_1.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/check_box_repeat_checked_2.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/check_box_repeat_checked_3.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/check_box_repeat_checked_4.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/dialog_full_holo_light.9.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/drawer_shadow.9.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/ic_action_add.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/ic_action_add_light.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/ic_action_attachment_2.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/ic_action_camera.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/ic_action_cancel.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/ic_action_discard.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/ic_action_gear.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/ic_action_mic.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/ic_action_save.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/ic_action_search.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/icon.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/notif_astrid.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_addcal.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_addcal_gray.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_date.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_date_gray.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_date_red.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_edit.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_edit_gray.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_files.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_files_gray.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_hide.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_hide_gray.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_lists.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_lists_gray.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_priority.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_priority_gray.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_reminder.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_reminder_gray.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_repeat.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_repeat_gray.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_timer.png (100%) rename {astrid/src => src}/main/res/drawable-xhdpi/tea_icn_timer_gray.png (100%) rename {astrid/src => src}/main/res/drawable-xxhdpi/drawer_shadow.9.png (100%) rename {astrid/src => src}/main/res/drawable-xxhdpi/ic_action_add.png (100%) rename {astrid/src => src}/main/res/drawable-xxhdpi/ic_action_add_light.png (100%) rename {astrid/src => src}/main/res/drawable-xxhdpi/ic_action_attachment_2.png (100%) rename {astrid/src => src}/main/res/drawable-xxhdpi/ic_action_camera.png (100%) rename {astrid/src => src}/main/res/drawable-xxhdpi/ic_action_cancel.png (100%) rename {astrid/src => src}/main/res/drawable-xxhdpi/ic_action_discard.png (100%) rename {astrid/src => src}/main/res/drawable-xxhdpi/ic_action_gear.png (100%) rename {astrid/src => src}/main/res/drawable-xxhdpi/ic_action_mic.png (100%) rename {astrid/src => src}/main/res/drawable-xxhdpi/ic_action_save.png (100%) rename {astrid/src => src}/main/res/drawable-xxhdpi/ic_action_search.png (100%) rename {astrid/src => src}/main/res/drawable-xxhdpi/icon.png (100%) rename {astrid/src => src}/main/res/drawable-xxhdpi/notif_astrid.png (100%) rename {astrid/src => src}/main/res/drawable/action_attachments.png (100%) rename {astrid/src => src}/main/res/drawable/action_mail.png (100%) rename {astrid/src => src}/main/res/drawable/action_notes.png (100%) rename {astrid/src => src}/main/res/drawable/action_tel.png (100%) rename {astrid/src => src}/main/res/drawable/action_web.png (100%) rename {astrid/src => src}/main/res/drawable/arrow_branch.png (100%) rename {astrid/src => src}/main/res/drawable/arrow_down.png (100%) rename {astrid/src => src}/main/res/drawable/arrow_join.png (100%) rename {astrid/src => src}/main/res/drawable/btn_check.xml (100%) rename {astrid/src => src}/main/res/drawable/btn_check_small.xml (100%) rename {astrid/src => src}/main/res/drawable/btn_dismiss.xml (100%) rename {astrid/src => src}/main/res/drawable/btn_dismiss_normal.png (100%) rename {astrid/src => src}/main/res/drawable/btn_dismiss_pressed.png (100%) rename {astrid/src => src}/main/res/drawable/check_box_1.png (100%) rename {astrid/src => src}/main/res/drawable/check_box_2.png (100%) rename {astrid/src => src}/main/res/drawable/check_box_3.png (100%) rename {astrid/src => src}/main/res/drawable/check_box_4.png (100%) rename {astrid/src => src}/main/res/drawable/check_box_checked_1.png (100%) rename {astrid/src => src}/main/res/drawable/check_box_checked_2.png (100%) rename {astrid/src => src}/main/res/drawable/check_box_checked_3.png (100%) rename {astrid/src => src}/main/res/drawable/check_box_checked_4.png (100%) rename {astrid/src => src}/main/res/drawable/check_box_large_1.png (100%) rename {astrid/src => src}/main/res/drawable/check_box_large_2.png (100%) rename {astrid/src => src}/main/res/drawable/check_box_large_3.png (100%) rename {astrid/src => src}/main/res/drawable/check_box_large_4.png (100%) rename {astrid/src => src}/main/res/drawable/check_box_repeat_1.png (100%) rename {astrid/src => src}/main/res/drawable/check_box_repeat_2.png (100%) rename {astrid/src => src}/main/res/drawable/check_box_repeat_3.png (100%) rename {astrid/src => src}/main/res/drawable/check_box_repeat_4.png (100%) rename {astrid/src => src}/main/res/drawable/check_box_repeat_checked_1.png (100%) rename {astrid/src => src}/main/res/drawable/check_box_repeat_checked_2.png (100%) rename {astrid/src => src}/main/res/drawable/check_box_repeat_checked_3.png (100%) rename {astrid/src => src}/main/res/drawable/check_box_repeat_checked_4.png (100%) rename {astrid/src => src}/main/res/drawable/default_list_0.png (100%) rename {astrid/src => src}/main/res/drawable/default_list_1.png (100%) rename {astrid/src => src}/main/res/drawable/default_list_2.png (100%) rename {astrid/src => src}/main/res/drawable/default_list_3.png (100%) rename {astrid/src => src}/main/res/drawable/dialog_full_holo_light.9.png (100%) rename {astrid/src => src}/main/res/drawable/drawer_shadow.9.png (100%) rename {astrid/src => src}/main/res/drawable/file_type_background.xml (100%) rename {astrid/src => src}/main/res/drawable/filter_row_selector.xml (100%) rename {astrid/src => src}/main/res/drawable/filter_selected_icon.png (100%) rename {astrid/src => src}/main/res/drawable/filter_selected_icon_black.png (100%) rename {astrid/src => src}/main/res/drawable/footer_editbutton.xml (100%) rename {astrid/src => src}/main/res/drawable/footer_editbutton_normal.9.png (100%) rename {astrid/src => src}/main/res/drawable/footer_editbutton_pressed.9.png (100%) rename {astrid/src => src}/main/res/drawable/google.png (100%) rename {astrid/src => src}/main/res/drawable/grabber.png (100%) rename {astrid/src => src}/main/res/drawable/gtasks_icon.png (100%) rename {astrid/src => src}/main/res/drawable/ic_action_add.png (100%) rename {astrid/src => src}/main/res/drawable/ic_action_add_light.png (100%) rename {astrid/src => src}/main/res/drawable/ic_action_attachment_2.png (100%) rename {astrid/src => src}/main/res/drawable/ic_action_camera.png (100%) rename {astrid/src => src}/main/res/drawable/ic_action_cancel.png (100%) rename {astrid/src => src}/main/res/drawable/ic_action_discard.png (100%) rename {astrid/src => src}/main/res/drawable/ic_action_gear.png (100%) rename {astrid/src => src}/main/res/drawable/ic_action_mic.png (100%) rename {astrid/src => src}/main/res/drawable/ic_action_save.png (100%) rename {astrid/src => src}/main/res/drawable/ic_action_search.png (100%) rename {astrid/src => src}/main/res/drawable/ic_menu_close.png (100%) rename {astrid/src => src}/main/res/drawable/icn_arrow_down.png (100%) rename {astrid/src => src}/main/res/drawable/icn_arrow_left.png (100%) rename {astrid/src => src}/main/res/drawable/icn_arrow_right.png (100%) rename {astrid/src => src}/main/res/drawable/icn_arrow_up.png (100%) rename {astrid/src => src}/main/res/drawable/icn_check_off.png (100%) rename {astrid/src => src}/main/res/drawable/icn_check_on.png (100%) rename {astrid/src => src}/main/res/drawable/icn_edit_timer.png (100%) rename {astrid/src => src}/main/res/drawable/icn_timer_stop.png (100%) rename {astrid/src => src}/main/res/drawable/icon.png (100%) rename {astrid/src => src}/main/res/drawable/importance_background_selected.xml (100%) rename {astrid/src => src}/main/res/drawable/none.png (100%) rename {astrid/src => src}/main/res/drawable/notif_astrid.png (100%) rename {astrid/src => src}/main/res/drawable/panel_background.9.png (100%) rename {astrid/src => src}/main/res/drawable/reminder_dialog_background.xml (100%) rename {astrid/src => src}/main/res/drawable/reminder_dialog_inset_background.xml (100%) rename {astrid/src => src}/main/res/drawable/single_gear.png (100%) rename {astrid/src => src}/main/res/drawable/speech_bubble_reminder.9.png (100%) rename {astrid/src => src}/main/res/drawable/tango_alpha.png (100%) rename {astrid/src => src}/main/res/drawable/tango_calendar.png (100%) rename {astrid/src => src}/main/res/drawable/tango_warning.png (100%) rename {astrid/src => src}/main/res/drawable/task_edit_background.xml (100%) rename {astrid/src => src}/main/res/drawable/task_edit_background_transparent_white.xml (100%) rename {astrid/src => src}/main/res/drawable/task_edit_background_white.xml (100%) rename {astrid/src => src}/main/res/drawable/task_row_bg_dark.xml (100%) rename {astrid/src => src}/main/res/drawable/task_row_bg_white.xml (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_addcal.png (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_addcal_gray.png (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_date.png (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_date_gray.png (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_date_red.png (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_edit.png (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_edit_gray.png (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_files.png (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_files_gray.png (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_hide.png (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_hide_gray.png (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_lists.png (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_lists_gray.png (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_priority.png (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_priority_gray.png (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_reminder.png (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_reminder_gray.png (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_repeat.png (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_repeat_gray.png (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_timer.png (100%) rename {astrid/src => src}/main/res/drawable/tea_icn_timer_gray.png (100%) rename {astrid/src => src}/main/res/drawable/timepicker_down_btn.xml (100%) rename {astrid/src => src}/main/res/drawable/timepicker_down_disabled.9.png (100%) rename {astrid/src => src}/main/res/drawable/timepicker_down_normal.9.png (100%) rename {astrid/src => src}/main/res/drawable/timepicker_down_pressed.9.png (100%) rename {astrid/src => src}/main/res/drawable/timepicker_down_selected.9.png (100%) rename {astrid/src => src}/main/res/drawable/timepicker_input.xml (100%) rename {astrid/src => src}/main/res/drawable/timepicker_input_disabled.9.png (100%) rename {astrid/src => src}/main/res/drawable/timepicker_input_normal.9.png (100%) rename {astrid/src => src}/main/res/drawable/timepicker_input_pressed.9.png (100%) rename {astrid/src => src}/main/res/drawable/timepicker_input_selected.9.png (100%) rename {astrid/src => src}/main/res/drawable/timepicker_up_btn.xml (100%) rename {astrid/src => src}/main/res/drawable/timepicker_up_disabled.9.png (100%) rename {astrid/src => src}/main/res/drawable/timepicker_up_normal.9.png (100%) rename {astrid/src => src}/main/res/drawable/timepicker_up_pressed.9.png (100%) rename {astrid/src => src}/main/res/drawable/timepicker_up_selected.9.png (100%) rename {astrid/src => src}/main/res/drawable/timers_notification.png (100%) rename {astrid/src => src}/main/res/layout-land/astrid_reminder_view.xml (100%) rename {astrid/src => src}/main/res/layout-land/date_time_picker_no_shortcuts.xml (100%) rename {astrid/src => src}/main/res/layout-w820dp/task_edit_wrapper_activity.xml (100%) rename {astrid/src => src}/main/res/layout-w820dp/task_list_wrapper.xml (100%) rename {astrid/src => src}/main/res/layout/aac_record_activity.xml (100%) rename {astrid/src => src}/main/res/layout/alarm_edit_row.xml (100%) rename {astrid/src => src}/main/res/layout/astrid_calendar_list_creator_view.xml (100%) rename {astrid/src => src}/main/res/layout/astrid_calendar_reminder_view.xml (100%) rename {astrid/src => src}/main/res/layout/astrid_missed_call_view.xml (100%) rename {astrid/src => src}/main/res/layout/astrid_record_audio_view.xml (100%) rename {astrid/src => src}/main/res/layout/astrid_reminder_view.xml (100%) rename {astrid/src => src}/main/res/layout/astrid_reminder_view_portrait.xml (100%) rename {astrid/src => src}/main/res/layout/astrid_speech_bubble.xml (100%) rename {astrid/src => src}/main/res/layout/astrid_time_picker_horizontal.xml (100%) rename {astrid/src => src}/main/res/layout/beast_mode_pref_activity.xml (100%) rename {astrid/src => src}/main/res/layout/calendar_alarm_list_creator.xml (100%) rename {astrid/src => src}/main/res/layout/calendar_reminder_activity.xml (100%) rename {astrid/src => src}/main/res/layout/control_dialog_ok.xml (100%) rename {astrid/src => src}/main/res/layout/control_set_alarms.xml (100%) rename {astrid/src => src}/main/res/layout/control_set_deadline.xml (100%) rename {astrid/src => src}/main/res/layout/control_set_deadline_display.xml (100%) rename {astrid/src => src}/main/res/layout/control_set_default_display.xml (100%) rename {astrid/src => src}/main/res/layout/control_set_files.xml (100%) rename {astrid/src => src}/main/res/layout/control_set_files_display.xml (100%) rename {astrid/src => src}/main/res/layout/control_set_gcal.xml (100%) rename {astrid/src => src}/main/res/layout/control_set_gcal_display.xml (100%) rename {astrid/src => src}/main/res/layout/control_set_hide.xml (100%) rename {astrid/src => src}/main/res/layout/control_set_importance.xml (100%) rename {astrid/src => src}/main/res/layout/control_set_notes.xml (100%) rename {astrid/src => src}/main/res/layout/control_set_notes_display.xml (100%) rename {astrid/src => src}/main/res/layout/control_set_reminders.xml (100%) rename {astrid/src => src}/main/res/layout/control_set_repeat.xml (100%) rename {astrid/src => src}/main/res/layout/control_set_repeat_display.xml (100%) rename {astrid/src => src}/main/res/layout/control_set_tags.xml (100%) rename {astrid/src => src}/main/res/layout/control_set_timers.xml (100%) rename {astrid/src => src}/main/res/layout/control_set_title.xml (100%) rename {astrid/src => src}/main/res/layout/custom_filter_activity.xml (100%) rename {astrid/src => src}/main/res/layout/custom_filter_row.xml (100%) rename {astrid/src => src}/main/res/layout/date_time_dialog.xml (100%) rename {astrid/src => src}/main/res/layout/date_time_picker_no_shortcuts.xml (100%) rename {astrid/src => src}/main/res/layout/deadline_number_picker.xml (100%) rename {astrid/src => src}/main/res/layout/file_display_row.xml (100%) rename {astrid/src => src}/main/res/layout/file_row.xml (100%) rename {astrid/src => src}/main/res/layout/filter_adapter_row.xml (100%) rename {astrid/src => src}/main/res/layout/fragment_navigation_drawer.xml (100%) rename {astrid/src => src}/main/res/layout/gtasks_login_activity.xml (100%) rename {astrid/src => src}/main/res/layout/missed_call_activity.xml (100%) rename {astrid/src => src}/main/res/layout/n_number_picker_dialog.xml (100%) rename {astrid/src => src}/main/res/layout/notes_view_dialog.xml (100%) rename {astrid/src => src}/main/res/layout/number_picker.xml (100%) rename {astrid/src => src}/main/res/layout/number_picker_dialog.xml (100%) rename {astrid/src => src}/main/res/layout/preference_draggable_row.xml (100%) rename {astrid/src => src}/main/res/layout/repeat_until_dialog.xml (100%) rename {astrid/src => src}/main/res/layout/scrollable_widget_dark.xml (100%) rename {astrid/src => src}/main/res/layout/scrollable_widget_light.xml (100%) rename {astrid/src => src}/main/res/layout/simple_list_item_multiple_choice_themed.xml (100%) rename {astrid/src => src}/main/res/layout/snooze_dialog.xml (100%) rename {astrid/src => src}/main/res/layout/sort_selection_dialog.xml (100%) rename {api/src => src}/main/res/layout/status_preference.xml (100%) rename {astrid/src => src}/main/res/layout/tag_edit_row.xml (100%) rename {astrid/src => src}/main/res/layout/tag_settings_activity.xml (100%) rename {astrid/src => src}/main/res/layout/task_adapter_row_simple.xml (100%) rename {astrid/src => src}/main/res/layout/task_edit_activity.xml (100%) rename {astrid/src => src}/main/res/layout/task_edit_when_controls.xml (100%) rename {astrid/src => src}/main/res/layout/task_edit_wrapper_activity.xml (100%) rename {astrid/src => src}/main/res/layout/task_list_activity.xml (100%) rename {astrid/src => src}/main/res/layout/task_list_body_standard.xml (100%) rename {astrid/src => src}/main/res/layout/task_list_body_subtasks.xml (100%) rename {astrid/src => src}/main/res/layout/task_list_swipe_layout_empty.xml (100%) rename {astrid/src => src}/main/res/layout/task_list_wrapper.xml (100%) rename {astrid/src => src}/main/res/layout/toolbar.xml (100%) rename {astrid/src => src}/main/res/layout/update_adapter_row.xml (100%) rename {astrid/src => src}/main/res/layout/widget_config_activity.xml (100%) rename {astrid/src => src}/main/res/layout/widget_initialized.xml (100%) rename {astrid/src => src}/main/res/layout/widget_initialized_dark.xml (100%) rename {astrid/src => src}/main/res/layout/widget_loading.xml (100%) rename {astrid/src => src}/main/res/layout/widget_row.xml (100%) rename {astrid/src => src}/main/res/layout/widget_separator.xml (100%) rename {astrid/src => src}/main/res/menu/tag_settings_activity.xml (100%) rename {astrid/src => src}/main/res/menu/task_edit_fragment.xml (100%) rename {astrid/src => src}/main/res/menu/task_list_activity.xml (100%) rename {astrid/src => src}/main/res/raw/gestures (100%) rename {astrid/src => src}/main/res/values-ar/strings.xml (68%) rename {astrid/src => src}/main/res/values-bg-rBG/strings.xml (89%) rename {astrid/src => src}/main/res/values-ca/strings.xml (90%) rename {astrid/src => src}/main/res/values-cs/strings.xml (91%) rename {astrid/src => src}/main/res/values-da/strings.xml (91%) rename {astrid/src => src}/main/res/values-de/strings.xml (92%) rename {astrid/src => src}/main/res/values-el/strings.xml (98%) rename {astrid/src => src}/main/res/values-es/strings.xml (92%) rename {astrid/src => src}/main/res/values-fi/strings.xml (100%) rename {astrid/src => src}/main/res/values-fr/strings.xml (92%) rename {astrid/src => src}/main/res/values-it/strings.xml (91%) rename {astrid/src => src}/main/res/values-iw/strings.xml (92%) rename {astrid/src => src}/main/res/values-ja/strings.xml (92%) rename {astrid/src => src}/main/res/values-ko/strings.xml (92%) rename {astrid/src => src}/main/res/values-nb/strings.xml (87%) rename {astrid/src => src}/main/res/values-nl/strings.xml (92%) rename {astrid/src => src}/main/res/values-pl/strings.xml (92%) rename {astrid/src => src}/main/res/values-pt-rBR/strings.xml (91%) rename {astrid/src => src}/main/res/values-pt/strings.xml (92%) rename {astrid/src => src}/main/res/values-ru/strings.xml (92%) rename {astrid/src => src}/main/res/values-sl-rSI/strings.xml (92%) rename {astrid/src => src}/main/res/values-sv/strings.xml (92%) rename {astrid/src => src}/main/res/values-th/strings.xml (95%) rename {astrid/src => src}/main/res/values-tr/strings.xml (92%) rename {astrid/src => src}/main/res/values-uk/strings.xml (93%) rename {astrid/src => src}/main/res/values-v11/styles.xml (100%) rename {astrid/src => src}/main/res/values-v14/dimens.xml (100%) rename {astrid/src => src}/main/res/values-v21/styles.xml (100%) rename {astrid/src => src}/main/res/values-w820dp/dimens.xml (100%) rename {astrid/src => src}/main/res/values-zh-rCN/strings.xml (91%) rename {astrid/src => src}/main/res/values-zh-rTW/strings.xml (92%) rename {astrid/src => src}/main/res/values/attrs.xml (100%) rename {astrid/src => src}/main/res/values/colors.xml (80%) rename {astrid/src => src}/main/res/values/cwac_touchlist_attrs.xml (100%) rename {astrid/src => src}/main/res/values/dimens.xml (100%) rename {astrid/src => src}/main/res/values/integers.xml (100%) rename {astrid/src => src}/main/res/values/keys.xml (100%) rename {astrid/src => src}/main/res/values/strings-actfm.xml (100%) rename {astrid/src => src}/main/res/values/strings-alarms.xml (100%) rename {astrid/src => src}/main/res/values/strings-backup.xml (100%) rename {astrid/src => src}/main/res/values/strings-core.xml (100%) rename {astrid/src => src}/main/res/values/strings-defaults.xml (100%) rename {astrid/src => src}/main/res/values/strings-filters.xml (100%) rename {astrid/src => src}/main/res/values/strings-gcal.xml (100%) rename {astrid/src => src}/main/res/values/strings-gtasks.xml (100%) rename {astrid/src => src}/main/res/values/strings-locale.xml (100%) rename {astrid/src => src}/main/res/values/strings-ppack.xml (100%) rename {astrid/src => src}/main/res/values/strings-premium.xml (100%) rename {astrid/src => src}/main/res/values/strings-reminders.xml (100%) rename {astrid/src => src}/main/res/values/strings-repeat.xml (100%) rename {astrid/src => src}/main/res/values/strings-tags.xml (100%) rename {astrid/src => src}/main/res/values/strings-timers.xml (100%) rename {astrid/src => src}/main/res/values/strings-voice.xml (100%) rename {astrid/src => src}/main/res/values/strings-widget.xml (100%) create mode 100644 src/main/res/values/strings.xml rename {astrid/src => src}/main/res/values/styles.xml (100%) rename {astrid/src => src}/main/res/xml/preferences.xml (100%) rename {astrid/src => src}/main/res/xml/preferences_backup.xml (100%) rename {astrid/src => src}/main/res/xml/preferences_blank.xml (100%) rename {astrid/src => src}/main/res/xml/preferences_defaults.xml (100%) rename {astrid/src => src}/main/res/xml/preferences_gtasks.xml (100%) rename {astrid/src => src}/main/res/xml/preferences_misc.xml (100%) rename {astrid/src => src}/main/res/xml/preferences_oldtasks.xml (100%) rename {astrid/src => src}/main/res/xml/preferences_reminders.xml (100%) rename {astrid/src => src}/main/res/xml/scrollable_widget_provider_info.xml (100%) rename {astrid/src => src}/main/res/xml/widget_provider_info.xml (100%) diff --git a/api/LICENSE b/api/LICENSE deleted file mode 100644 index c0c5ea933..000000000 --- a/api/LICENSE +++ /dev/null @@ -1,24 +0,0 @@ -Copyright (c) 2010, Todoroo, Inc -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/api/build.gradle b/api/build.gradle deleted file mode 100644 index 1fe8e2abc..000000000 --- a/api/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -apply plugin: 'com.android.library' - -repositories { - mavenCentral() -} - -android { - lintOptions { - lintConfig file("../lint.xml") - } - compileSdkVersion 21 - buildToolsVersion "21.1.1" - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - - defaultConfig { - minSdkVersion 7 - targetSdkVersion 21 - } -} - -dependencies { - provided group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.2' - compile group: 'com.squareup.dagger', name: 'dagger', version: '1.2.2' - - compile group: 'com.android.support', name: 'support-v4', version: '21.0.0' - - compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.7' - compile group: 'joda-time', name: 'joda-time', version: '2.3', transitive: false -} diff --git a/api/project.properties b/api/project.properties deleted file mode 100644 index c57400d00..000000000 --- a/api/project.properties +++ /dev/null @@ -1,12 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -android.library=true -# Project target. -target=android-19 diff --git a/api/src/main/AndroidManifest.xml b/api/src/main/AndroidManifest.xml deleted file mode 100644 index 2badb00eb..000000000 --- a/api/src/main/AndroidManifest.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - diff --git a/api/src/main/res/values-ar/strings.xml b/api/src/main/res/values-ar/strings.xml deleted file mode 100644 index 5d54e4d98..000000000 --- a/api/src/main/res/values-ar/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - اليوم - غدا - أمس - غدا - أمس - أكّد - سؤال: - معلومة - إغلاق - إنتظر من فضلك... - تحيين و نسخ احتياطي - الحالة - الحالة: %s - لم يتم تسجيل الدخول - جاري التحيين... - آخر تحيين:\n%s - فشل في: %s - فشل مع أخطاء في: %s - لم يتم التحيين قَطّ - الخيارات - تحيين في الخلفية - إرسال تقرير - خروج - - تعطيل - كل 15 دقيقة - every thirty minutes - every hour - every three hours - every six hours - كل 12 ساعة - every day - every three days - every week - - \ No newline at end of file diff --git a/api/src/main/res/values-bg-rBG/strings.xml b/api/src/main/res/values-bg-rBG/strings.xml deleted file mode 100644 index cc17b8769..000000000 --- a/api/src/main/res/values-bg-rBG/strings.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - 1 задача - %d задачи - - Днес - Утре - Вчера - Утре - Вчера - Потвърждавате? - Въпрос: - Информация - Затвори - Ами сега, изглежда е станала грешка! Ето какво се случи:\n\n%s - Моля, изчакайте... - Синхронизиране и Резервни копия - Състояние - Състояние: %s - Синхронизирането продължава ... - Последна синхронизация:\n%s - Грешка при: %s - Никога не е синхронизиран! - Опции - Синхронзиране във фонов режим - Синхронизация във фонов режим е изключена - В момента е зададено на: %s - Синхронизирай сега - Кликнете, за да изпрати доклад до екипа на Tasks - Изпрати отчет - Излизане - Изчистване на всички данни от синхронзация - Изход/изчистване на данните от синхронизация? - Възникна проблем при свързване към мрежата -при последна синхронизация с %s. Моля, опитайте отново по-късно. - - изключено - на всеки 15 минути - на всеки 30 минути - на всеки час - на всеки три часа - на всеки шест часа - на всеки дванадесет часа - всеки ден - на всеки три дена - всяка седмица - - \ No newline at end of file diff --git a/api/src/main/res/values-ca/strings.xml b/api/src/main/res/values-ca/strings.xml deleted file mode 100644 index d76a19d42..000000000 --- a/api/src/main/res/values-ca/strings.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - 1 tasca - %d tasques - - Avui - Demà - Ahir - Confirmar? - Pregunta: - Informació - Tancar - ¡Ui, sembla que hi ha hagut un problema! Això es el que ha passat:\n\n%s - Si us plau, espera... - Estat - Sincronització en curs... - Última sincronització:\n%s - Fallida el: %s - Mai sincronitzat! - Opcions - Sincronitzar en segon pla - Desactivada la sincronització en segon pla - Actualment configurat en: %s - Surt - Esborra tota la informació de sincronització - Tancar sessió / esborra la informació de sincronització? - - desactivat - cada quince minuts - cada trenta minuts - cada hora - cada tres hores - cada sis hores - cada dotze hores - diàriament - cada tres dies - setmanalment - - \ No newline at end of file diff --git a/api/src/main/res/values-cs/strings.xml b/api/src/main/res/values-cs/strings.xml deleted file mode 100644 index ff6ae54e4..000000000 --- a/api/src/main/res/values-cs/strings.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - 1 úkol - %d úkolů - - Dnes - Zítra - Včera - Zítra - Včera - Potvrdit? - Otázka: - Informace - Zavřít - Jejda, vypadá to, že se vyskytla chyba! Tady je co se stalo:\n\n%s - Čekejte prosím... - Synchronizace - Google Tasks, uložená data, lokální záloha - Stav - Stav: %s - Nepřihlášen - Probíhá synchronizace... - Poslední synchronizace:\n%s - Selhalo: %s - Sync w/ chyby: %s - Nikdo nesynchronizováno! - Možnosti - Synchronizace na pozadí - Synchronizace na pozadí je zakázána - Současně nastaveno na: %s - Synchronizovat nyní - Stavové hlášení - Klepnutím odešlete zprávu týmu Tasks - Odeslat zprávu - Odhlásit se - Smazat všechny synchronizační data - Odhlásit se / vymazat synchronizační data? - Během posledního pokusu o synchronizaci se službou %s nastal problém s připojením k síti. Zkuste to prosím později. - - zakázat - každých patnáct minut - každých třicet minut - každou hodinu - každé tři hodiny - každých šest hodin - každých dvanáct hodin - každý den - každé tři dny - každý týden - - \ No newline at end of file diff --git a/api/src/main/res/values-da/strings.xml b/api/src/main/res/values-da/strings.xml deleted file mode 100644 index a245acae7..000000000 --- a/api/src/main/res/values-da/strings.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - 1 opgave - %d opgaver - - I dag - I morgen - I går - Bekræft? - Spørsmål: - Luk - Vent venligst... - Synkronisering - Indstillinger - Baggrunds Synk - Baggrunds synkronisering er slået fra - Log af - Sletter al synkroniserings data - - disable - every fifteen minutes - every thirty minutes - hver time - hver 3. time - hver 6. time - hver 12. time - hver dag - hver 3. dag - hver uge - - \ No newline at end of file diff --git a/api/src/main/res/values-de/strings.xml b/api/src/main/res/values-de/strings.xml deleted file mode 100644 index 771efd1f8..000000000 --- a/api/src/main/res/values-de/strings.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - 1 Aufgabe - %d Aufgaben - - Heute - Morgen - Gestern - Morg. - Gest. - Bestätigen? - Frage: - Schließen - Ups, sieht aus, als ob ein Fehler aufgetreten ist! Folgendes ist passiert:\n\n%s - Bitte warten... - Synchronisation & Backup - Google Tasks, Gespeicherte Daten, Lokale Backups - Nicht angemeldet - Synchronisierung läuft... - Letzte Synchronisierung:\n%s - Fehlgeschlagen am: %s - Synchronisation m. Fehler: %s - Noch nie synchronisiert! - Optionen - Hintergrund-Synchronisierung - Hintergrund-Synchronisierung ist deaktiviert - Gesetzt auf: %s - Jetzt synchronisieren - Statusbericht - Klicke um einen Bericht ans Tasks-Team zu senden - Bericht senden - Abmelden - Alle Synchronisationsdaten löschen - Ausloggen / Synchronisierte Daten löschen? - Es gab ein Problem mit der Netzwerkverbindung während der letzten Synchronisation mit %s. Versuche es bitte später noch einmal. - - deaktivieren - alle 15 Minuten - alle 30 Minuten - stündlich - alle 3 Stunden - alle 6 Stunden - alle 12 Stunden - täglich - jeden dritten Tag - wöchentlich - - \ No newline at end of file diff --git a/api/src/main/res/values-el/strings.xml b/api/src/main/res/values-el/strings.xml deleted file mode 100644 index 7efc1ab9e..000000000 --- a/api/src/main/res/values-el/strings.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - Σήμερα - Αύριο - Χθές - Κατάσταση - Ρυθμίσεις - \ No newline at end of file diff --git a/api/src/main/res/values-es/strings.xml b/api/src/main/res/values-es/strings.xml deleted file mode 100644 index c16c2fd91..000000000 --- a/api/src/main/res/values-es/strings.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - 1 tarea - %d tareas - - Hoy - Mañana - Ayer - Mñna - Ayer - ¿Confirmar? - Pregunta: - Información - Cerrar - ¡Uy, parece que ocurró un error! Esto es lo que pasó:\n\n%s - Por favor, espere... - Sincronización y copia de seguridad - Google Tasks, información guardada, copia de seguridad local - Estado - Estado: %s - Sesión no iniciada - Sincronización en marcha - Ultima sincronización:\n%s - Falló en: %s - Sincronización con errores: %s - ¡Nunca sincronizado! - Opciones - Sincronización en segundo plano - Sincronización en segundo plano deshabilitada - Actualmente configurado a: %s - Sincronizar ahora - Informe de estado - Click para enviar un informe al equipo de Tasks - Enviar informe - Cerrar sesión - Limpia todos los datos de la sincronización - Cerrar sesión/Limpiar datos de sincronización? - Ha ocurrido un problema conectando a la red durante la última sincronización con %s. Por favor inténtelo nuevamente después. - - deshabilitar - cada quince minutos - cada treinta minutos - cada hora - cada tres horas - cada seis horas - cada doce horas - cada día - cada tres días - cada semana - - \ No newline at end of file diff --git a/api/src/main/res/values-fi/strings.xml b/api/src/main/res/values-fi/strings.xml deleted file mode 100644 index b0b6a6da6..000000000 --- a/api/src/main/res/values-fi/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/api/src/main/res/values-fr/strings.xml b/api/src/main/res/values-fr/strings.xml deleted file mode 100644 index e5bf8b981..000000000 --- a/api/src/main/res/values-fr/strings.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - 1 tâche - %d tâches - - Aujourd\'hui - Demain - Hier - Demain - Hier - Confirmer ? - Question : - Informations - Fermer - Oups, une erreur est survenue ! Voici ce qu\'il s\'est passé :\n\n%s - Veuillez patienter... - Synchronisation - Tâches Google, données enregistrées, sauvegarde locale - Statut - État : %s - Non connecté - Synchronisation en cours... - Dernière synchro. :\n%s - Échec sur : %s - Synchro avec Erreurs: %s - Jamais synchronisé ! - Synchro. en arrière-plan - Synchronisation en arrière-plan désactivée - Actuellement configuré sur : %s - Synchroniser maintenant - Rapport d\'état - Cliquez pour envoyer un rapport à l\'équipe Tasks - Envoyer le rapport - Se déconnecter - Purger toutes les données de synchronisation - Se déconnecter/purger les données de synchronisation ? - Un problème de connexion réseau est survenu lors de la dernière synchronisation avec %s. Merci de réessayer plus tard. - - désactiver - toutes les quinze minutes - toutes les trente minutes - toutes les heures - toutes les trois heures - toutes les six heures - toutes les douze heures - tous les jours - tous les trois jours - toutes les semaines - - \ No newline at end of file diff --git a/api/src/main/res/values-it/strings.xml b/api/src/main/res/values-it/strings.xml deleted file mode 100644 index 7197b7e07..000000000 --- a/api/src/main/res/values-it/strings.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - 1 attività - %d attività - - Oggi - Domani - Ieri - Domani - Ieri - Confermi? - Domanda: - Informazione - Chiudi - Oops, sembra che ci sia stato un errore! E\' successo questo:\n\n%s - Attendi... - Sincronizza & archivia - Attività Google, dati salvati, backup locale - Stato - Stato: %s - Non connesso - Sincronizzazione in corso... - Ultima Sincronizzazione:\n%s - Fallita Su: %s - Sincronizza con gli errori: %s - Mai sincronizzato! - Preferenze - Sincronizzazione eseguita in background - La sincronizzazione in background è disattivata - Attualmente impostata su: %s - Sincronizza ora - \"Clicca per inviare un rapporto al team Tasks\" - Invia rapporto - Esci - Cancella tutti i dati di sincronizzazione - Esci / cancella i file di sincronizzazione? - Problema di connessione alla rete durante l\'ultima sincronizzazione con %s. Riprova dopo. - - disabilita - ogni quindici minuti - ogni trenta minuti - ogni ora - ogni tre ore - ogni sei ore - ogni dodici ore - ogni giorno - ogni tre giorni - Ogni settimana - - \ No newline at end of file diff --git a/api/src/main/res/values-iw/strings.xml b/api/src/main/res/values-iw/strings.xml deleted file mode 100644 index 5bba73e7f..000000000 --- a/api/src/main/res/values-iw/strings.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - משימה אחת - %d משימות - - היום - מחר - אתמול - מחר - אתמול - האם לאשר? - שאלה: - פרטים - סגור - אוּפְּס, נראה שארעה שגיאה! הנה מה שקה:\n\n%s - אנא המתן... - סינכרון וגיבוי - אתר אסטריד, ״משימות גוגל״, מידע שמור, גיבוי מקומי - מצב - מצב: %s - לא מחובר - הסינכרון מתבצע - סנכרון אחרון:\n%s - נכשל ב: %s - סנכרון עם שגיאות: %s - לעולם לא סונכרן! - אפשרויות - סנכרון ברקע - סנכרון ברקע אינו מופעל - כרגע מוגדר ל: %s - מסנכרן כעת - דו\"ח מצב - הקלק כדי לשלוח דוח לצוות של אסטריד - שלח דו\"ח - התנתק - מסיר את כל נתוני הסנכרון - צא מהחשבון \\ הסר נתוני סנכרון? - נתקלתי בבעית חיבור לרשת בזמן הסינכרון האחרון עם %s. אנא נסה מאוחר יותר. - - מִנְעִי - כל רבע שעה - כל חצי שעה - כל שעה - כל שלוש שעות - כל שש שעות - כל שתים עשרה שעות - כל יום - כל שלושה ימים - כל שבוע - - \ No newline at end of file diff --git a/api/src/main/res/values-ja/strings.xml b/api/src/main/res/values-ja/strings.xml deleted file mode 100644 index ec7f39e2e..000000000 --- a/api/src/main/res/values-ja/strings.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - タスク 1 件 - タスク %d 件 - - 今日 - 明日 - 昨日 - 明日 - 昨日 - 確認 - 確認 - インフォメーション - 閉じる - エラーが発生しました! 発生した内容\n\n%s - お待ちください - 同期 - Google Tasks, 保存したデータ, ローカルのバックアップ - 状況 - 状況: %s - ログインしていません - 同期中 - 前回の同期:\n%s - 失敗: %s - 同期でエラー: %s - 同期していません - オプション - バックグラウンド同期 - バックグラウンド同期は無効になっています - 現在の設定: %s - すぐに同期 - 状況レポート - クリックするとTasks チームにレポートを送信します - レポートを送信 - ログアウト - すべての同期データを消去します - ログアウトと同期データを消去しますか? - %s と前回の同期中にネットワークの接続の問題がありました. -後で再度実行してください. - - 無効 - 15分毎 - 30分毎 - 1時間毎 - 3時間毎 - 6時間毎 - 12時間毎 - 毎日 - 3日に一度 - 毎週 - - \ No newline at end of file diff --git a/api/src/main/res/values-ko/strings.xml b/api/src/main/res/values-ko/strings.xml deleted file mode 100644 index 377896599..000000000 --- a/api/src/main/res/values-ko/strings.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - 1 일정 - %d 일정 - - 오늘 - 내일 - 어제 - 내일 - 어제 - 확인? - 질문: - 정보 - 닫기 - 에러가 발생한 것 같습니다! 발생한 에러는 다음과 같습니다:\n\n%s - 잠시 기다리세요... - 동기화 & 백업 - 구글 일정, 저장한 자료, 로컬 백업 - 상태 - 상태: %s - 로그인 안 됨 - 동기화 진행 중... - 마지막 동기화: \n%s - 실패: %s - 동기화 중 에러: %s - 동기화 한 적이 없습니다! - 설정 - 백그라운드 동기화 - 백그라운드 동기화를 사용하지 않습니다. - 현재 설정: %s - 지금 동기화하기 - 상태 보고 - 아스트리드 팀에게 보고서를 보내려면 클릭하세요 - 보고서 보내기 - 로그아웃 - 모든 동기화 자료 삭제 - 로그아웃 / 모든 동기화 데이터 삭제? - %s 과 마지막 동기화 중에 네트워크 연결 문제가 있었습니다.나중에 다시 시도해 주세요. - - 사용안함 - 15분마다 - 30분마다 - 매시간 - 3시간마다 - 6시간마다 - 12시간마다 - 매일 - 3일마다 - 일주일마다 - - \ No newline at end of file diff --git a/api/src/main/res/values-nb/strings.xml b/api/src/main/res/values-nb/strings.xml deleted file mode 100644 index 393d7e53a..000000000 --- a/api/src/main/res/values-nb/strings.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - 1 oppgave - %d oppgaver - - I dag - I morgen - I går - Bekreft? - Spørsmål: - Informasjon - Lukk - Oi, det oppstod en feil! Dette skjedde:\n\n%s - Vennligst vent... - Synkronisering pågår... - Siste synkronisering:\n%s - Mislykket: %s - Aldri synkronisert! - Alternativer - Bakgrunnssynkronisering - Bakgrunnssynkronisering er deaktivert - Aktuell innstilling: %s - Synkronisere nå - Statusrapport - Send rapport - Logg ut - Sletter all synkroniseringsdata - Logg ut / slett synkroniseringsdata? - - deaktiver - hvert kvarter - hver halvtime - hver time - hver tredje time - hver sjette time - hver tolvte time - daglig - hver tredje dag - hver uke - - \ No newline at end of file diff --git a/api/src/main/res/values-nl/strings.xml b/api/src/main/res/values-nl/strings.xml deleted file mode 100644 index 4f1991803..000000000 --- a/api/src/main/res/values-nl/strings.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - 1 taak - %d taken - - Vandaag - Morgen - Gisteren - mrgn - gisteren - OK? - Vraag: - Informatie - Sluit - Er is een fout opgetreden:\n\n%s - Even geduld a.u.b. - Synchronisatie - Google Taken, opgeslagen data, lokale back-up - Niet aangemeld - Synchronisatie bezig... - Vorige:\n%s - Mislukt op: %s - Gesync. met fouten: %s - Nooit gesynct! - Opties - Achtergrond synchronisatie - Achtergrond synchronisatie uitgeschakeld - Huidige instelling: %s - Nu synchroniseren - Statusrapport - Klik om een rapport naar het Tasks team te versturen - Rapport verzenden - Afmelden - Alle synchronisatie gegevens verwijderen - Afmelden / synchronisatie gegevens verwijderen? - Er was een probleem met de netwerkverbinding tijdens de laatste synchronisatie met %s. Probeer het a.u.b. later nog eens. - - uitschakelen - elke 15 min. - elke 30 min. - elk uur - elke 3 uur - elke 6 uur - elke 12 uur - elke dag - elke 3 dagen - elke week - - \ No newline at end of file diff --git a/api/src/main/res/values-pl/strings.xml b/api/src/main/res/values-pl/strings.xml deleted file mode 100644 index 3ad4e69ef..000000000 --- a/api/src/main/res/values-pl/strings.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - 1 zadanie - %d zadań - - Dzisiaj - Jutro - Wczoraj - jtr - wcz - Potwierdzić? - Pytanie: - Informacja - Zamknij - Ups! Wygląda na to, że wystąpił jakiś błąd! Oto, co się stało:\n\n%s - Proszę czekać... - Synchronizacja - Zadania Google, zapisane dane, lokalna kopia zapasowa - Stan - Niezalogowany - Synchronizacja trwa... - Ostatnia synchronizacja:\n%s - Nieudana: %s - Synch w/ Błędy: %s - Nigdy nie synchronizowano! - Opcje - Synchronizacja w tle - Synchronizacja w tle wyłączona - Aktualnie ustawione na: %s - Synchronizuj teraz - Raport statusu - Kliknij by wysłać raport do zespłu Tasks - Wyślij raport - Wyloguj - Czyści wszystkie dane synchronizacji - Wyloguj / wyczyść dane synchronizacji? - Wystąpił problem łączenia się z siecią w trakcie ostatniej synchronizacji z %s. Spróbuj później. - - Wyłączone - co 15 minut - co 30 minut - co godzinę - co 3 godziny - co 6 godzin - co 12 godzin - raz dziennie - co 3 dni - co tydzień - - \ No newline at end of file diff --git a/api/src/main/res/values-pt-rBR/strings.xml b/api/src/main/res/values-pt-rBR/strings.xml deleted file mode 100644 index 0b9dc6195..000000000 --- a/api/src/main/res/values-pt-rBR/strings.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - 1 tarefa - %d tarefas - - Hoje - Amanhã - Ontem - amanhã - ontem - Confirmar? - Pergunta: - Informações - Fechar - Opa, parece que ocorreu um erro! Aqui está o que aconteceu:\n\n%s - Por favor, aguarde... - Sincronização - Google Tasks, dados salvos, backup local - Estado - Não Registrado - Sincronizando... - Última sincronização:\n%s - Falhou em: %s - Sicronizou com erros: %s - Nunca sincronizado! - Opções - Sincronização em segundo plano - O serviço de sincronização em segundo plano está desativado - Atualmente definido para: %s - Sincronizar agora - Relatório de status - Clique para enviar um relatório para a equipe do Tasks - Enviar relatório - Desconectar - Limpar todos os dados de sincronização - Desconectar / limpar dados de sincronização? - Houve um problema na conexão durante a última sincronia com %s. Por favor tente novamente mais tarde. - - desabilitar - a cada quinze minutos - a cada trinta minutos - a cada hora - a cada três horas - a cada seis horas - a cada doze horas - diariamente - a cada três dias - semanalmente - - \ No newline at end of file diff --git a/api/src/main/res/values-pt/strings.xml b/api/src/main/res/values-pt/strings.xml deleted file mode 100644 index 4d247cec0..000000000 --- a/api/src/main/res/values-pt/strings.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - 1 tarefa - %d tarefas - - Hoje - Amanhã - Ontem - Amanhã - Ontem - Confirma? - Pergunta: - Informação - Fechar - Parece que ocorreu um erro! Isto foi o que aconteceu:\n\n%s - Por favor aguarde... - Sincronização e backup - Tarefas Google, dados e backups - Estado - Estado: %s - Sessão não iniciada - A sincronizar... - Última sincronização:\n%s - Falhou em: %s - Sincronização com erros: %s - Nunca sincronizado! - Opções - Sincronização em segundo plano - Sincronização em segundo plano desativada - Atualmente definido para: %s - Sincronizar agora - Relatório de estado - Clique para enviar um relatório à equipa do Tasks - Enviar relatório - Sair - Remove todos os dados de sincronização - Sair/limpar dados de sincronização? - Ocorreu um erro ao estabelecer ligação à rede durante -a última sincronização com %s. Tente mais tarde. - - desativar - cada 15 minutos - cada 30 minutos - cada hora - cada 3 horas - cada 6 horas - cada 12 horas - todos os dias - cada 3 dias - todas as semanas - - \ No newline at end of file diff --git a/api/src/main/res/values-ru/strings.xml b/api/src/main/res/values-ru/strings.xml deleted file mode 100644 index 3c0400587..000000000 --- a/api/src/main/res/values-ru/strings.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - 1 задача - %d задач(а/и) - - Сегодня - Завтра - Вчера - Завт - Вчера - Подтвердить? - Вопрос: - Информация - Закрыть - Ой, похоже произошла ошибка! Подробности ниже:\n\n%s - Пожалуйста, подождите… - Синхронизация и резервное копирование - Задачи Google, сохраненные данные, локальная резервная копия - Состояние - Состояние: %s - Вход не выполнен - Процесс синхронизации… - Последняя синхронизация\n%s - Ошибка: %s - Синхронизировано с ошибками: %s - Синхронизаций не выполнялось! - Параметры - Фоновая синхронизация - Фоновая синхронизация отключена - Сейчас установлено: %s - Синхронизировать - Отчёт о состоянии - Нажмите, чтобы отправить отчет команде Tasks - Отправить отчет - Выйти - Очищает все данные синхронизации - Выйти / очистить данные синхронизации? - В процессе последней синхронизации с %s возникли проблемы подключения к сети. Пожалуйста, повторите попытку позже. - - отключить - каждые 15 минут - каждые 30 минут - каждый час - каждые 3 часа - каждые 6 часов - каждые 12 часов - каждый день - каждые 3 дня - каждую неделю - - \ No newline at end of file diff --git a/api/src/main/res/values-sl-rSI/strings.xml b/api/src/main/res/values-sl-rSI/strings.xml deleted file mode 100644 index a65f20e5a..000000000 --- a/api/src/main/res/values-sl-rSI/strings.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - 1 opravek - Št. opravkov: %d - - Danes - Jutri - Včeraj - Jutr - Včer - Potrdi? - Vprašanje: - Informacija - Zapri - Ups, zdi se, da je prišlo do napake! Tole se je zgodilo:\n\n%s - Prosimo, počakajte... - Uskladitev & varnostna kopija - Google Naloge, shranjeni podatki, varnostna kopija na napravi - Niste prijavljeni - Usklajevanje poteka... - Najnovejše usklajevanje:\n%s - Neuspel v: %s - Usklajevanje z napakami:%s - Nikoli usklajeno! - Možnosti - Usklajevanje v ozadju - Usklajevanje v ozadju je onemogočeno - Trenutno nastavljeno na: %s - Začni z usklajevanjem - Poročilo o statusu - Kliknite, da se pošlje poročilo izdelovalcem aplikacije Opravki - Pošlji poročilo - Odjava - Zbriše vse usklajene podatke - Odjava/brisanje usklajenih podatkov? - Med najnovejšim usklajevanjem z %s je bilo problematično povezovanje v omrežje. -Prosimo ponovno poskusite kasneje. - - onemogoči - vsakih 15 minut - vsakih 30 minut - vsako uro - vsake 3 ure - vsakih 6 ur - vsakih 12 ur - vsak dan - vsake 3 dni - vsak teden - - \ No newline at end of file diff --git a/api/src/main/res/values-sv/strings.xml b/api/src/main/res/values-sv/strings.xml deleted file mode 100644 index 1be4a7f53..000000000 --- a/api/src/main/res/values-sv/strings.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - 1 uppgift - %d uppgifter - - Idag - Imorgon - Igår - imorn - Igår - Bekräfta? - Fråga: - Stäng - Oj, det uppstod ett fel! Detta hände:\n\n%s - Var god vänta... - Synkronisering - Google Aktiviteter, sparad data, lokal backup - Ej inloggad - Synkronisering pågår... - Synkroniserades senast:\n%s - Misslyckades: %s - Synkade med fel: %s - Aldrig synkroniserad! - Alternativ - Bakgrundssynkronisering - Bakgrundssynkronisering är inaktiverad - Aktuell inställning: %s - Synkronisera nu - Status rapport - Klicka för att skicka en rapport till Tasks-teamet - Skicka rapport - Logga ut - Rensar alla synkroniseringsdata - Logga ut / rensa synkroniseringsdata? - Ett nätverksproblem uppstod -vid senaste synkroniseringen med %s. Vänligen försök igen. - - inaktivera - varje kvartstimme - varje halvtimme - varje timme - var tredje timme - var sjätte timme - var tolfte timme - varje dag - var tredje dag - varje vecka - - \ No newline at end of file diff --git a/api/src/main/res/values-th/strings.xml b/api/src/main/res/values-th/strings.xml deleted file mode 100644 index be3b6af6e..000000000 --- a/api/src/main/res/values-th/strings.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - วันนี้ - พรุ่งนี้ - เมื่อวาน - ข้อมูล - สถานะ - ตัวเลือก - \ No newline at end of file diff --git a/api/src/main/res/values-tr/strings.xml b/api/src/main/res/values-tr/strings.xml deleted file mode 100644 index 6979790cf..000000000 --- a/api/src/main/res/values-tr/strings.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - 1 görev - %d görev - - Bugün - Yarın - Dün - Yarın - Dün - Onayla? - Soru: - Bilgi - Kapat - Oops, bir sorun meydana geldi! Olan şu:\n\n%s - Lütfen bekleyin... - Durum - Durum: %s - Oturum açılmadı - Senkronizasyon devam ediyor... - Son Senk.\n%s - Başarısız: %s - Hatalı Senkron: %s - Hiç Eşleme Yapılmamış! - Ayarlar - Arkaplanda senkronizasyon - Arkaplanda senkronizasyon devre dışı - Mevcut ayar: %s - Şimdi Eşle - Durum Raporu - Tasks takımına bildirmek için tıklayın - Rapor Gönder - Çıkış Yap - Bütün eşleme verilerini temizle - Çıkış Yap / Senkron verisini sil? - %s ile son eşleme yapılırken bir ağ bağlantı sorunu oluştu. Lütfen daha sonra yeniden deneyin. - - devre dışı bırak - her 15 dakika - her 30 dakika - her saat - her 3 saat - her 6 saat - her 12 saat - hergün - her 3 gün - her hafta - - \ No newline at end of file diff --git a/api/src/main/res/values-uk/strings.xml b/api/src/main/res/values-uk/strings.xml deleted file mode 100644 index bcdbcfcb7..000000000 --- a/api/src/main/res/values-uk/strings.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - 1 завдання - %d завдань - - Сьогодні - Завтра - Вчора - Завт. - Вчор. - Підтверджуєте? - Питання: - Інформація - Закрити - На жаль, схоже, сталася помилка! Ось що вийшло:\n\n%s - Будь ласка, зачекайте... - Синхронізація і резерв. копіювання - Google Tasks, збережені дані, локальне резервне копіювання - Статус - Статус: %s - Не залогований - Процес синхронізації - Остання синхр.:\n%s - Синхр. з помилками: %s - Ніколи не було синхронізовано! - Опції - Фонова синхронізація - Фонова синхронізація відключена - Синхронізувати зараз - Відіслати звіт - Вийти - У процесі останньої синхронізації %s. - Виникли проблеми підключення до мережі. - Будь ласка, спробуйте ще раз пізніше. - - вимкнути - що 15 хвилин - що 30 хвилин - кожну годину - кожних 3 години - кожних 6 годин - кожних 12 годин - щодня - кожного 3-го дня - кожного тижня - - \ No newline at end of file diff --git a/api/src/main/res/values-zh-rCN/strings.xml b/api/src/main/res/values-zh-rCN/strings.xml deleted file mode 100644 index 41c458fd6..000000000 --- a/api/src/main/res/values-zh-rCN/strings.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - 1 个任务 - %d 个任务 - - 今天 - 明天 - 昨天 - 明天 - 昨天 - 确认? - 问题： - 信息 - 关闭 - 糟糕，发生错误！状况是:\n\n%s - 请稍候... - 同步和备份 - 谷歌任务，已存数据，本地备份 - 状态 - 状态：%s - 未登陆 - 同步中... - 上次同步：\n%s - 失败：%s - 同步 w/ 错误： %s 上次同步日期 - 未同步过！ - 选项 - 后台同步 - 后台同步已关闭 - 目前同步间隔：%s - 现在同步 - 状态报告 - 点击给 Tasks 团队发送报告 - 发送报告 - 登出 - 清除所有同步资料 - 登出/清除同步资料? - 在最近与 %s 同步时网络连接发生问题。请重试。 - - 停用 - 每15分钟 - 每30分钟 - 每小时 - 每3小时 - 每6小时 - 每12小时 - 每天 - 每3天 - 每周 - - \ No newline at end of file diff --git a/api/src/main/res/values-zh-rTW/strings.xml b/api/src/main/res/values-zh-rTW/strings.xml deleted file mode 100644 index 3dcee2fc4..000000000 --- a/api/src/main/res/values-zh-rTW/strings.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - 1 個工作 - %d 個工作 - - 今天 - 明天 - 昨天 - 明天 - 昨天 - 確認? - 問題： - 資訊 - 關閉 - 糟糕，發生錯誤！狀況是:\n\n%s - 請稍候... - 同步和備份 - 谷歌任務，已存數據，本地備份 - 狀態 - 狀態：%s - 未登陸 - 同步中... - 上次同步：\n%s - 失敗：%s - 同步w/ 錯誤： %s 上次同步日期 - 未同步過！ - 選項 - 後台同步 - 後台同步已關閉 - 目前同步間隔：%s - 現在同步 - 狀態報告 - 點擊給 Tasks 團隊發送報告 - 發送報告 - 登出 - 清除所有同步資料 - 登出/清除同步資料? - 在最近與%s 同步時網絡連接發生問題。請重試。 - - 停用 - 每15分鐘 - 每30分鐘 - 每小時 - 每3小時 - 每6小時 - 每12小時 - 每天 - 每3天 - 每週 - - \ No newline at end of file diff --git a/api/src/main/res/values/colors.xml b/api/src/main/res/values/colors.xml deleted file mode 100644 index 59b738282..000000000 --- a/api/src/main/res/values/colors.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - #ffff5555 - #fffea400 - #ff33a5e8 - #ff808080 - #ff505050 - #ff202020 - - - diff --git a/api/src/main/res/values/keys.xml b/api/src/main/res/values/keys.xml deleted file mode 100644 index 4d7b6e884..000000000 --- a/api/src/main/res/values/keys.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - 0 - 900 - 1800 - 3600 - 10800 - 21600 - 43200 - 86400 - 259200 - 604800 - - - - sync_status - - sync_forget - - sync_options - - sync_last_error - - diff --git a/api/src/main/res/values/strings.xml b/api/src/main/res/values/strings.xml deleted file mode 100644 index 5452d62b4..000000000 --- a/api/src/main/res/values/strings.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - 1 task - - %d tasks - - - - Today - - - Tomorrow - - - Yesterday - - - Tmrw - - - Yest - - - - - Confirm? - - - Question: - - - Information - - - Close - - - Oops, looks like an error occurred! Here\'s what happened:\n\n%s - - - Please wait... - - - - - Sync & backup - - - Google Tasks, saved data, local backup - - - - - Status - - - Status: %s - - Not logged in - - Sync ongoing... - - Last sync:\n%s - - Failed on: %s - - Sync w/ errors: %s - - Never synchronized! - - - Options - - - Background sync - - Background synchronization is disabled - - Currently set to: %s - - - Synchronize now - - - Status report - - - Click to send a report to the Tasks team - - Send report - - - Log out - - Clears all synchronization data - - - Log out/clear synchronization data? - - - There was a problem connecting to the network - during the last sync with %s. Please try again later. - - - - disable - every fifteen minutes - every thirty minutes - every hour - every three hours - every six hours - every twelve hours - every day - every three days - every week - - - diff --git a/astrid/build.gradle b/astrid/build.gradle deleted file mode 100644 index 543589e69..000000000 --- a/astrid/build.gradle +++ /dev/null @@ -1,86 +0,0 @@ -apply plugin: 'com.android.application' - -repositories { - mavenCentral() -} - -android { - lintOptions { - lintConfig file("../lint.xml") - } - - compileSdkVersion 21 - buildToolsVersion "21.1.1" - - defaultConfig { - minSdkVersion 7 - targetSdkVersion 21 - } - - signingConfigs { - release - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - - buildTypes { - release { - signingConfig signingConfigs.release - } - } - - if (project.hasProperty('keyAlias') && - project.hasProperty('storeFile') && - project.hasProperty('storePassword') && - project.hasProperty('keyPassword')) { - android.signingConfigs.release.keyAlias = keyAlias - android.signingConfigs.release.storeFile = file(storeFile) - android.signingConfigs.release.storePassword = storePassword - android.signingConfigs.release.keyPassword = keyPassword - } else { - buildTypes.release.signingConfig = null - } -} - -android.applicationVariants.all { variant -> - variant.mergeResources.doLast { - if (project.hasProperty('gapiKey')) { - File values = file("${buildDir}/intermediates/res/${variant.dirName}/values/values.xml") - values.write( - values.getText('UTF-8').replaceAll(/.*<\/string>/, "${project.property('gapiKey')}"), - 'UTF-8') - } - } -} - -dependencies { - provided group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.2' - - compile group: 'com.android.support', name: 'appcompat-v7', version: '21.0.0' - - compile project(":api") - - compile group: 'com.rubiconproject.oss', name: 'jchronic', version: '0.2.6', transitive: false - compile group: 'org.scala-saddle', name: 'google-rfc-2445', version: '20110304', transitive: false - - compile(group: 'com.google.apis', name: 'google-api-services-tasks', version: 'v1-rev33-1.18.0-rc') { - exclude group: 'org.apache.httpcomponents', module: 'httpclient' - } - compile(group: 'com.google.api-client', name: 'google-api-client-android', version: '1.18.0-rc') { - exclude group: 'org.apache.httpcomponents', module: 'httpclient' - } - compile(group: 'com.google.http-client', name: 'google-http-client-gson', version: '1.18.0-rc') { - exclude group: 'org.apache.httpcomponents', module: 'httpclient' - } - compile group: 'com.google.guava', name: 'guava-jdk5', version: '13.0' - - compile group: 'com.github.tony19', name: 'logback-android-classic', version: '1.1.1-2' - apk group: 'com.github.tony19', name: 'logback-android-core', version: '1.1.1-2' - - androidTestCompile group: 'org.mockito', name: 'mockito-core', version: '1.9.5', transitive: false - androidTestCompile group: 'com.google.dexmaker', name: 'dexmaker', version: '1.1' - androidTestCompile group: 'com.google.dexmaker', name: 'dexmaker-mockito', version: '1.1' -} diff --git a/astrid/src/main/res/values/strings.xml b/astrid/src/main/res/values/strings.xml deleted file mode 100644 index c6f5542fb..000000000 --- a/astrid/src/main/res/values/strings.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - Dark widget theme - Delete task - Support - Added task - Cannot access external storage - - Open navigation drawer - Close navigation drawer - \ No newline at end of file diff --git a/build.gradle b/build.gradle index ff0ec0478..e46e71611 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,5 @@ +apply plugin: 'com.android.application' + task wrapper(type: Wrapper) { gradleVersion = '2.1' } @@ -8,6 +10,94 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:0.14.1' + classpath 'com.android.tools.build:gradle:0.14.4' + } +} + +repositories { + mavenCentral() +} + +android { + lintOptions { + lintConfig file("lint.xml") + } + + compileSdkVersion 21 + buildToolsVersion "21.1.1" + + defaultConfig { + minSdkVersion 7 + targetSdkVersion 21 + } + + signingConfigs { + release + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + buildTypes { + release { + signingConfig signingConfigs.release + } } + + if (project.hasProperty('keyAlias') && + project.hasProperty('storeFile') && + project.hasProperty('storePassword') && + project.hasProperty('keyPassword')) { + android.signingConfigs.release.keyAlias = keyAlias + android.signingConfigs.release.storeFile = file(storeFile) + android.signingConfigs.release.storePassword = storePassword + android.signingConfigs.release.keyPassword = keyPassword + } else { + buildTypes.release.signingConfig = null + } +} + +android.applicationVariants.all { variant -> + variant.mergeResources.doLast { + if (project.hasProperty('gapiKey')) { + File values = file("${buildDir}/intermediates/res/${variant.dirName}/values/values.xml") + values.write( + values.getText('UTF-8').replaceAll(/.*<\/string>/, "${project.property('gapiKey')}"), + 'UTF-8') + } + } +} + +dependencies { + provided group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.2' + compile group: 'com.squareup.dagger', name: 'dagger', version: '1.2.2' + + compile group: 'com.android.support', name: 'support-v4', version: '21.0.2' + compile group: 'com.android.support', name: 'appcompat-v7', version: '21.0.2' + + compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.7' + compile group: 'joda-time', name: 'joda-time', version: '2.3', transitive: false + + compile group: 'com.rubiconproject.oss', name: 'jchronic', version: '0.2.6', transitive: false + compile group: 'org.scala-saddle', name: 'google-rfc-2445', version: '20110304', transitive: false + + compile(group: 'com.google.apis', name: 'google-api-services-tasks', version: 'v1-rev33-1.18.0-rc') { + exclude group: 'org.apache.httpcomponents', module: 'httpclient' + } + compile(group: 'com.google.api-client', name: 'google-api-client-android', version: '1.18.0-rc') { + exclude group: 'org.apache.httpcomponents', module: 'httpclient' + } + compile(group: 'com.google.http-client', name: 'google-http-client-gson', version: '1.18.0-rc') { + exclude group: 'org.apache.httpcomponents', module: 'httpclient' + } + compile group: 'com.google.guava', name: 'guava-jdk5', version: '13.0' + + compile group: 'com.github.tony19', name: 'logback-android-classic', version: '1.1.1-2' + apk group: 'com.github.tony19', name: 'logback-android-core', version: '1.1.1-2' + + androidTestCompile group: 'org.mockito', name: 'mockito-core', version: '1.9.5', transitive: false + androidTestCompile group: 'com.google.dexmaker', name: 'dexmaker', version: '1.1' + androidTestCompile group: 'com.google.dexmaker', name: 'dexmaker-mockito', version: '1.1' } diff --git a/astrid/graphics/checkmark-notification.ai b/graphics/checkmark-notification.ai similarity index 100% rename from astrid/graphics/checkmark-notification.ai rename to graphics/checkmark-notification.ai diff --git a/astrid/graphics/checkmark-notification.png b/graphics/checkmark-notification.png similarity index 100% rename from astrid/graphics/checkmark-notification.png rename to graphics/checkmark-notification.png diff --git a/astrid/graphics/checkmark.ai b/graphics/checkmark.ai similarity index 100% rename from astrid/graphics/checkmark.ai rename to graphics/checkmark.ai diff --git a/astrid/graphics/checkmark.png b/graphics/checkmark.png similarity index 100% rename from astrid/graphics/checkmark.png rename to graphics/checkmark.png diff --git a/astrid/project.properties b/project.properties similarity index 100% rename from astrid/project.properties rename to project.properties diff --git a/scripts/clean_translations.rb b/scripts/clean_translations.rb index 2a30b3000..c6a8c9c64 100644 --- a/scripts/clean_translations.rb +++ b/scripts/clean_translations.rb @@ -84,12 +84,11 @@ def clean(path) end def remove_untranslated_strings(*string_files) - index_elements(load("api/src/main/res/values/strings.xml")) - Dir.glob("astrid/src/main/res/values/strings*.xml").each { |path| index_elements(load(path)) } + Dir.glob("src/main/res/values/strings*.xml").each { |path| index_elements(load(path)) } string_files.each { |path| clean path } end if __FILE__ == $0 lang = ARGV[0] - remove_untranslated_strings("api/src/main/res/values-#{lang}/strings.xml", "astrid/src/main/res/values-#{lang}/strings.xml") -end \ No newline at end of file + remove_untranslated_strings("src/main/res/values-#{lang}/strings.xml") +end diff --git a/scripts/find-unused-strings.rb b/scripts/find-unused-strings.rb index e0d120596..fe795c247 100644 --- a/scripts/find-unused-strings.rb +++ b/scripts/find-unused-strings.rb @@ -1,18 +1,18 @@ -files = Dir.glob('**/src/main/res/values/*.xml') +files = Dir.glob('src/main/res/values/*.xml') files.each do |path| file = File.new(path) file.read.scan(//) do |match| - result = `git grep R.string.#{match[0]} astrid api` + `git grep string\/#{match[0]} astrid api` + result = `git grep R.string.#{match[0]}` + `git grep string\/#{match[0]}` puts "#{path} - #{match[0]}" if result.empty? end file = File.new(path) file.read.scan(//) do |match| - result = `git grep R.array.#{match[0]} astrid api` + `git grep array\/#{match[0]} astrid api` + result = `git grep R.array.#{match[0]}` + `git grep array\/#{match[0]}` puts "#{path} - #{match[0]}" if result.empty? end end -file = File.new('astrid/src/main/res/values/attrs.xml') +file = File.new('src/main/res/values/attrs.xml') file.read.scan(//) do |match| - result = `git grep R.attr.#{match[0]} astrid api` + `git grep "?attr/#{match[0]}" astrid api` + result = `git grep R.attr.#{match[0]}` + `git grep "?attr/#{match[0]}"` puts "#{file.path} - #{match[0]}" if result.empty? end diff --git a/scripts/getloc.rb b/scripts/getloc.rb index 7d3556d99..61834ce03 100755 --- a/scripts/getloc.rb +++ b/scripts/getloc.rb @@ -106,15 +106,15 @@ end class Android def self.tmp_files FileUtils.mkdir_p "translations" - ["translations/strings.xml", "translations/strings-api.xml"] + ["translations/strings.xml"] end def self.src_files(cmd, type) if cmd == :export && type == "master" - %x[./scripts/catxml astrid/src/main/res/values/strings*.xml > #{self.tmp_files[0]}] - lambda { |l| ["translations/strings.xml", "api/src/main/res/values/strings.xml"] } + %x[./scripts/catxml src/main/res/values/strings*.xml > #{self.tmp_files[0]}] + lambda { |l| ["translations/strings.xml"] } else - lambda { |l| ["astrid/src/main/res/values-#{l}/strings.xml", "api/src/main/res/values-#{l}/strings.xml"] } + lambda { |l| ["src/main/res/values-#{l}/strings.xml"] } end end end diff --git a/scripts/resize-launcher.sh b/scripts/resize-launcher.sh index 4810d9390..51b320ca5 100755 --- a/scripts/resize-launcher.sh +++ b/scripts/resize-launcher.sh @@ -2,7 +2,7 @@ INPUT="$1" FILENAME="$2" -RESOURCES=../astrid/src/main/res +RESOURCES=../src/main/res convert -resize 144x144 ${INPUT} ${RESOURCES}/drawable-xxhdpi/${FILENAME} convert -resize 96x96 ${INPUT} ${RESOURCES}/drawable-xhdpi/${FILENAME} diff --git a/scripts/resize-notification.sh b/scripts/resize-notification.sh index 979641609..04ff0025a 100755 --- a/scripts/resize-notification.sh +++ b/scripts/resize-notification.sh @@ -2,7 +2,7 @@ INPUT="$1" FILENAME="$2" -RESOURCES=../astrid/src/main/res +RESOURCES=../src/main/res convert -resize 72x72 ${INPUT} ${RESOURCES}/drawable-xxhdpi/${FILENAME} convert -resize 48x48 ${INPUT} ${RESOURCES}/drawable-xhdpi/${FILENAME} diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 043e2b49f..000000000 --- a/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -include ':api' -include ':astrid' diff --git a/astrid/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java b/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java rename to src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java diff --git a/astrid/src/androidTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.java b/src/androidTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.java rename to src/androidTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.java diff --git a/astrid/src/androidTest/java/com/todoroo/andlib/utility/RelativeDayTest.java b/src/androidTest/java/com/todoroo/andlib/utility/RelativeDayTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/andlib/utility/RelativeDayTest.java rename to src/androidTest/java/com/todoroo/andlib/utility/RelativeDayTest.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/backup/BackupServiceTests.java b/src/androidTest/java/com/todoroo/astrid/backup/BackupServiceTests.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/backup/BackupServiceTests.java rename to src/androidTest/java/com/todoroo/astrid/backup/BackupServiceTests.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java b/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java rename to src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java b/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java rename to src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/data/TaskTest.java b/src/androidTest/java/com/todoroo/astrid/data/TaskTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/data/TaskTest.java rename to src/androidTest/java/com/todoroo/astrid/data/TaskTest.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java b/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java rename to src/androidTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java b/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java rename to src/androidTest/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java b/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java rename to src/androidTest/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java b/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java rename to src/androidTest/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksTestPreferenceService.java b/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksTestPreferenceService.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksTestPreferenceService.java rename to src/androidTest/java/com/todoroo/astrid/gtasks/GtasksTestPreferenceService.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilitiesTest.java b/src/androidTest/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilitiesTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilitiesTest.java rename to src/androidTest/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilitiesTest.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/model/TaskTest.java b/src/androidTest/java/com/todoroo/astrid/model/TaskTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/model/TaskTest.java rename to src/androidTest/java/com/todoroo/astrid/model/TaskTest.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/provider/Astrid3ProviderTests.java b/src/androidTest/java/com/todoroo/astrid/provider/Astrid3ProviderTests.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/provider/Astrid3ProviderTests.java rename to src/androidTest/java/com/todoroo/astrid/provider/Astrid3ProviderTests.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java b/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java rename to src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotificationsTest.java b/src/androidTest/java/com/todoroo/astrid/reminders/NotificationsTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotificationsTest.java rename to src/androidTest/java/com/todoroo/astrid/reminders/NotificationsTest.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotifyAtDeadlineTest.java b/src/androidTest/java/com/todoroo/astrid/reminders/NotifyAtDeadlineTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotifyAtDeadlineTest.java rename to src/androidTest/java/com/todoroo/astrid/reminders/NotifyAtDeadlineTest.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java b/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java rename to src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java b/src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java rename to src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java b/src/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java rename to src/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListenerTest.java b/src/androidTest/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListenerTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListenerTest.java rename to src/androidTest/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListenerTest.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java b/src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java rename to src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java b/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java rename to src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java b/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java rename to src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java b/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java rename to src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java b/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java rename to src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java b/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java rename to src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/sync/SyncModelTest.java b/src/androidTest/java/com/todoroo/astrid/sync/SyncModelTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/sync/SyncModelTest.java rename to src/androidTest/java/com/todoroo/astrid/sync/SyncModelTest.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/test/AstridTranslationTest.java b/src/androidTest/java/com/todoroo/astrid/test/AstridTranslationTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/test/AstridTranslationTest.java rename to src/androidTest/java/com/todoroo/astrid/test/AstridTranslationTest.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/test/DatabaseTestCase.java b/src/androidTest/java/com/todoroo/astrid/test/DatabaseTestCase.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/test/DatabaseTestCase.java rename to src/androidTest/java/com/todoroo/astrid/test/DatabaseTestCase.java diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpecTest.java b/src/androidTest/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpecTest.java similarity index 100% rename from astrid/src/androidTest/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpecTest.java rename to src/androidTest/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpecTest.java diff --git a/astrid/src/androidTest/java/org/tasks/Freeze.java b/src/androidTest/java/org/tasks/Freeze.java similarity index 100% rename from astrid/src/androidTest/java/org/tasks/Freeze.java rename to src/androidTest/java/org/tasks/Freeze.java diff --git a/astrid/src/androidTest/java/org/tasks/RemoteModelHelpers.java b/src/androidTest/java/org/tasks/RemoteModelHelpers.java similarity index 100% rename from astrid/src/androidTest/java/org/tasks/RemoteModelHelpers.java rename to src/androidTest/java/org/tasks/RemoteModelHelpers.java diff --git a/astrid/src/androidTest/java/org/tasks/Snippet.java b/src/androidTest/java/org/tasks/Snippet.java similarity index 100% rename from astrid/src/androidTest/java/org/tasks/Snippet.java rename to src/androidTest/java/org/tasks/Snippet.java diff --git a/astrid/src/androidTest/java/org/tasks/TestUtilities.java b/src/androidTest/java/org/tasks/TestUtilities.java similarity index 100% rename from astrid/src/androidTest/java/org/tasks/TestUtilities.java rename to src/androidTest/java/org/tasks/TestUtilities.java diff --git a/astrid/src/androidTest/java/org/tasks/date/DateTimeUtilsTest.java b/src/androidTest/java/org/tasks/date/DateTimeUtilsTest.java similarity index 100% rename from astrid/src/androidTest/java/org/tasks/date/DateTimeUtilsTest.java rename to src/androidTest/java/org/tasks/date/DateTimeUtilsTest.java diff --git a/astrid/src/androidTest/java/org/tasks/injection/InjectingTestCase.java b/src/androidTest/java/org/tasks/injection/InjectingTestCase.java similarity index 100% rename from astrid/src/androidTest/java/org/tasks/injection/InjectingTestCase.java rename to src/androidTest/java/org/tasks/injection/InjectingTestCase.java diff --git a/astrid/src/androidTest/java/org/tasks/injection/TestModule.java b/src/androidTest/java/org/tasks/injection/TestModule.java similarity index 100% rename from astrid/src/androidTest/java/org/tasks/injection/TestModule.java rename to src/androidTest/java/org/tasks/injection/TestModule.java diff --git a/astrid/src/androidTest/res/.do.not.delete b/src/androidTest/res/.do.not.delete similarity index 100% rename from astrid/src/androidTest/res/.do.not.delete rename to src/androidTest/res/.do.not.delete diff --git a/astrid/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml similarity index 100% rename from astrid/src/main/AndroidManifest.xml rename to src/main/AndroidManifest.xml diff --git a/astrid/src/main/assets/logback.xml b/src/main/assets/logback.xml similarity index 100% rename from astrid/src/main/assets/logback.xml rename to src/main/assets/logback.xml diff --git a/astrid/src/main/java/com/commonsware/cwac/tlv/TouchListView.java b/src/main/java/com/commonsware/cwac/tlv/TouchListView.java similarity index 100% rename from astrid/src/main/java/com/commonsware/cwac/tlv/TouchListView.java rename to src/main/java/com/commonsware/cwac/tlv/TouchListView.java diff --git a/astrid/src/main/java/com/faizmalkani/floatingactionbutton/FloatingActionButton.java b/src/main/java/com/faizmalkani/floatingactionbutton/FloatingActionButton.java similarity index 100% rename from astrid/src/main/java/com/faizmalkani/floatingactionbutton/FloatingActionButton.java rename to src/main/java/com/faizmalkani/floatingactionbutton/FloatingActionButton.java diff --git a/astrid/src/main/java/com/mdimension/jchronic/AstridChronic.java b/src/main/java/com/mdimension/jchronic/AstridChronic.java similarity index 100% rename from astrid/src/main/java/com/mdimension/jchronic/AstridChronic.java rename to src/main/java/com/mdimension/jchronic/AstridChronic.java diff --git a/api/src/main/java/com/todoroo/andlib/data/AbstractDatabase.java b/src/main/java/com/todoroo/andlib/data/AbstractDatabase.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/data/AbstractDatabase.java rename to src/main/java/com/todoroo/andlib/data/AbstractDatabase.java diff --git a/api/src/main/java/com/todoroo/andlib/data/AbstractModel.java b/src/main/java/com/todoroo/andlib/data/AbstractModel.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/data/AbstractModel.java rename to src/main/java/com/todoroo/andlib/data/AbstractModel.java diff --git a/api/src/main/java/com/todoroo/andlib/data/Callback.java b/src/main/java/com/todoroo/andlib/data/Callback.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/data/Callback.java rename to src/main/java/com/todoroo/andlib/data/Callback.java diff --git a/api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java b/src/main/java/com/todoroo/andlib/data/DatabaseDao.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java rename to src/main/java/com/todoroo/andlib/data/DatabaseDao.java diff --git a/api/src/main/java/com/todoroo/andlib/data/Property.java b/src/main/java/com/todoroo/andlib/data/Property.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/data/Property.java rename to src/main/java/com/todoroo/andlib/data/Property.java diff --git a/api/src/main/java/com/todoroo/andlib/data/Table.java b/src/main/java/com/todoroo/andlib/data/Table.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/data/Table.java rename to src/main/java/com/todoroo/andlib/data/Table.java diff --git a/api/src/main/java/com/todoroo/andlib/data/TodorooCursor.java b/src/main/java/com/todoroo/andlib/data/TodorooCursor.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/data/TodorooCursor.java rename to src/main/java/com/todoroo/andlib/data/TodorooCursor.java diff --git a/api/src/main/java/com/todoroo/andlib/service/ContextManager.java b/src/main/java/com/todoroo/andlib/service/ContextManager.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/service/ContextManager.java rename to src/main/java/com/todoroo/andlib/service/ContextManager.java diff --git a/api/src/main/java/com/todoroo/andlib/sql/Criterion.java b/src/main/java/com/todoroo/andlib/sql/Criterion.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/sql/Criterion.java rename to src/main/java/com/todoroo/andlib/sql/Criterion.java diff --git a/api/src/main/java/com/todoroo/andlib/sql/DBObject.java b/src/main/java/com/todoroo/andlib/sql/DBObject.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/sql/DBObject.java rename to src/main/java/com/todoroo/andlib/sql/DBObject.java diff --git a/api/src/main/java/com/todoroo/andlib/sql/Field.java b/src/main/java/com/todoroo/andlib/sql/Field.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/sql/Field.java rename to src/main/java/com/todoroo/andlib/sql/Field.java diff --git a/api/src/main/java/com/todoroo/andlib/sql/Functions.java b/src/main/java/com/todoroo/andlib/sql/Functions.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/sql/Functions.java rename to src/main/java/com/todoroo/andlib/sql/Functions.java diff --git a/api/src/main/java/com/todoroo/andlib/sql/Join.java b/src/main/java/com/todoroo/andlib/sql/Join.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/sql/Join.java rename to src/main/java/com/todoroo/andlib/sql/Join.java diff --git a/api/src/main/java/com/todoroo/andlib/sql/JoinType.java b/src/main/java/com/todoroo/andlib/sql/JoinType.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/sql/JoinType.java rename to src/main/java/com/todoroo/andlib/sql/JoinType.java diff --git a/api/src/main/java/com/todoroo/andlib/sql/Operator.java b/src/main/java/com/todoroo/andlib/sql/Operator.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/sql/Operator.java rename to src/main/java/com/todoroo/andlib/sql/Operator.java diff --git a/api/src/main/java/com/todoroo/andlib/sql/Order.java b/src/main/java/com/todoroo/andlib/sql/Order.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/sql/Order.java rename to src/main/java/com/todoroo/andlib/sql/Order.java diff --git a/api/src/main/java/com/todoroo/andlib/sql/OrderType.java b/src/main/java/com/todoroo/andlib/sql/OrderType.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/sql/OrderType.java rename to src/main/java/com/todoroo/andlib/sql/OrderType.java diff --git a/api/src/main/java/com/todoroo/andlib/sql/Query.java b/src/main/java/com/todoroo/andlib/sql/Query.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/sql/Query.java rename to src/main/java/com/todoroo/andlib/sql/Query.java diff --git a/api/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java b/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java rename to src/main/java/com/todoroo/andlib/sql/QueryTemplate.java diff --git a/api/src/main/java/com/todoroo/andlib/sql/SqlConstants.java b/src/main/java/com/todoroo/andlib/sql/SqlConstants.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/sql/SqlConstants.java rename to src/main/java/com/todoroo/andlib/sql/SqlConstants.java diff --git a/api/src/main/java/com/todoroo/andlib/sql/SqlTable.java b/src/main/java/com/todoroo/andlib/sql/SqlTable.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/sql/SqlTable.java rename to src/main/java/com/todoroo/andlib/sql/SqlTable.java diff --git a/api/src/main/java/com/todoroo/andlib/sql/UnaryCriterion.java b/src/main/java/com/todoroo/andlib/sql/UnaryCriterion.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/sql/UnaryCriterion.java rename to src/main/java/com/todoroo/andlib/sql/UnaryCriterion.java diff --git a/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java b/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java rename to src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java diff --git a/api/src/main/java/com/todoroo/andlib/utility/DateUtilities.java b/src/main/java/com/todoroo/andlib/utility/DateUtilities.java similarity index 99% rename from api/src/main/java/com/todoroo/andlib/utility/DateUtilities.java rename to src/main/java/com/todoroo/andlib/utility/DateUtilities.java index b878bbf86..42349be9f 100644 --- a/api/src/main/java/com/todoroo/andlib/utility/DateUtilities.java +++ b/src/main/java/com/todoroo/andlib/utility/DateUtilities.java @@ -9,7 +9,7 @@ import android.content.Context; import android.text.format.DateFormat; import org.joda.time.DateTime; -import org.tasks.api.R; +import org.tasks.R; import java.text.SimpleDateFormat; import java.util.Arrays; diff --git a/api/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java b/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java similarity index 99% rename from api/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java rename to src/main/java/com/todoroo/andlib/utility/DialogUtilities.java index 0e4138e00..dc23f6912 100644 --- a/api/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java +++ b/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java @@ -15,7 +15,7 @@ import android.view.View; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.tasks.api.R; +import org.tasks.R; public class DialogUtilities { diff --git a/api/src/main/java/com/todoroo/andlib/utility/Pair.java b/src/main/java/com/todoroo/andlib/utility/Pair.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/utility/Pair.java rename to src/main/java/com/todoroo/andlib/utility/Pair.java diff --git a/api/src/main/java/com/todoroo/andlib/utility/Preferences.java b/src/main/java/com/todoroo/andlib/utility/Preferences.java similarity index 100% rename from api/src/main/java/com/todoroo/andlib/utility/Preferences.java rename to src/main/java/com/todoroo/andlib/utility/Preferences.java diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java b/src/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java rename to src/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java b/src/main/java/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java rename to src/main/java/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java b/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java rename to src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivityTablet.java b/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivityTablet.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivityTablet.java rename to src/main/java/com/todoroo/astrid/actfm/TagSettingsActivityTablet.java diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java b/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java similarity index 99% rename from astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java rename to src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java index 809ca03d7..7d18e0442 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java +++ b/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java @@ -9,7 +9,6 @@ import android.app.Activity; import android.content.ComponentName; import android.content.Intent; import android.os.Bundle; -import android.view.View; import android.widget.TextView; import com.todoroo.andlib.utility.DateUtilities; diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java b/src/main/java/com/todoroo/astrid/activity/AstridActivity.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java rename to src/main/java/com/todoroo/astrid/activity/AstridActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java b/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java rename to src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java b/src/main/java/com/todoroo/astrid/activity/EditPreferences.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java rename to src/main/java/com/todoroo/astrid/activity/EditPreferences.java diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java b/src/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java rename to src/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java b/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java rename to src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java b/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java rename to src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java b/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java rename to src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java rename to src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java similarity index 99% rename from astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java rename to src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index b1c57f7c6..3dc740d4a 100755 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -16,7 +16,6 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.os.Handler; -import android.speech.RecognizerIntent; import android.support.v4.view.ViewPager; import android.text.TextUtils; import android.util.DisplayMetrics; @@ -36,12 +35,10 @@ import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.EditText; import android.widget.FrameLayout; -import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.ScrollView; import android.widget.Toast; -import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DialogUtilities; diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditViewPager.java b/src/main/java/com/todoroo/astrid/activity/TaskEditViewPager.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/activity/TaskEditViewPager.java rename to src/main/java/com/todoroo/astrid/activity/TaskEditViewPager.java diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java rename to src/main/java/com/todoroo/astrid/activity/TaskListActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java rename to src/main/java/com/todoroo/astrid/activity/TaskListFragment.java diff --git a/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java rename to src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java diff --git a/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java b/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java rename to src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java diff --git a/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java b/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java rename to src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java diff --git a/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmFields.java b/src/main/java/com/todoroo/astrid/alarms/AlarmFields.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/alarms/AlarmFields.java rename to src/main/java/com/todoroo/astrid/alarms/AlarmFields.java diff --git a/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java b/src/main/java/com/todoroo/astrid/alarms/AlarmService.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java rename to src/main/java/com/todoroo/astrid/alarms/AlarmService.java diff --git a/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java b/src/main/java/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java rename to src/main/java/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java diff --git a/api/src/main/java/com/todoroo/astrid/api/Addon.java b/src/main/java/com/todoroo/astrid/api/Addon.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/api/Addon.java rename to src/main/java/com/todoroo/astrid/api/Addon.java diff --git a/api/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java b/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java rename to src/main/java/com/todoroo/astrid/api/AstridApiConstants.java diff --git a/api/src/main/java/com/todoroo/astrid/api/AstridFilterExposer.java b/src/main/java/com/todoroo/astrid/api/AstridFilterExposer.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/api/AstridFilterExposer.java rename to src/main/java/com/todoroo/astrid/api/AstridFilterExposer.java diff --git a/api/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java b/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java rename to src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java diff --git a/api/src/main/java/com/todoroo/astrid/api/Filter.java b/src/main/java/com/todoroo/astrid/api/Filter.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/api/Filter.java rename to src/main/java/com/todoroo/astrid/api/Filter.java diff --git a/api/src/main/java/com/todoroo/astrid/api/FilterListItem.java b/src/main/java/com/todoroo/astrid/api/FilterListItem.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/api/FilterListItem.java rename to src/main/java/com/todoroo/astrid/api/FilterListItem.java diff --git a/api/src/main/java/com/todoroo/astrid/api/FilterWithCustomIntent.java b/src/main/java/com/todoroo/astrid/api/FilterWithCustomIntent.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/api/FilterWithCustomIntent.java rename to src/main/java/com/todoroo/astrid/api/FilterWithCustomIntent.java diff --git a/api/src/main/java/com/todoroo/astrid/api/FilterWithUpdate.java b/src/main/java/com/todoroo/astrid/api/FilterWithUpdate.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/api/FilterWithUpdate.java rename to src/main/java/com/todoroo/astrid/api/FilterWithUpdate.java diff --git a/api/src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java b/src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java rename to src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java diff --git a/api/src/main/java/com/todoroo/astrid/api/PermaSql.java b/src/main/java/com/todoroo/astrid/api/PermaSql.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/api/PermaSql.java rename to src/main/java/com/todoroo/astrid/api/PermaSql.java diff --git a/api/src/main/java/com/todoroo/astrid/api/TaskAction.java b/src/main/java/com/todoroo/astrid/api/TaskAction.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/api/TaskAction.java rename to src/main/java/com/todoroo/astrid/api/TaskAction.java diff --git a/api/src/main/java/com/todoroo/astrid/api/TextInputCriterion.java b/src/main/java/com/todoroo/astrid/api/TextInputCriterion.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/api/TextInputCriterion.java rename to src/main/java/com/todoroo/astrid/api/TextInputCriterion.java diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/BackupConstants.java b/src/main/java/com/todoroo/astrid/backup/BackupConstants.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/backup/BackupConstants.java rename to src/main/java/com/todoroo/astrid/backup/BackupConstants.java diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/BackupPreferences.java b/src/main/java/com/todoroo/astrid/backup/BackupPreferences.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/backup/BackupPreferences.java rename to src/main/java/com/todoroo/astrid/backup/BackupPreferences.java diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/BackupService.java b/src/main/java/com/todoroo/astrid/backup/BackupService.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/backup/BackupService.java rename to src/main/java/com/todoroo/astrid/backup/BackupService.java diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/BackupStartupReceiver.java b/src/main/java/com/todoroo/astrid/backup/BackupStartupReceiver.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/backup/BackupStartupReceiver.java rename to src/main/java/com/todoroo/astrid/backup/BackupStartupReceiver.java diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/FilePickerBuilder.java b/src/main/java/com/todoroo/astrid/backup/FilePickerBuilder.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/backup/FilePickerBuilder.java rename to src/main/java/com/todoroo/astrid/backup/FilePickerBuilder.java diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java b/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java rename to src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java b/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java rename to src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java diff --git a/astrid/src/main/java/com/todoroo/astrid/calls/MissedCallActivity.java b/src/main/java/com/todoroo/astrid/calls/MissedCallActivity.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/calls/MissedCallActivity.java rename to src/main/java/com/todoroo/astrid/calls/MissedCallActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java b/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java rename to src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java diff --git a/astrid/src/main/java/com/todoroo/astrid/core/CoreFilterExposer.java b/src/main/java/com/todoroo/astrid/core/CoreFilterExposer.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/core/CoreFilterExposer.java rename to src/main/java/com/todoroo/astrid/core/CoreFilterExposer.java diff --git a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java rename to src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java b/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java rename to src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java diff --git a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java b/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java rename to src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java diff --git a/astrid/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java b/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java rename to src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java diff --git a/astrid/src/main/java/com/todoroo/astrid/core/FilterView.java b/src/main/java/com/todoroo/astrid/core/FilterView.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/core/FilterView.java rename to src/main/java/com/todoroo/astrid/core/FilterView.java diff --git a/astrid/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java b/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java rename to src/main/java/com/todoroo/astrid/core/LinkActionExposer.java diff --git a/astrid/src/main/java/com/todoroo/astrid/core/OldTaskPreferences.java b/src/main/java/com/todoroo/astrid/core/OldTaskPreferences.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/core/OldTaskPreferences.java rename to src/main/java/com/todoroo/astrid/core/OldTaskPreferences.java diff --git a/astrid/src/main/java/com/todoroo/astrid/core/SavedFilter.java b/src/main/java/com/todoroo/astrid/core/SavedFilter.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/core/SavedFilter.java rename to src/main/java/com/todoroo/astrid/core/SavedFilter.java diff --git a/api/src/main/java/com/todoroo/astrid/core/SortHelper.java b/src/main/java/com/todoroo/astrid/core/SortHelper.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/core/SortHelper.java rename to src/main/java/com/todoroo/astrid/core/SortHelper.java diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/Database.java b/src/main/java/com/todoroo/astrid/dao/Database.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/dao/Database.java rename to src/main/java/com/todoroo/astrid/dao/Database.java diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/MetadataDao.java b/src/main/java/com/todoroo/astrid/dao/MetadataDao.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/dao/MetadataDao.java rename to src/main/java/com/todoroo/astrid/dao/MetadataDao.java diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/RemoteModelDao.java b/src/main/java/com/todoroo/astrid/dao/RemoteModelDao.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/dao/RemoteModelDao.java rename to src/main/java/com/todoroo/astrid/dao/RemoteModelDao.java diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/StoreObjectDao.java b/src/main/java/com/todoroo/astrid/dao/StoreObjectDao.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/dao/StoreObjectDao.java rename to src/main/java/com/todoroo/astrid/dao/StoreObjectDao.java diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/TagDataDao.java b/src/main/java/com/todoroo/astrid/dao/TagDataDao.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/dao/TagDataDao.java rename to src/main/java/com/todoroo/astrid/dao/TagDataDao.java diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/TaskAttachmentDao.java b/src/main/java/com/todoroo/astrid/dao/TaskAttachmentDao.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/dao/TaskAttachmentDao.java rename to src/main/java/com/todoroo/astrid/dao/TaskAttachmentDao.java diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/TaskDao.java b/src/main/java/com/todoroo/astrid/dao/TaskDao.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/dao/TaskDao.java rename to src/main/java/com/todoroo/astrid/dao/TaskDao.java diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/TaskListMetadataDao.java b/src/main/java/com/todoroo/astrid/dao/TaskListMetadataDao.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/dao/TaskListMetadataDao.java rename to src/main/java/com/todoroo/astrid/dao/TaskListMetadataDao.java diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/UserActivityDao.java b/src/main/java/com/todoroo/astrid/dao/UserActivityDao.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/dao/UserActivityDao.java rename to src/main/java/com/todoroo/astrid/dao/UserActivityDao.java diff --git a/api/src/main/java/com/todoroo/astrid/data/Metadata.java b/src/main/java/com/todoroo/astrid/data/Metadata.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/data/Metadata.java rename to src/main/java/com/todoroo/astrid/data/Metadata.java diff --git a/api/src/main/java/com/todoroo/astrid/data/RemoteModel.java b/src/main/java/com/todoroo/astrid/data/RemoteModel.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/data/RemoteModel.java rename to src/main/java/com/todoroo/astrid/data/RemoteModel.java diff --git a/api/src/main/java/com/todoroo/astrid/data/StoreObject.java b/src/main/java/com/todoroo/astrid/data/StoreObject.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/data/StoreObject.java rename to src/main/java/com/todoroo/astrid/data/StoreObject.java diff --git a/api/src/main/java/com/todoroo/astrid/data/SyncFlags.java b/src/main/java/com/todoroo/astrid/data/SyncFlags.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/data/SyncFlags.java rename to src/main/java/com/todoroo/astrid/data/SyncFlags.java diff --git a/api/src/main/java/com/todoroo/astrid/data/TagData.java b/src/main/java/com/todoroo/astrid/data/TagData.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/data/TagData.java rename to src/main/java/com/todoroo/astrid/data/TagData.java diff --git a/api/src/main/java/com/todoroo/astrid/data/Task.java b/src/main/java/com/todoroo/astrid/data/Task.java similarity index 99% rename from api/src/main/java/com/todoroo/astrid/data/Task.java rename to src/main/java/com/todoroo/astrid/data/Task.java index 85498ccf0..0543915b0 100644 --- a/api/src/main/java/com/todoroo/astrid/data/Task.java +++ b/src/main/java/com/todoroo/astrid/data/Task.java @@ -19,7 +19,7 @@ import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.api.AstridApiConstants; -import org.tasks.api.R; +import org.tasks.R; import java.util.Date; diff --git a/api/src/main/java/com/todoroo/astrid/data/TaskApiDao.java b/src/main/java/com/todoroo/astrid/data/TaskApiDao.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/data/TaskApiDao.java rename to src/main/java/com/todoroo/astrid/data/TaskApiDao.java diff --git a/api/src/main/java/com/todoroo/astrid/data/TaskAttachment.java b/src/main/java/com/todoroo/astrid/data/TaskAttachment.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/data/TaskAttachment.java rename to src/main/java/com/todoroo/astrid/data/TaskAttachment.java diff --git a/api/src/main/java/com/todoroo/astrid/data/TaskListMetadata.java b/src/main/java/com/todoroo/astrid/data/TaskListMetadata.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/data/TaskListMetadata.java rename to src/main/java/com/todoroo/astrid/data/TaskListMetadata.java diff --git a/api/src/main/java/com/todoroo/astrid/data/UserActivity.java b/src/main/java/com/todoroo/astrid/data/UserActivity.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/data/UserActivity.java rename to src/main/java/com/todoroo/astrid/data/UserActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/files/AACRecordingActivity.java b/src/main/java/com/todoroo/astrid/files/AACRecordingActivity.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/files/AACRecordingActivity.java rename to src/main/java/com/todoroo/astrid/files/AACRecordingActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/files/FileExplore.java b/src/main/java/com/todoroo/astrid/files/FileExplore.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/files/FileExplore.java rename to src/main/java/com/todoroo/astrid/files/FileExplore.java diff --git a/astrid/src/main/java/com/todoroo/astrid/files/FileUtilities.java b/src/main/java/com/todoroo/astrid/files/FileUtilities.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/files/FileUtilities.java rename to src/main/java/com/todoroo/astrid/files/FileUtilities.java diff --git a/astrid/src/main/java/com/todoroo/astrid/files/FilesAction.java b/src/main/java/com/todoroo/astrid/files/FilesAction.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/files/FilesAction.java rename to src/main/java/com/todoroo/astrid/files/FilesAction.java diff --git a/astrid/src/main/java/com/todoroo/astrid/files/FilesControlSet.java b/src/main/java/com/todoroo/astrid/files/FilesControlSet.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/files/FilesControlSet.java rename to src/main/java/com/todoroo/astrid/files/FilesControlSet.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java b/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java rename to src/main/java/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java b/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java rename to src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java b/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java rename to src/main/java/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java b/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java rename to src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarStartupReceiver.java b/src/main/java/com/todoroo/astrid/gcal/CalendarStartupReceiver.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gcal/CalendarStartupReceiver.java rename to src/main/java/com/todoroo/astrid/gcal/CalendarStartupReceiver.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/Calendars.java b/src/main/java/com/todoroo/astrid/gcal/Calendars.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gcal/Calendars.java rename to src/main/java/com/todoroo/astrid/gcal/Calendars.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java b/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java rename to src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java b/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java rename to src/main/java/com/todoroo/astrid/gcal/GCalHelper.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java b/src/main/java/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java rename to src/main/java/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksBackgroundService.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksBackgroundService.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksBackgroundService.java rename to src/main/java/com/todoroo/astrid/gtasks/GtasksBackgroundService.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java rename to src/main/java/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java rename to src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksList.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksList.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksList.java rename to src/main/java/com/todoroo/astrid/gtasks/GtasksList.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java rename to src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java rename to src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadata.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadata.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadata.java rename to src/main/java/com/todoroo/astrid/gtasks/GtasksMetadata.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java rename to src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java rename to src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferences.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferences.java similarity index 79% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferences.java rename to src/main/java/com/todoroo/astrid/gtasks/GtasksPreferences.java index 097c86981..5dadc5c12 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferences.java +++ b/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferences.java @@ -111,7 +111,7 @@ public class GtasksPreferences extends InjectingSyncProviderPreferences { @Override public void onChildViewAdded(View parent, View child) { - View view = findViewById(org.tasks.api.R.id.status); + View view = findViewById(org.tasks.R.id.status); if(view != null) { view.setBackgroundColor(statusColor); } @@ -127,38 +127,38 @@ public class GtasksPreferences extends InjectingSyncProviderPreferences { if (r.getString(gtasksPreferenceService.getSyncIntervalKey()).equals( preference.getKey())) { int index = AndroidUtilities.indexOf( - r.getStringArray(org.tasks.api.R.array.sync_SPr_interval_values), + r.getStringArray(org.tasks.R.array.sync_SPr_interval_values), value); if (index <= 0) { - preference.setSummary(org.tasks.api.R.string.sync_SPr_interval_desc_disabled); + preference.setSummary(org.tasks.R.string.sync_SPr_interval_desc_disabled); } else { preference.setSummary(r.getString( - org.tasks.api.R.string.sync_SPr_interval_desc, - r.getStringArray(org.tasks.api.R.array.sync_SPr_interval_entries)[index])); + org.tasks.R.string.sync_SPr_interval_desc, + r.getStringArray(org.tasks.R.array.sync_SPr_interval_entries)[index])); } } // status - else if (r.getString(org.tasks.api.R.string.sync_SPr_status_key).equals(preference.getKey())) { + else if (r.getString(org.tasks.R.string.sync_SPr_status_key).equals(preference.getKey())) { boolean loggedIn = gtasksPreferenceService.isLoggedIn(); String status; //String subtitle = ""; //$NON-NLS-1$ // ! logged in - display message, click -> sync if(!loggedIn) { - status = r.getString(org.tasks.api.R.string.sync_status_loggedout); + status = r.getString(org.tasks.R.string.sync_status_loggedout); statusColor = Color.rgb(19, 132, 165); } // sync is occurring else if(gtasksPreferenceService.isOngoing()) { - status = r.getString(org.tasks.api.R.string.sync_status_ongoing); + status = r.getString(org.tasks.R.string.sync_status_ongoing); statusColor = Color.rgb(0, 0, 100); } // last sync had errors else if(gtasksPreferenceService.getLastError() != null || gtasksPreferenceService.getLastAttemptedSyncDate() != 0) { // last sync was failure if(gtasksPreferenceService.getLastAttemptedSyncDate() != 0) { - status = r.getString(org.tasks.api.R.string.sync_status_failed, + status = r.getString(org.tasks.R.string.sync_status_failed, DateUtilities.getDateStringWithTime(GtasksPreferences.this, newDate(gtasksPreferenceService.getLastAttemptedSyncDate()))); statusColor = Color.rgb(100, 0, 0); @@ -167,21 +167,21 @@ public class GtasksPreferences extends InjectingSyncProviderPreferences { String dateString = lastSyncDate > 0 ? DateUtilities.getDateStringWithTime(GtasksPreferences.this, newDate(lastSyncDate)) : ""; //$NON-NLS-1$ - status = r.getString(org.tasks.api.R.string.sync_status_errors, dateString); + status = r.getString(org.tasks.R.string.sync_status_errors, dateString); statusColor = Color.rgb(100, 100, 0); } } else if(gtasksPreferenceService.getLastSyncDate() > 0) { - status = r.getString(org.tasks.api.R.string.sync_status_success, + status = r.getString(org.tasks.R.string.sync_status_success, DateUtilities.getDateStringWithTime(GtasksPreferences.this, newDate(gtasksPreferenceService.getLastSyncDate()))); statusColor = Color.rgb(0, 100, 0); } else { - status = r.getString(org.tasks.api.R.string.sync_status_never); + status = r.getString(org.tasks.R.string.sync_status_never); statusColor = Color.rgb(0, 0, 100); } - preference.setTitle(org.tasks.api.R.string.sync_SPr_sync); - preference.setSummary(r.getString(org.tasks.api.R.string.sync_SPr_status_subtitle, status)); + preference.setTitle(org.tasks.R.string.sync_SPr_sync); + preference.setSummary(r.getString(org.tasks.R.string.sync_SPr_status_subtitle, status)); preference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { @Override @@ -191,28 +191,28 @@ public class GtasksPreferences extends InjectingSyncProviderPreferences { } }); - View view = findViewById(org.tasks.api.R.id.status); + View view = findViewById(org.tasks.R.id.status); if(view != null) { view.setBackgroundColor(statusColor); } } - else if (r.getString(org.tasks.api.R.string.sync_SPr_key_last_error).equals(preference.getKey())) { + else if (r.getString(org.tasks.R.string.sync_SPr_key_last_error).equals(preference.getKey())) { if (gtasksPreferenceService.getLastError() != null) { // Display error final String service = getTitle().toString(); final String lastErrorFull = gtasksPreferenceService.getLastError(); final String lastErrorDisplay = adjustErrorForDisplay(r, lastErrorFull, service); - preference.setTitle(org.tasks.api.R.string.sync_SPr_last_error); - preference.setSummary(org.tasks.api.R.string.sync_SPr_last_error_subtitle); + preference.setTitle(org.tasks.R.string.sync_SPr_last_error); + preference.setSummary(org.tasks.R.string.sync_SPr_last_error_subtitle); preference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { @Override public boolean onPreferenceClick(Preference pref) { // Show last error new AlertDialog.Builder(GtasksPreferences.this) - .setTitle(org.tasks.api.R.string.sync_SPr_last_error) + .setTitle(org.tasks.R.string.sync_SPr_last_error) .setMessage(lastErrorDisplay) - .setPositiveButton(org.tasks.api.R.string.sync_SPr_send_report, new DialogInterface.OnClickListener() { + .setPositiveButton(org.tasks.R.string.sync_SPr_send_report, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { Intent emailIntent = new Intent(Intent.ACTION_SEND); @@ -220,28 +220,28 @@ public class GtasksPreferences extends InjectingSyncProviderPreferences { .putExtra(Intent.EXTRA_EMAIL, new String[] { "baker.alex@gmail.com"} ) .putExtra(Intent.EXTRA_SUBJECT, service + " Sync Error") .putExtra(Intent.EXTRA_TEXT, lastErrorFull); - startActivity(Intent.createChooser(emailIntent, r.getString(org.tasks.api.R.string.sync_SPr_send_report))); + startActivity(Intent.createChooser(emailIntent, r.getString(org.tasks.R.string.sync_SPr_send_report))); } }) - .setNegativeButton(org.tasks.api.R.string.DLG_close, null) + .setNegativeButton(org.tasks.R.string.DLG_close, null) .create().show(); return true; } }); } else { - PreferenceCategory statusCategory = (PreferenceCategory) findPreference(r.getString(org.tasks.api.R.string.sync_SPr_group_status)); - statusCategory.removePreference(findPreference(r.getString(org.tasks.api.R.string.sync_SPr_key_last_error))); + PreferenceCategory statusCategory = (PreferenceCategory) findPreference(r.getString(org.tasks.R.string.sync_SPr_group_status)); + statusCategory.removePreference(findPreference(r.getString(org.tasks.R.string.sync_SPr_key_last_error))); } } // log out button - else if (r.getString(org.tasks.api.R.string.sync_SPr_forget_key).equals(preference.getKey())) { + else if (r.getString(org.tasks.R.string.sync_SPr_forget_key).equals(preference.getKey())) { boolean loggedIn = gtasksPreferenceService.isLoggedIn(); preference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { @Override public boolean onPreferenceClick(Preference p) { DialogUtilities.okCancelDialog(GtasksPreferences.this, - r.getString(org.tasks.api.R.string.sync_forget_confirm), new DialogInterface.OnClickListener() { + r.getString(org.tasks.R.string.sync_forget_confirm), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { @@ -254,7 +254,7 @@ public class GtasksPreferences extends InjectingSyncProviderPreferences { } }); if(!loggedIn) { - PreferenceCategory category = (PreferenceCategory) findPreference(r.getString(org.tasks.api.R.string.sync_SPr_key_options)); + PreferenceCategory category = (PreferenceCategory) findPreference(r.getString(org.tasks.R.string.sync_SPr_key_options)); category.removePreference(preference); } @@ -273,8 +273,8 @@ public class GtasksPreferences extends InjectingSyncProviderPreferences { private static HashMap getExceptionMap() { if (exceptionsToDisplayMessages == null) { exceptionsToDisplayMessages = new HashMap<>(); - exceptionsToDisplayMessages.put("java.net.ConnectionException", org.tasks.api.R.string.sync_error_offline); - exceptionsToDisplayMessages.put("java.net.UnknownHostException", org.tasks.api.R.string.sync_error_offline); + exceptionsToDisplayMessages.put("java.net.ConnectionException", org.tasks.R.string.sync_error_offline); + exceptionsToDisplayMessages.put("java.net.UnknownHostException", org.tasks.R.string.sync_error_offline); } return exceptionsToDisplayMessages; } diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksScheduler.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksScheduler.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksScheduler.java rename to src/main/java/com/todoroo/astrid/gtasks/GtasksScheduler.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksStartupReceiver.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksStartupReceiver.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksStartupReceiver.java rename to src/main/java/com/todoroo/astrid/gtasks/GtasksStartupReceiver.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java rename to src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java b/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java rename to src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListUpdater.java b/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListUpdater.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListUpdater.java rename to src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListUpdater.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/api/GoogleTasksException.java b/src/main/java/com/todoroo/astrid/gtasks/api/GoogleTasksException.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/api/GoogleTasksException.java rename to src/main/java/com/todoroo/astrid/gtasks/api/GoogleTasksException.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java b/src/main/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java rename to src/main/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java b/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java rename to src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/api/HttpNotFoundException.java b/src/main/java/com/todoroo/astrid/gtasks/api/HttpNotFoundException.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/api/HttpNotFoundException.java rename to src/main/java/com/todoroo/astrid/gtasks/api/HttpNotFoundException.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/api/MoveRequest.java b/src/main/java/com/todoroo/astrid/gtasks/api/MoveRequest.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/api/MoveRequest.java rename to src/main/java/com/todoroo/astrid/gtasks/api/MoveRequest.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java b/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java rename to src/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java b/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java rename to src/main/java/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java b/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java rename to src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java b/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java rename to src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java b/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java rename to src/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java diff --git a/astrid/src/main/java/com/todoroo/astrid/helper/MetadataHelper.java b/src/main/java/com/todoroo/astrid/helper/MetadataHelper.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/helper/MetadataHelper.java rename to src/main/java/com/todoroo/astrid/helper/MetadataHelper.java diff --git a/astrid/src/main/java/com/todoroo/astrid/helper/SyncActionHelper.java b/src/main/java/com/todoroo/astrid/helper/SyncActionHelper.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/helper/SyncActionHelper.java rename to src/main/java/com/todoroo/astrid/helper/SyncActionHelper.java diff --git a/astrid/src/main/java/com/todoroo/astrid/helper/TaskEditControlSet.java b/src/main/java/com/todoroo/astrid/helper/TaskEditControlSet.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/helper/TaskEditControlSet.java rename to src/main/java/com/todoroo/astrid/helper/TaskEditControlSet.java diff --git a/astrid/src/main/java/com/todoroo/astrid/helper/UUIDHelper.java b/src/main/java/com/todoroo/astrid/helper/UUIDHelper.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/helper/UUIDHelper.java rename to src/main/java/com/todoroo/astrid/helper/UUIDHelper.java diff --git a/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java b/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java rename to src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/notes/NoteMetadata.java b/src/main/java/com/todoroo/astrid/notes/NoteMetadata.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/notes/NoteMetadata.java rename to src/main/java/com/todoroo/astrid/notes/NoteMetadata.java diff --git a/astrid/src/main/java/com/todoroo/astrid/notes/NotesAction.java b/src/main/java/com/todoroo/astrid/notes/NotesAction.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/notes/NotesAction.java rename to src/main/java/com/todoroo/astrid/notes/NotesAction.java diff --git a/astrid/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java b/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java rename to src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java diff --git a/astrid/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java b/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java rename to src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java diff --git a/astrid/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java b/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java rename to src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/NotificationFragment.java b/src/main/java/com/todoroo/astrid/reminders/NotificationFragment.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/reminders/NotificationFragment.java rename to src/main/java/com/todoroo/astrid/reminders/NotificationFragment.java diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/Notifications.java b/src/main/java/com/todoroo/astrid/reminders/Notifications.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/reminders/Notifications.java rename to src/main/java/com/todoroo/astrid/reminders/Notifications.java diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderDialog.java b/src/main/java/com/todoroo/astrid/reminders/ReminderDialog.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/reminders/ReminderDialog.java rename to src/main/java/com/todoroo/astrid/reminders/ReminderDialog.java diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java b/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java rename to src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderSchedulingService.java b/src/main/java/com/todoroo/astrid/reminders/ReminderSchedulingService.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/reminders/ReminderSchedulingService.java rename to src/main/java/com/todoroo/astrid/reminders/ReminderSchedulingService.java diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderService.java b/src/main/java/com/todoroo/astrid/reminders/ReminderService.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/reminders/ReminderService.java rename to src/main/java/com/todoroo/astrid/reminders/ReminderService.java diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderStartupReceiver.java b/src/main/java/com/todoroo/astrid/reminders/ReminderStartupReceiver.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/reminders/ReminderStartupReceiver.java rename to src/main/java/com/todoroo/astrid/reminders/ReminderStartupReceiver.java diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/ShowNotificationReceiver.java b/src/main/java/com/todoroo/astrid/reminders/ShowNotificationReceiver.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/reminders/ShowNotificationReceiver.java rename to src/main/java/com/todoroo/astrid/reminders/ShowNotificationReceiver.java diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/SnoozeCallback.java b/src/main/java/com/todoroo/astrid/reminders/SnoozeCallback.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/reminders/SnoozeCallback.java rename to src/main/java/com/todoroo/astrid/reminders/SnoozeCallback.java diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/SnoozeDialog.java b/src/main/java/com/todoroo/astrid/reminders/SnoozeDialog.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/reminders/SnoozeDialog.java rename to src/main/java/com/todoroo/astrid/reminders/SnoozeDialog.java diff --git a/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java rename to src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java diff --git a/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java b/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java rename to src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java diff --git a/astrid/src/main/java/com/todoroo/astrid/service/MarketStrategy.java b/src/main/java/com/todoroo/astrid/service/MarketStrategy.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/service/MarketStrategy.java rename to src/main/java/com/todoroo/astrid/service/MarketStrategy.java diff --git a/astrid/src/main/java/com/todoroo/astrid/service/StartupService.java b/src/main/java/com/todoroo/astrid/service/StartupService.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/service/StartupService.java rename to src/main/java/com/todoroo/astrid/service/StartupService.java diff --git a/astrid/src/main/java/com/todoroo/astrid/service/SyncV2Service.java b/src/main/java/com/todoroo/astrid/service/SyncV2Service.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/service/SyncV2Service.java rename to src/main/java/com/todoroo/astrid/service/SyncV2Service.java diff --git a/astrid/src/main/java/com/todoroo/astrid/service/SynchronizeMetadataCallback.java b/src/main/java/com/todoroo/astrid/service/SynchronizeMetadataCallback.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/service/SynchronizeMetadataCallback.java rename to src/main/java/com/todoroo/astrid/service/SynchronizeMetadataCallback.java diff --git a/astrid/src/main/java/com/todoroo/astrid/service/TaskCreator.java b/src/main/java/com/todoroo/astrid/service/TaskCreator.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/service/TaskCreator.java rename to src/main/java/com/todoroo/astrid/service/TaskCreator.java diff --git a/astrid/src/main/java/com/todoroo/astrid/service/TaskDeleter.java b/src/main/java/com/todoroo/astrid/service/TaskDeleter.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/service/TaskDeleter.java rename to src/main/java/com/todoroo/astrid/service/TaskDeleter.java diff --git a/astrid/src/main/java/com/todoroo/astrid/service/TaskDuplicator.java b/src/main/java/com/todoroo/astrid/service/TaskDuplicator.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/service/TaskDuplicator.java rename to src/main/java/com/todoroo/astrid/service/TaskDuplicator.java diff --git a/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java b/src/main/java/com/todoroo/astrid/service/TaskService.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/service/TaskService.java rename to src/main/java/com/todoroo/astrid/service/TaskService.java diff --git a/astrid/src/main/java/com/todoroo/astrid/service/UpdateScreenFlow.java b/src/main/java/com/todoroo/astrid/service/UpdateScreenFlow.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/service/UpdateScreenFlow.java rename to src/main/java/com/todoroo/astrid/service/UpdateScreenFlow.java diff --git a/astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java b/src/main/java/com/todoroo/astrid/service/UpgradeService.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java rename to src/main/java/com/todoroo/astrid/service/UpgradeService.java diff --git a/astrid/src/main/java/com/todoroo/astrid/service/WidgetUpdatingCallbackWrapper.java b/src/main/java/com/todoroo/astrid/service/WidgetUpdatingCallbackWrapper.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/service/WidgetUpdatingCallbackWrapper.java rename to src/main/java/com/todoroo/astrid/service/WidgetUpdatingCallbackWrapper.java diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java rename to src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java b/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java rename to src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedListFragmentHelperInterface.java b/src/main/java/com/todoroo/astrid/subtasks/OrderedListFragmentHelperInterface.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedListFragmentHelperInterface.java rename to src/main/java/com/todoroo/astrid/subtasks/OrderedListFragmentHelperInterface.java diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java b/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java rename to src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java b/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java rename to src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java b/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java rename to src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java b/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java rename to src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksUpdater.java b/src/main/java/com/todoroo/astrid/subtasks/SubtasksUpdater.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksUpdater.java rename to src/main/java/com/todoroo/astrid/subtasks/SubtasksUpdater.java diff --git a/api/src/main/java/com/todoroo/astrid/sync/SyncResultCallback.java b/src/main/java/com/todoroo/astrid/sync/SyncResultCallback.java similarity index 100% rename from api/src/main/java/com/todoroo/astrid/sync/SyncResultCallback.java rename to src/main/java/com/todoroo/astrid/sync/SyncResultCallback.java diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/DeleteTagActivity.java b/src/main/java/com/todoroo/astrid/tags/DeleteTagActivity.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/tags/DeleteTagActivity.java rename to src/main/java/com/todoroo/astrid/tags/DeleteTagActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/RenameTagActivity.java b/src/main/java/com/todoroo/astrid/tags/RenameTagActivity.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/tags/RenameTagActivity.java rename to src/main/java/com/todoroo/astrid/tags/RenameTagActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TagActivity.java b/src/main/java/com/todoroo/astrid/tags/TagActivity.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/tags/TagActivity.java rename to src/main/java/com/todoroo/astrid/tags/TagActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java b/src/main/java/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java rename to src/main/java/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java b/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java rename to src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TagService.java b/src/main/java/com/todoroo/astrid/tags/TagService.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/tags/TagService.java rename to src/main/java/com/todoroo/astrid/tags/TagService.java diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java b/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java rename to src/main/java/com/todoroo/astrid/tags/TagsControlSet.java diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TaskToTagMetadata.java b/src/main/java/com/todoroo/astrid/tags/TaskToTagMetadata.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/tags/TaskToTagMetadata.java rename to src/main/java/com/todoroo/astrid/tags/TaskToTagMetadata.java diff --git a/astrid/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java b/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java rename to src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java diff --git a/astrid/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java b/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java rename to src/main/java/com/todoroo/astrid/timers/TimerControlSet.java diff --git a/astrid/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java b/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java rename to src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java diff --git a/astrid/src/main/java/com/todoroo/astrid/timers/TimerPlugin.java b/src/main/java/com/todoroo/astrid/timers/TimerPlugin.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/timers/TimerPlugin.java rename to src/main/java/com/todoroo/astrid/timers/TimerPlugin.java diff --git a/astrid/src/main/java/com/todoroo/astrid/timers/TimerTaskCompleteListener.java b/src/main/java/com/todoroo/astrid/timers/TimerTaskCompleteListener.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/timers/TimerTaskCompleteListener.java rename to src/main/java/com/todoroo/astrid/timers/TimerTaskCompleteListener.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/AstridTimePicker.java b/src/main/java/com/todoroo/astrid/ui/AstridTimePicker.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/AstridTimePicker.java rename to src/main/java/com/todoroo/astrid/ui/AstridTimePicker.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/CalendarView.java b/src/main/java/com/todoroo/astrid/ui/CalendarView.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/CalendarView.java rename to src/main/java/com/todoroo/astrid/ui/CalendarView.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/CheckableImageView.java b/src/main/java/com/todoroo/astrid/ui/CheckableImageView.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/CheckableImageView.java rename to src/main/java/com/todoroo/astrid/ui/CheckableImageView.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/CustomBorderDrawable.java b/src/main/java/com/todoroo/astrid/ui/CustomBorderDrawable.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/CustomBorderDrawable.java rename to src/main/java/com/todoroo/astrid/ui/CustomBorderDrawable.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimeDialog.java b/src/main/java/com/todoroo/astrid/ui/DateAndTimeDialog.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimeDialog.java rename to src/main/java/com/todoroo/astrid/ui/DateAndTimeDialog.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java b/src/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java rename to src/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java b/src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java rename to src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java b/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java rename to src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/DeadlineNumberPicker.java b/src/main/java/com/todoroo/astrid/ui/DeadlineNumberPicker.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/DeadlineNumberPicker.java rename to src/main/java/com/todoroo/astrid/ui/DeadlineNumberPicker.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java b/src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java rename to src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/DraggableListView.java b/src/main/java/com/todoroo/astrid/ui/DraggableListView.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/DraggableListView.java rename to src/main/java/com/todoroo/astrid/ui/DraggableListView.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/EditDialogOkBackground.java b/src/main/java/com/todoroo/astrid/ui/EditDialogOkBackground.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/EditDialogOkBackground.java rename to src/main/java/com/todoroo/astrid/ui/EditDialogOkBackground.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java b/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java rename to src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java b/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java rename to src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java b/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java rename to src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/MultilineCheckboxPreference.java b/src/main/java/com/todoroo/astrid/ui/MultilineCheckboxPreference.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/MultilineCheckboxPreference.java rename to src/main/java/com/todoroo/astrid/ui/MultilineCheckboxPreference.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/MultilineHelper.java b/src/main/java/com/todoroo/astrid/ui/MultilineHelper.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/MultilineHelper.java rename to src/main/java/com/todoroo/astrid/ui/MultilineHelper.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/MultilineListPreference.java b/src/main/java/com/todoroo/astrid/ui/MultilineListPreference.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/MultilineListPreference.java rename to src/main/java/com/todoroo/astrid/ui/MultilineListPreference.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/MultilinePreference.java b/src/main/java/com/todoroo/astrid/ui/MultilinePreference.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/MultilinePreference.java rename to src/main/java/com/todoroo/astrid/ui/MultilinePreference.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java b/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java rename to src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/NumberPicker.java b/src/main/java/com/todoroo/astrid/ui/NumberPicker.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/NumberPicker.java rename to src/main/java/com/todoroo/astrid/ui/NumberPicker.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/NumberPickerButton.java b/src/main/java/com/todoroo/astrid/ui/NumberPickerButton.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/NumberPickerButton.java rename to src/main/java/com/todoroo/astrid/ui/NumberPickerButton.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/NumberPickerDialog.java b/src/main/java/com/todoroo/astrid/ui/NumberPickerDialog.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/NumberPickerDialog.java rename to src/main/java/com/todoroo/astrid/ui/NumberPickerDialog.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/PopupControlSet.java b/src/main/java/com/todoroo/astrid/ui/PopupControlSet.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/PopupControlSet.java rename to src/main/java/com/todoroo/astrid/ui/PopupControlSet.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java b/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java rename to src/main/java/com/todoroo/astrid/ui/QuickAddBar.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java b/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java rename to src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java b/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java rename to src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java b/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java rename to src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java diff --git a/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java b/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java rename to src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java diff --git a/astrid/src/main/java/com/todoroo/astrid/utility/Constants.java b/src/main/java/com/todoroo/astrid/utility/Constants.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/utility/Constants.java rename to src/main/java/com/todoroo/astrid/utility/Constants.java diff --git a/astrid/src/main/java/com/todoroo/astrid/utility/Flags.java b/src/main/java/com/todoroo/astrid/utility/Flags.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/utility/Flags.java rename to src/main/java/com/todoroo/astrid/utility/Flags.java diff --git a/astrid/src/main/java/com/todoroo/astrid/utility/TitleParser.java b/src/main/java/com/todoroo/astrid/utility/TitleParser.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/utility/TitleParser.java rename to src/main/java/com/todoroo/astrid/utility/TitleParser.java diff --git a/astrid/src/main/java/com/todoroo/astrid/utility/TodorooPreferenceActivity.java b/src/main/java/com/todoroo/astrid/utility/TodorooPreferenceActivity.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/utility/TodorooPreferenceActivity.java rename to src/main/java/com/todoroo/astrid/utility/TodorooPreferenceActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/voice/AACRecorder.java b/src/main/java/com/todoroo/astrid/voice/AACRecorder.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/voice/AACRecorder.java rename to src/main/java/com/todoroo/astrid/voice/AACRecorder.java diff --git a/astrid/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java b/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java similarity index 94% rename from astrid/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java rename to src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java index ad37b4d0e..bf8e182c8 100644 --- a/astrid/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java +++ b/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java @@ -11,21 +11,10 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.speech.RecognizerIntent; -import android.support.v4.app.Fragment; -import android.view.View; -import android.view.View.OnClickListener; -import android.widget.EditText; -import android.widget.ImageButton; import com.todoroo.andlib.data.Callback; import com.todoroo.andlib.service.ContextManager; -import junit.framework.Assert; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.security.InvalidParameterException; import java.util.ArrayList; import java.util.List; diff --git a/astrid/src/main/java/com/todoroo/astrid/voice/VoiceOutputAssistant.java b/src/main/java/com/todoroo/astrid/voice/VoiceOutputAssistant.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/voice/VoiceOutputAssistant.java rename to src/main/java/com/todoroo/astrid/voice/VoiceOutputAssistant.java diff --git a/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java b/src/main/java/com/todoroo/astrid/widget/TasksWidget.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java rename to src/main/java/com/todoroo/astrid/widget/TasksWidget.java diff --git a/astrid/src/main/java/com/todoroo/astrid/widget/WidgetConfigActivity.java b/src/main/java/com/todoroo/astrid/widget/WidgetConfigActivity.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/widget/WidgetConfigActivity.java rename to src/main/java/com/todoroo/astrid/widget/WidgetConfigActivity.java diff --git a/astrid/src/main/java/com/todoroo/astrid/widget/WidgetUpdateService.java b/src/main/java/com/todoroo/astrid/widget/WidgetUpdateService.java similarity index 100% rename from astrid/src/main/java/com/todoroo/astrid/widget/WidgetUpdateService.java rename to src/main/java/com/todoroo/astrid/widget/WidgetUpdateService.java diff --git a/astrid/src/main/java/org/tasks/Broadcaster.java b/src/main/java/org/tasks/Broadcaster.java similarity index 100% rename from astrid/src/main/java/org/tasks/Broadcaster.java rename to src/main/java/org/tasks/Broadcaster.java diff --git a/astrid/src/main/java/org/tasks/Tasks.java b/src/main/java/org/tasks/Tasks.java similarity index 100% rename from astrid/src/main/java/org/tasks/Tasks.java rename to src/main/java/org/tasks/Tasks.java diff --git a/api/src/main/java/org/tasks/date/DateTimeUtils.java b/src/main/java/org/tasks/date/DateTimeUtils.java similarity index 100% rename from api/src/main/java/org/tasks/date/DateTimeUtils.java rename to src/main/java/org/tasks/date/DateTimeUtils.java diff --git a/api/src/main/java/org/tasks/files/FileHelper.java b/src/main/java/org/tasks/files/FileHelper.java similarity index 100% rename from api/src/main/java/org/tasks/files/FileHelper.java rename to src/main/java/org/tasks/files/FileHelper.java diff --git a/api/src/main/java/org/tasks/files/ImageHelper.java b/src/main/java/org/tasks/files/ImageHelper.java similarity index 100% rename from api/src/main/java/org/tasks/files/ImageHelper.java rename to src/main/java/org/tasks/files/ImageHelper.java diff --git a/astrid/src/main/java/org/tasks/filters/FilterCounter.java b/src/main/java/org/tasks/filters/FilterCounter.java similarity index 100% rename from astrid/src/main/java/org/tasks/filters/FilterCounter.java rename to src/main/java/org/tasks/filters/FilterCounter.java diff --git a/astrid/src/main/java/org/tasks/injection/ActivityModule.java b/src/main/java/org/tasks/injection/ActivityModule.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/ActivityModule.java rename to src/main/java/org/tasks/injection/ActivityModule.java diff --git a/astrid/src/main/java/org/tasks/injection/BroadcastModule.java b/src/main/java/org/tasks/injection/BroadcastModule.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/BroadcastModule.java rename to src/main/java/org/tasks/injection/BroadcastModule.java diff --git a/astrid/src/main/java/org/tasks/injection/ContentProviderModule.java b/src/main/java/org/tasks/injection/ContentProviderModule.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/ContentProviderModule.java rename to src/main/java/org/tasks/injection/ContentProviderModule.java diff --git a/astrid/src/main/java/org/tasks/injection/Dagger.java b/src/main/java/org/tasks/injection/Dagger.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/Dagger.java rename to src/main/java/org/tasks/injection/Dagger.java diff --git a/astrid/src/main/java/org/tasks/injection/ForActivity.java b/src/main/java/org/tasks/injection/ForActivity.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/ForActivity.java rename to src/main/java/org/tasks/injection/ForActivity.java diff --git a/astrid/src/main/java/org/tasks/injection/ForApplication.java b/src/main/java/org/tasks/injection/ForApplication.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/ForApplication.java rename to src/main/java/org/tasks/injection/ForApplication.java diff --git a/astrid/src/main/java/org/tasks/injection/FragmentModule.java b/src/main/java/org/tasks/injection/FragmentModule.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/FragmentModule.java rename to src/main/java/org/tasks/injection/FragmentModule.java diff --git a/astrid/src/main/java/org/tasks/injection/InjectingActionBarActivity.java b/src/main/java/org/tasks/injection/InjectingActionBarActivity.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/InjectingActionBarActivity.java rename to src/main/java/org/tasks/injection/InjectingActionBarActivity.java diff --git a/astrid/src/main/java/org/tasks/injection/InjectingActivity.java b/src/main/java/org/tasks/injection/InjectingActivity.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/InjectingActivity.java rename to src/main/java/org/tasks/injection/InjectingActivity.java diff --git a/astrid/src/main/java/org/tasks/injection/InjectingAppWidgetProvider.java b/src/main/java/org/tasks/injection/InjectingAppWidgetProvider.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/InjectingAppWidgetProvider.java rename to src/main/java/org/tasks/injection/InjectingAppWidgetProvider.java diff --git a/astrid/src/main/java/org/tasks/injection/InjectingApplication.java b/src/main/java/org/tasks/injection/InjectingApplication.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/InjectingApplication.java rename to src/main/java/org/tasks/injection/InjectingApplication.java diff --git a/astrid/src/main/java/org/tasks/injection/InjectingBroadcastReceiver.java b/src/main/java/org/tasks/injection/InjectingBroadcastReceiver.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/InjectingBroadcastReceiver.java rename to src/main/java/org/tasks/injection/InjectingBroadcastReceiver.java diff --git a/astrid/src/main/java/org/tasks/injection/InjectingContentProvider.java b/src/main/java/org/tasks/injection/InjectingContentProvider.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/InjectingContentProvider.java rename to src/main/java/org/tasks/injection/InjectingContentProvider.java diff --git a/astrid/src/main/java/org/tasks/injection/InjectingFragment.java b/src/main/java/org/tasks/injection/InjectingFragment.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/InjectingFragment.java rename to src/main/java/org/tasks/injection/InjectingFragment.java diff --git a/astrid/src/main/java/org/tasks/injection/InjectingListActivity.java b/src/main/java/org/tasks/injection/InjectingListActivity.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/InjectingListActivity.java rename to src/main/java/org/tasks/injection/InjectingListActivity.java diff --git a/astrid/src/main/java/org/tasks/injection/InjectingListFragment.java b/src/main/java/org/tasks/injection/InjectingListFragment.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/InjectingListFragment.java rename to src/main/java/org/tasks/injection/InjectingListFragment.java diff --git a/astrid/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java b/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java rename to src/main/java/org/tasks/injection/InjectingPreferenceActivity.java diff --git a/astrid/src/main/java/org/tasks/injection/InjectingRemoteViewsService.java b/src/main/java/org/tasks/injection/InjectingRemoteViewsService.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/InjectingRemoteViewsService.java rename to src/main/java/org/tasks/injection/InjectingRemoteViewsService.java diff --git a/astrid/src/main/java/org/tasks/injection/InjectingService.java b/src/main/java/org/tasks/injection/InjectingService.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/InjectingService.java rename to src/main/java/org/tasks/injection/InjectingService.java diff --git a/astrid/src/main/java/org/tasks/injection/InjectingSyncProviderPreferences.java b/src/main/java/org/tasks/injection/InjectingSyncProviderPreferences.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/InjectingSyncProviderPreferences.java rename to src/main/java/org/tasks/injection/InjectingSyncProviderPreferences.java diff --git a/api/src/main/java/org/tasks/injection/Injector.java b/src/main/java/org/tasks/injection/Injector.java similarity index 100% rename from api/src/main/java/org/tasks/injection/Injector.java rename to src/main/java/org/tasks/injection/Injector.java diff --git a/astrid/src/main/java/org/tasks/injection/ServiceModule.java b/src/main/java/org/tasks/injection/ServiceModule.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/ServiceModule.java rename to src/main/java/org/tasks/injection/ServiceModule.java diff --git a/astrid/src/main/java/org/tasks/injection/TasksModule.java b/src/main/java/org/tasks/injection/TasksModule.java similarity index 100% rename from astrid/src/main/java/org/tasks/injection/TasksModule.java rename to src/main/java/org/tasks/injection/TasksModule.java diff --git a/astrid/src/main/java/org/tasks/notifications/NotificationManager.java b/src/main/java/org/tasks/notifications/NotificationManager.java similarity index 100% rename from astrid/src/main/java/org/tasks/notifications/NotificationManager.java rename to src/main/java/org/tasks/notifications/NotificationManager.java diff --git a/astrid/src/main/java/org/tasks/preferences/ActivityPreferences.java b/src/main/java/org/tasks/preferences/ActivityPreferences.java similarity index 100% rename from astrid/src/main/java/org/tasks/preferences/ActivityPreferences.java rename to src/main/java/org/tasks/preferences/ActivityPreferences.java diff --git a/astrid/src/main/java/org/tasks/preferences/Preferences.java b/src/main/java/org/tasks/preferences/Preferences.java similarity index 100% rename from astrid/src/main/java/org/tasks/preferences/Preferences.java rename to src/main/java/org/tasks/preferences/Preferences.java diff --git a/astrid/src/main/java/org/tasks/preferences/ResourceResolver.java b/src/main/java/org/tasks/preferences/ResourceResolver.java similarity index 100% rename from astrid/src/main/java/org/tasks/preferences/ResourceResolver.java rename to src/main/java/org/tasks/preferences/ResourceResolver.java diff --git a/astrid/src/main/java/org/tasks/scheduling/RefreshBroadcastReceiver.java b/src/main/java/org/tasks/scheduling/RefreshBroadcastReceiver.java similarity index 100% rename from astrid/src/main/java/org/tasks/scheduling/RefreshBroadcastReceiver.java rename to src/main/java/org/tasks/scheduling/RefreshBroadcastReceiver.java diff --git a/astrid/src/main/java/org/tasks/scheduling/RefreshScheduler.java b/src/main/java/org/tasks/scheduling/RefreshScheduler.java similarity index 100% rename from astrid/src/main/java/org/tasks/scheduling/RefreshScheduler.java rename to src/main/java/org/tasks/scheduling/RefreshScheduler.java diff --git a/astrid/src/main/java/org/tasks/sync/IndeterminateProgressBarSyncResultCallback.java b/src/main/java/org/tasks/sync/IndeterminateProgressBarSyncResultCallback.java similarity index 100% rename from astrid/src/main/java/org/tasks/sync/IndeterminateProgressBarSyncResultCallback.java rename to src/main/java/org/tasks/sync/IndeterminateProgressBarSyncResultCallback.java diff --git a/astrid/src/main/java/org/tasks/sync/RecordSyncStatusCallback.java b/src/main/java/org/tasks/sync/RecordSyncStatusCallback.java similarity index 100% rename from astrid/src/main/java/org/tasks/sync/RecordSyncStatusCallback.java rename to src/main/java/org/tasks/sync/RecordSyncStatusCallback.java diff --git a/astrid/src/main/java/org/tasks/sync/SyncExecutor.java b/src/main/java/org/tasks/sync/SyncExecutor.java similarity index 100% rename from astrid/src/main/java/org/tasks/sync/SyncExecutor.java rename to src/main/java/org/tasks/sync/SyncExecutor.java diff --git a/astrid/src/main/java/org/tasks/sync/SyncThrottle.java b/src/main/java/org/tasks/sync/SyncThrottle.java similarity index 100% rename from astrid/src/main/java/org/tasks/sync/SyncThrottle.java rename to src/main/java/org/tasks/sync/SyncThrottle.java diff --git a/astrid/src/main/java/org/tasks/ui/DraggableSwipeRefreshLayout.java b/src/main/java/org/tasks/ui/DraggableSwipeRefreshLayout.java similarity index 100% rename from astrid/src/main/java/org/tasks/ui/DraggableSwipeRefreshLayout.java rename to src/main/java/org/tasks/ui/DraggableSwipeRefreshLayout.java diff --git a/astrid/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java similarity index 100% rename from astrid/src/main/java/org/tasks/ui/NavigationDrawerFragment.java rename to src/main/java/org/tasks/ui/NavigationDrawerFragment.java diff --git a/api/src/main/java/org/tasks/ui/TimePreference.java b/src/main/java/org/tasks/ui/TimePreference.java similarity index 100% rename from api/src/main/java/org/tasks/ui/TimePreference.java rename to src/main/java/org/tasks/ui/TimePreference.java diff --git a/astrid/src/main/java/org/tasks/voice/VoiceCommandActivity.java b/src/main/java/org/tasks/voice/VoiceCommandActivity.java similarity index 100% rename from astrid/src/main/java/org/tasks/voice/VoiceCommandActivity.java rename to src/main/java/org/tasks/voice/VoiceCommandActivity.java diff --git a/astrid/src/main/java/org/tasks/widget/ScrollableViewsFactory.java b/src/main/java/org/tasks/widget/ScrollableViewsFactory.java similarity index 100% rename from astrid/src/main/java/org/tasks/widget/ScrollableViewsFactory.java rename to src/main/java/org/tasks/widget/ScrollableViewsFactory.java diff --git a/astrid/src/main/java/org/tasks/widget/ScrollableWidgetUpdateService.java b/src/main/java/org/tasks/widget/ScrollableWidgetUpdateService.java similarity index 100% rename from astrid/src/main/java/org/tasks/widget/ScrollableWidgetUpdateService.java rename to src/main/java/org/tasks/widget/ScrollableWidgetUpdateService.java diff --git a/astrid/src/main/java/org/tasks/widget/WidgetHelper.java b/src/main/java/org/tasks/widget/WidgetHelper.java similarity index 100% rename from astrid/src/main/java/org/tasks/widget/WidgetHelper.java rename to src/main/java/org/tasks/widget/WidgetHelper.java diff --git a/astrid/src/main/res/anim/slide_left_in.xml b/src/main/res/anim/slide_left_in.xml similarity index 100% rename from astrid/src/main/res/anim/slide_left_in.xml rename to src/main/res/anim/slide_left_in.xml diff --git a/astrid/src/main/res/anim/slide_left_out.xml b/src/main/res/anim/slide_left_out.xml similarity index 100% rename from astrid/src/main/res/anim/slide_left_out.xml rename to src/main/res/anim/slide_left_out.xml diff --git a/astrid/src/main/res/anim/slide_right_in.xml b/src/main/res/anim/slide_right_in.xml similarity index 100% rename from astrid/src/main/res/anim/slide_right_in.xml rename to src/main/res/anim/slide_right_in.xml diff --git a/astrid/src/main/res/anim/slide_right_out.xml b/src/main/res/anim/slide_right_out.xml similarity index 100% rename from astrid/src/main/res/anim/slide_right_out.xml rename to src/main/res/anim/slide_right_out.xml diff --git a/astrid/src/main/res/color/task_edit_toggle_button_text.xml b/src/main/res/color/task_edit_toggle_button_text.xml similarity index 100% rename from astrid/src/main/res/color/task_edit_toggle_button_text.xml rename to src/main/res/color/task_edit_toggle_button_text.xml diff --git a/astrid/src/main/res/drawable-hdpi/btn_dismiss_normal.png b/src/main/res/drawable-hdpi/btn_dismiss_normal.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/btn_dismiss_normal.png rename to src/main/res/drawable-hdpi/btn_dismiss_normal.png diff --git a/astrid/src/main/res/drawable-hdpi/btn_dismiss_pressed.png b/src/main/res/drawable-hdpi/btn_dismiss_pressed.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/btn_dismiss_pressed.png rename to src/main/res/drawable-hdpi/btn_dismiss_pressed.png diff --git a/astrid/src/main/res/drawable-hdpi/check_box_1.png b/src/main/res/drawable-hdpi/check_box_1.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/check_box_1.png rename to src/main/res/drawable-hdpi/check_box_1.png diff --git a/astrid/src/main/res/drawable-hdpi/check_box_2.png b/src/main/res/drawable-hdpi/check_box_2.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/check_box_2.png rename to src/main/res/drawable-hdpi/check_box_2.png diff --git a/astrid/src/main/res/drawable-hdpi/check_box_3.png b/src/main/res/drawable-hdpi/check_box_3.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/check_box_3.png rename to src/main/res/drawable-hdpi/check_box_3.png diff --git a/astrid/src/main/res/drawable-hdpi/check_box_4.png b/src/main/res/drawable-hdpi/check_box_4.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/check_box_4.png rename to src/main/res/drawable-hdpi/check_box_4.png diff --git a/astrid/src/main/res/drawable-hdpi/check_box_checked_1.png b/src/main/res/drawable-hdpi/check_box_checked_1.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/check_box_checked_1.png rename to src/main/res/drawable-hdpi/check_box_checked_1.png diff --git a/astrid/src/main/res/drawable-hdpi/check_box_checked_2.png b/src/main/res/drawable-hdpi/check_box_checked_2.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/check_box_checked_2.png rename to src/main/res/drawable-hdpi/check_box_checked_2.png diff --git a/astrid/src/main/res/drawable-hdpi/check_box_checked_3.png b/src/main/res/drawable-hdpi/check_box_checked_3.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/check_box_checked_3.png rename to src/main/res/drawable-hdpi/check_box_checked_3.png diff --git a/astrid/src/main/res/drawable-hdpi/check_box_checked_4.png b/src/main/res/drawable-hdpi/check_box_checked_4.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/check_box_checked_4.png rename to src/main/res/drawable-hdpi/check_box_checked_4.png diff --git a/astrid/src/main/res/drawable-hdpi/check_box_large_1.png b/src/main/res/drawable-hdpi/check_box_large_1.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/check_box_large_1.png rename to src/main/res/drawable-hdpi/check_box_large_1.png diff --git a/astrid/src/main/res/drawable-hdpi/check_box_large_2.png b/src/main/res/drawable-hdpi/check_box_large_2.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/check_box_large_2.png rename to src/main/res/drawable-hdpi/check_box_large_2.png diff --git a/astrid/src/main/res/drawable-hdpi/check_box_large_3.png b/src/main/res/drawable-hdpi/check_box_large_3.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/check_box_large_3.png rename to src/main/res/drawable-hdpi/check_box_large_3.png diff --git a/astrid/src/main/res/drawable-hdpi/check_box_large_4.png b/src/main/res/drawable-hdpi/check_box_large_4.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/check_box_large_4.png rename to src/main/res/drawable-hdpi/check_box_large_4.png diff --git a/astrid/src/main/res/drawable-hdpi/check_box_repeat_1.png b/src/main/res/drawable-hdpi/check_box_repeat_1.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/check_box_repeat_1.png rename to src/main/res/drawable-hdpi/check_box_repeat_1.png diff --git a/astrid/src/main/res/drawable-hdpi/check_box_repeat_2.png b/src/main/res/drawable-hdpi/check_box_repeat_2.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/check_box_repeat_2.png rename to src/main/res/drawable-hdpi/check_box_repeat_2.png diff --git a/astrid/src/main/res/drawable-hdpi/check_box_repeat_3.png b/src/main/res/drawable-hdpi/check_box_repeat_3.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/check_box_repeat_3.png rename to src/main/res/drawable-hdpi/check_box_repeat_3.png diff --git a/astrid/src/main/res/drawable-hdpi/check_box_repeat_4.png b/src/main/res/drawable-hdpi/check_box_repeat_4.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/check_box_repeat_4.png rename to src/main/res/drawable-hdpi/check_box_repeat_4.png diff --git a/astrid/src/main/res/drawable-hdpi/check_box_repeat_checked_1.png b/src/main/res/drawable-hdpi/check_box_repeat_checked_1.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/check_box_repeat_checked_1.png rename to src/main/res/drawable-hdpi/check_box_repeat_checked_1.png diff --git a/astrid/src/main/res/drawable-hdpi/check_box_repeat_checked_2.png b/src/main/res/drawable-hdpi/check_box_repeat_checked_2.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/check_box_repeat_checked_2.png rename to src/main/res/drawable-hdpi/check_box_repeat_checked_2.png diff --git a/astrid/src/main/res/drawable-hdpi/check_box_repeat_checked_3.png b/src/main/res/drawable-hdpi/check_box_repeat_checked_3.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/check_box_repeat_checked_3.png rename to src/main/res/drawable-hdpi/check_box_repeat_checked_3.png diff --git a/astrid/src/main/res/drawable-hdpi/check_box_repeat_checked_4.png b/src/main/res/drawable-hdpi/check_box_repeat_checked_4.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/check_box_repeat_checked_4.png rename to src/main/res/drawable-hdpi/check_box_repeat_checked_4.png diff --git a/astrid/src/main/res/drawable-hdpi/dialog_full_holo_light.9.png b/src/main/res/drawable-hdpi/dialog_full_holo_light.9.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/dialog_full_holo_light.9.png rename to src/main/res/drawable-hdpi/dialog_full_holo_light.9.png diff --git a/astrid/src/main/res/drawable-hdpi/directory_icon.png b/src/main/res/drawable-hdpi/directory_icon.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/directory_icon.png rename to src/main/res/drawable-hdpi/directory_icon.png diff --git a/astrid/src/main/res/drawable-hdpi/directory_up.png b/src/main/res/drawable-hdpi/directory_up.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/directory_up.png rename to src/main/res/drawable-hdpi/directory_up.png diff --git a/astrid/src/main/res/drawable-hdpi/drawer_shadow.9.png b/src/main/res/drawable-hdpi/drawer_shadow.9.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/drawer_shadow.9.png rename to src/main/res/drawable-hdpi/drawer_shadow.9.png diff --git a/astrid/src/main/res/drawable-hdpi/file_icon.png b/src/main/res/drawable-hdpi/file_icon.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/file_icon.png rename to src/main/res/drawable-hdpi/file_icon.png diff --git a/astrid/src/main/res/drawable-hdpi/google.png b/src/main/res/drawable-hdpi/google.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/google.png rename to src/main/res/drawable-hdpi/google.png diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_add.png b/src/main/res/drawable-hdpi/ic_action_add.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/ic_action_add.png rename to src/main/res/drawable-hdpi/ic_action_add.png diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_add_light.png b/src/main/res/drawable-hdpi/ic_action_add_light.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/ic_action_add_light.png rename to src/main/res/drawable-hdpi/ic_action_add_light.png diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_attachment_2.png b/src/main/res/drawable-hdpi/ic_action_attachment_2.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/ic_action_attachment_2.png rename to src/main/res/drawable-hdpi/ic_action_attachment_2.png diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_camera.png b/src/main/res/drawable-hdpi/ic_action_camera.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/ic_action_camera.png rename to src/main/res/drawable-hdpi/ic_action_camera.png diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_cancel.png b/src/main/res/drawable-hdpi/ic_action_cancel.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/ic_action_cancel.png rename to src/main/res/drawable-hdpi/ic_action_cancel.png diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_discard.png b/src/main/res/drawable-hdpi/ic_action_discard.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/ic_action_discard.png rename to src/main/res/drawable-hdpi/ic_action_discard.png diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_gear.png b/src/main/res/drawable-hdpi/ic_action_gear.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/ic_action_gear.png rename to src/main/res/drawable-hdpi/ic_action_gear.png diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_mic.png b/src/main/res/drawable-hdpi/ic_action_mic.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/ic_action_mic.png rename to src/main/res/drawable-hdpi/ic_action_mic.png diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_save.png b/src/main/res/drawable-hdpi/ic_action_save.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/ic_action_save.png rename to src/main/res/drawable-hdpi/ic_action_save.png diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_search.png b/src/main/res/drawable-hdpi/ic_action_search.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/ic_action_search.png rename to src/main/res/drawable-hdpi/ic_action_search.png diff --git a/astrid/src/main/res/drawable-hdpi/ic_menu_close.png b/src/main/res/drawable-hdpi/ic_menu_close.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/ic_menu_close.png rename to src/main/res/drawable-hdpi/ic_menu_close.png diff --git a/astrid/src/main/res/drawable-hdpi/icon.png b/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/icon.png rename to src/main/res/drawable-hdpi/icon.png diff --git a/astrid/src/main/res/drawable-hdpi/notif_astrid.png b/src/main/res/drawable-hdpi/notif_astrid.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/notif_astrid.png rename to src/main/res/drawable-hdpi/notif_astrid.png diff --git a/astrid/src/main/res/drawable-hdpi/single_gear.png b/src/main/res/drawable-hdpi/single_gear.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/single_gear.png rename to src/main/res/drawable-hdpi/single_gear.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_addcal.png b/src/main/res/drawable-hdpi/tea_icn_addcal.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_addcal.png rename to src/main/res/drawable-hdpi/tea_icn_addcal.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_addcal_gray.png b/src/main/res/drawable-hdpi/tea_icn_addcal_gray.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_addcal_gray.png rename to src/main/res/drawable-hdpi/tea_icn_addcal_gray.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_date.png b/src/main/res/drawable-hdpi/tea_icn_date.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_date.png rename to src/main/res/drawable-hdpi/tea_icn_date.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_date_gray.png b/src/main/res/drawable-hdpi/tea_icn_date_gray.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_date_gray.png rename to src/main/res/drawable-hdpi/tea_icn_date_gray.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_date_red.png b/src/main/res/drawable-hdpi/tea_icn_date_red.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_date_red.png rename to src/main/res/drawable-hdpi/tea_icn_date_red.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_edit.png b/src/main/res/drawable-hdpi/tea_icn_edit.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_edit.png rename to src/main/res/drawable-hdpi/tea_icn_edit.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_edit_gray.png b/src/main/res/drawable-hdpi/tea_icn_edit_gray.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_edit_gray.png rename to src/main/res/drawable-hdpi/tea_icn_edit_gray.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_files.png b/src/main/res/drawable-hdpi/tea_icn_files.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_files.png rename to src/main/res/drawable-hdpi/tea_icn_files.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_files_gray.png b/src/main/res/drawable-hdpi/tea_icn_files_gray.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_files_gray.png rename to src/main/res/drawable-hdpi/tea_icn_files_gray.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_hide.png b/src/main/res/drawable-hdpi/tea_icn_hide.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_hide.png rename to src/main/res/drawable-hdpi/tea_icn_hide.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_hide_gray.png b/src/main/res/drawable-hdpi/tea_icn_hide_gray.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_hide_gray.png rename to src/main/res/drawable-hdpi/tea_icn_hide_gray.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_lists.png b/src/main/res/drawable-hdpi/tea_icn_lists.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_lists.png rename to src/main/res/drawable-hdpi/tea_icn_lists.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_lists_gray.png b/src/main/res/drawable-hdpi/tea_icn_lists_gray.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_lists_gray.png rename to src/main/res/drawable-hdpi/tea_icn_lists_gray.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_priority.png b/src/main/res/drawable-hdpi/tea_icn_priority.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_priority.png rename to src/main/res/drawable-hdpi/tea_icn_priority.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_priority_gray.png b/src/main/res/drawable-hdpi/tea_icn_priority_gray.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_priority_gray.png rename to src/main/res/drawable-hdpi/tea_icn_priority_gray.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_reminder.png b/src/main/res/drawable-hdpi/tea_icn_reminder.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_reminder.png rename to src/main/res/drawable-hdpi/tea_icn_reminder.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_reminder_gray.png b/src/main/res/drawable-hdpi/tea_icn_reminder_gray.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_reminder_gray.png rename to src/main/res/drawable-hdpi/tea_icn_reminder_gray.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_repeat.png b/src/main/res/drawable-hdpi/tea_icn_repeat.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_repeat.png rename to src/main/res/drawable-hdpi/tea_icn_repeat.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_repeat_gray.png b/src/main/res/drawable-hdpi/tea_icn_repeat_gray.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_repeat_gray.png rename to src/main/res/drawable-hdpi/tea_icn_repeat_gray.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_timer.png b/src/main/res/drawable-hdpi/tea_icn_timer.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_timer.png rename to src/main/res/drawable-hdpi/tea_icn_timer.png diff --git a/astrid/src/main/res/drawable-hdpi/tea_icn_timer_gray.png b/src/main/res/drawable-hdpi/tea_icn_timer_gray.png similarity index 100% rename from astrid/src/main/res/drawable-hdpi/tea_icn_timer_gray.png rename to src/main/res/drawable-hdpi/tea_icn_timer_gray.png diff --git a/astrid/src/main/res/drawable-land/separator.png b/src/main/res/drawable-land/separator.png similarity index 100% rename from astrid/src/main/res/drawable-land/separator.png rename to src/main/res/drawable-land/separator.png diff --git a/astrid/src/main/res/drawable-v21/filter_row_selector.xml b/src/main/res/drawable-v21/filter_row_selector.xml similarity index 100% rename from astrid/src/main/res/drawable-v21/filter_row_selector.xml rename to src/main/res/drawable-v21/filter_row_selector.xml diff --git a/astrid/src/main/res/drawable-v21/ripple.xml b/src/main/res/drawable-v21/ripple.xml similarity index 100% rename from astrid/src/main/res/drawable-v21/ripple.xml rename to src/main/res/drawable-v21/ripple.xml diff --git a/astrid/src/main/res/drawable-xhdpi/btn_dismiss_normal.png b/src/main/res/drawable-xhdpi/btn_dismiss_normal.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/btn_dismiss_normal.png rename to src/main/res/drawable-xhdpi/btn_dismiss_normal.png diff --git a/astrid/src/main/res/drawable-xhdpi/btn_dismiss_pressed.png b/src/main/res/drawable-xhdpi/btn_dismiss_pressed.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/btn_dismiss_pressed.png rename to src/main/res/drawable-xhdpi/btn_dismiss_pressed.png diff --git a/astrid/src/main/res/drawable-xhdpi/check_box_1.png b/src/main/res/drawable-xhdpi/check_box_1.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/check_box_1.png rename to src/main/res/drawable-xhdpi/check_box_1.png diff --git a/astrid/src/main/res/drawable-xhdpi/check_box_2.png b/src/main/res/drawable-xhdpi/check_box_2.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/check_box_2.png rename to src/main/res/drawable-xhdpi/check_box_2.png diff --git a/astrid/src/main/res/drawable-xhdpi/check_box_3.png b/src/main/res/drawable-xhdpi/check_box_3.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/check_box_3.png rename to src/main/res/drawable-xhdpi/check_box_3.png diff --git a/astrid/src/main/res/drawable-xhdpi/check_box_4.png b/src/main/res/drawable-xhdpi/check_box_4.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/check_box_4.png rename to src/main/res/drawable-xhdpi/check_box_4.png diff --git a/astrid/src/main/res/drawable-xhdpi/check_box_checked_1.png b/src/main/res/drawable-xhdpi/check_box_checked_1.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/check_box_checked_1.png rename to src/main/res/drawable-xhdpi/check_box_checked_1.png diff --git a/astrid/src/main/res/drawable-xhdpi/check_box_checked_2.png b/src/main/res/drawable-xhdpi/check_box_checked_2.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/check_box_checked_2.png rename to src/main/res/drawable-xhdpi/check_box_checked_2.png diff --git a/astrid/src/main/res/drawable-xhdpi/check_box_checked_3.png b/src/main/res/drawable-xhdpi/check_box_checked_3.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/check_box_checked_3.png rename to src/main/res/drawable-xhdpi/check_box_checked_3.png diff --git a/astrid/src/main/res/drawable-xhdpi/check_box_checked_4.png b/src/main/res/drawable-xhdpi/check_box_checked_4.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/check_box_checked_4.png rename to src/main/res/drawable-xhdpi/check_box_checked_4.png diff --git a/astrid/src/main/res/drawable-xhdpi/check_box_repeat_1.png b/src/main/res/drawable-xhdpi/check_box_repeat_1.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/check_box_repeat_1.png rename to src/main/res/drawable-xhdpi/check_box_repeat_1.png diff --git a/astrid/src/main/res/drawable-xhdpi/check_box_repeat_2.png b/src/main/res/drawable-xhdpi/check_box_repeat_2.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/check_box_repeat_2.png rename to src/main/res/drawable-xhdpi/check_box_repeat_2.png diff --git a/astrid/src/main/res/drawable-xhdpi/check_box_repeat_3.png b/src/main/res/drawable-xhdpi/check_box_repeat_3.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/check_box_repeat_3.png rename to src/main/res/drawable-xhdpi/check_box_repeat_3.png diff --git a/astrid/src/main/res/drawable-xhdpi/check_box_repeat_4.png b/src/main/res/drawable-xhdpi/check_box_repeat_4.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/check_box_repeat_4.png rename to src/main/res/drawable-xhdpi/check_box_repeat_4.png diff --git a/astrid/src/main/res/drawable-xhdpi/check_box_repeat_checked_1.png b/src/main/res/drawable-xhdpi/check_box_repeat_checked_1.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/check_box_repeat_checked_1.png rename to src/main/res/drawable-xhdpi/check_box_repeat_checked_1.png diff --git a/astrid/src/main/res/drawable-xhdpi/check_box_repeat_checked_2.png b/src/main/res/drawable-xhdpi/check_box_repeat_checked_2.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/check_box_repeat_checked_2.png rename to src/main/res/drawable-xhdpi/check_box_repeat_checked_2.png diff --git a/astrid/src/main/res/drawable-xhdpi/check_box_repeat_checked_3.png b/src/main/res/drawable-xhdpi/check_box_repeat_checked_3.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/check_box_repeat_checked_3.png rename to src/main/res/drawable-xhdpi/check_box_repeat_checked_3.png diff --git a/astrid/src/main/res/drawable-xhdpi/check_box_repeat_checked_4.png b/src/main/res/drawable-xhdpi/check_box_repeat_checked_4.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/check_box_repeat_checked_4.png rename to src/main/res/drawable-xhdpi/check_box_repeat_checked_4.png diff --git a/astrid/src/main/res/drawable-xhdpi/dialog_full_holo_light.9.png b/src/main/res/drawable-xhdpi/dialog_full_holo_light.9.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/dialog_full_holo_light.9.png rename to src/main/res/drawable-xhdpi/dialog_full_holo_light.9.png diff --git a/astrid/src/main/res/drawable-xhdpi/drawer_shadow.9.png b/src/main/res/drawable-xhdpi/drawer_shadow.9.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/drawer_shadow.9.png rename to src/main/res/drawable-xhdpi/drawer_shadow.9.png diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_add.png b/src/main/res/drawable-xhdpi/ic_action_add.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/ic_action_add.png rename to src/main/res/drawable-xhdpi/ic_action_add.png diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_add_light.png b/src/main/res/drawable-xhdpi/ic_action_add_light.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/ic_action_add_light.png rename to src/main/res/drawable-xhdpi/ic_action_add_light.png diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_attachment_2.png b/src/main/res/drawable-xhdpi/ic_action_attachment_2.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/ic_action_attachment_2.png rename to src/main/res/drawable-xhdpi/ic_action_attachment_2.png diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_camera.png b/src/main/res/drawable-xhdpi/ic_action_camera.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/ic_action_camera.png rename to src/main/res/drawable-xhdpi/ic_action_camera.png diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_cancel.png b/src/main/res/drawable-xhdpi/ic_action_cancel.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/ic_action_cancel.png rename to src/main/res/drawable-xhdpi/ic_action_cancel.png diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_discard.png b/src/main/res/drawable-xhdpi/ic_action_discard.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/ic_action_discard.png rename to src/main/res/drawable-xhdpi/ic_action_discard.png diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_gear.png b/src/main/res/drawable-xhdpi/ic_action_gear.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/ic_action_gear.png rename to src/main/res/drawable-xhdpi/ic_action_gear.png diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_mic.png b/src/main/res/drawable-xhdpi/ic_action_mic.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/ic_action_mic.png rename to src/main/res/drawable-xhdpi/ic_action_mic.png diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_save.png b/src/main/res/drawable-xhdpi/ic_action_save.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/ic_action_save.png rename to src/main/res/drawable-xhdpi/ic_action_save.png diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_search.png b/src/main/res/drawable-xhdpi/ic_action_search.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/ic_action_search.png rename to src/main/res/drawable-xhdpi/ic_action_search.png diff --git a/astrid/src/main/res/drawable-xhdpi/icon.png b/src/main/res/drawable-xhdpi/icon.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/icon.png rename to src/main/res/drawable-xhdpi/icon.png diff --git a/astrid/src/main/res/drawable-xhdpi/notif_astrid.png b/src/main/res/drawable-xhdpi/notif_astrid.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/notif_astrid.png rename to src/main/res/drawable-xhdpi/notif_astrid.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_addcal.png b/src/main/res/drawable-xhdpi/tea_icn_addcal.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_addcal.png rename to src/main/res/drawable-xhdpi/tea_icn_addcal.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_addcal_gray.png b/src/main/res/drawable-xhdpi/tea_icn_addcal_gray.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_addcal_gray.png rename to src/main/res/drawable-xhdpi/tea_icn_addcal_gray.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_date.png b/src/main/res/drawable-xhdpi/tea_icn_date.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_date.png rename to src/main/res/drawable-xhdpi/tea_icn_date.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_date_gray.png b/src/main/res/drawable-xhdpi/tea_icn_date_gray.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_date_gray.png rename to src/main/res/drawable-xhdpi/tea_icn_date_gray.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_date_red.png b/src/main/res/drawable-xhdpi/tea_icn_date_red.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_date_red.png rename to src/main/res/drawable-xhdpi/tea_icn_date_red.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_edit.png b/src/main/res/drawable-xhdpi/tea_icn_edit.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_edit.png rename to src/main/res/drawable-xhdpi/tea_icn_edit.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_edit_gray.png b/src/main/res/drawable-xhdpi/tea_icn_edit_gray.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_edit_gray.png rename to src/main/res/drawable-xhdpi/tea_icn_edit_gray.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_files.png b/src/main/res/drawable-xhdpi/tea_icn_files.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_files.png rename to src/main/res/drawable-xhdpi/tea_icn_files.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_files_gray.png b/src/main/res/drawable-xhdpi/tea_icn_files_gray.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_files_gray.png rename to src/main/res/drawable-xhdpi/tea_icn_files_gray.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_hide.png b/src/main/res/drawable-xhdpi/tea_icn_hide.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_hide.png rename to src/main/res/drawable-xhdpi/tea_icn_hide.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_hide_gray.png b/src/main/res/drawable-xhdpi/tea_icn_hide_gray.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_hide_gray.png rename to src/main/res/drawable-xhdpi/tea_icn_hide_gray.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_lists.png b/src/main/res/drawable-xhdpi/tea_icn_lists.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_lists.png rename to src/main/res/drawable-xhdpi/tea_icn_lists.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_lists_gray.png b/src/main/res/drawable-xhdpi/tea_icn_lists_gray.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_lists_gray.png rename to src/main/res/drawable-xhdpi/tea_icn_lists_gray.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_priority.png b/src/main/res/drawable-xhdpi/tea_icn_priority.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_priority.png rename to src/main/res/drawable-xhdpi/tea_icn_priority.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_priority_gray.png b/src/main/res/drawable-xhdpi/tea_icn_priority_gray.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_priority_gray.png rename to src/main/res/drawable-xhdpi/tea_icn_priority_gray.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_reminder.png b/src/main/res/drawable-xhdpi/tea_icn_reminder.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_reminder.png rename to src/main/res/drawable-xhdpi/tea_icn_reminder.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_reminder_gray.png b/src/main/res/drawable-xhdpi/tea_icn_reminder_gray.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_reminder_gray.png rename to src/main/res/drawable-xhdpi/tea_icn_reminder_gray.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_repeat.png b/src/main/res/drawable-xhdpi/tea_icn_repeat.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_repeat.png rename to src/main/res/drawable-xhdpi/tea_icn_repeat.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_repeat_gray.png b/src/main/res/drawable-xhdpi/tea_icn_repeat_gray.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_repeat_gray.png rename to src/main/res/drawable-xhdpi/tea_icn_repeat_gray.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_timer.png b/src/main/res/drawable-xhdpi/tea_icn_timer.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_timer.png rename to src/main/res/drawable-xhdpi/tea_icn_timer.png diff --git a/astrid/src/main/res/drawable-xhdpi/tea_icn_timer_gray.png b/src/main/res/drawable-xhdpi/tea_icn_timer_gray.png similarity index 100% rename from astrid/src/main/res/drawable-xhdpi/tea_icn_timer_gray.png rename to src/main/res/drawable-xhdpi/tea_icn_timer_gray.png diff --git a/astrid/src/main/res/drawable-xxhdpi/drawer_shadow.9.png b/src/main/res/drawable-xxhdpi/drawer_shadow.9.png similarity index 100% rename from astrid/src/main/res/drawable-xxhdpi/drawer_shadow.9.png rename to src/main/res/drawable-xxhdpi/drawer_shadow.9.png diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_add.png b/src/main/res/drawable-xxhdpi/ic_action_add.png similarity index 100% rename from astrid/src/main/res/drawable-xxhdpi/ic_action_add.png rename to src/main/res/drawable-xxhdpi/ic_action_add.png diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_add_light.png b/src/main/res/drawable-xxhdpi/ic_action_add_light.png similarity index 100% rename from astrid/src/main/res/drawable-xxhdpi/ic_action_add_light.png rename to src/main/res/drawable-xxhdpi/ic_action_add_light.png diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_attachment_2.png b/src/main/res/drawable-xxhdpi/ic_action_attachment_2.png similarity index 100% rename from astrid/src/main/res/drawable-xxhdpi/ic_action_attachment_2.png rename to src/main/res/drawable-xxhdpi/ic_action_attachment_2.png diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_camera.png b/src/main/res/drawable-xxhdpi/ic_action_camera.png similarity index 100% rename from astrid/src/main/res/drawable-xxhdpi/ic_action_camera.png rename to src/main/res/drawable-xxhdpi/ic_action_camera.png diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_cancel.png b/src/main/res/drawable-xxhdpi/ic_action_cancel.png similarity index 100% rename from astrid/src/main/res/drawable-xxhdpi/ic_action_cancel.png rename to src/main/res/drawable-xxhdpi/ic_action_cancel.png diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_discard.png b/src/main/res/drawable-xxhdpi/ic_action_discard.png similarity index 100% rename from astrid/src/main/res/drawable-xxhdpi/ic_action_discard.png rename to src/main/res/drawable-xxhdpi/ic_action_discard.png diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_gear.png b/src/main/res/drawable-xxhdpi/ic_action_gear.png similarity index 100% rename from astrid/src/main/res/drawable-xxhdpi/ic_action_gear.png rename to src/main/res/drawable-xxhdpi/ic_action_gear.png diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_mic.png b/src/main/res/drawable-xxhdpi/ic_action_mic.png similarity index 100% rename from astrid/src/main/res/drawable-xxhdpi/ic_action_mic.png rename to src/main/res/drawable-xxhdpi/ic_action_mic.png diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_save.png b/src/main/res/drawable-xxhdpi/ic_action_save.png similarity index 100% rename from astrid/src/main/res/drawable-xxhdpi/ic_action_save.png rename to src/main/res/drawable-xxhdpi/ic_action_save.png diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_search.png b/src/main/res/drawable-xxhdpi/ic_action_search.png similarity index 100% rename from astrid/src/main/res/drawable-xxhdpi/ic_action_search.png rename to src/main/res/drawable-xxhdpi/ic_action_search.png diff --git a/astrid/src/main/res/drawable-xxhdpi/icon.png b/src/main/res/drawable-xxhdpi/icon.png similarity index 100% rename from astrid/src/main/res/drawable-xxhdpi/icon.png rename to src/main/res/drawable-xxhdpi/icon.png diff --git a/astrid/src/main/res/drawable-xxhdpi/notif_astrid.png b/src/main/res/drawable-xxhdpi/notif_astrid.png similarity index 100% rename from astrid/src/main/res/drawable-xxhdpi/notif_astrid.png rename to src/main/res/drawable-xxhdpi/notif_astrid.png diff --git a/astrid/src/main/res/drawable/action_attachments.png b/src/main/res/drawable/action_attachments.png similarity index 100% rename from astrid/src/main/res/drawable/action_attachments.png rename to src/main/res/drawable/action_attachments.png diff --git a/astrid/src/main/res/drawable/action_mail.png b/src/main/res/drawable/action_mail.png similarity index 100% rename from astrid/src/main/res/drawable/action_mail.png rename to src/main/res/drawable/action_mail.png diff --git a/astrid/src/main/res/drawable/action_notes.png b/src/main/res/drawable/action_notes.png similarity index 100% rename from astrid/src/main/res/drawable/action_notes.png rename to src/main/res/drawable/action_notes.png diff --git a/astrid/src/main/res/drawable/action_tel.png b/src/main/res/drawable/action_tel.png similarity index 100% rename from astrid/src/main/res/drawable/action_tel.png rename to src/main/res/drawable/action_tel.png diff --git a/astrid/src/main/res/drawable/action_web.png b/src/main/res/drawable/action_web.png similarity index 100% rename from astrid/src/main/res/drawable/action_web.png rename to src/main/res/drawable/action_web.png diff --git a/astrid/src/main/res/drawable/arrow_branch.png b/src/main/res/drawable/arrow_branch.png similarity index 100% rename from astrid/src/main/res/drawable/arrow_branch.png rename to src/main/res/drawable/arrow_branch.png diff --git a/astrid/src/main/res/drawable/arrow_down.png b/src/main/res/drawable/arrow_down.png similarity index 100% rename from astrid/src/main/res/drawable/arrow_down.png rename to src/main/res/drawable/arrow_down.png diff --git a/astrid/src/main/res/drawable/arrow_join.png b/src/main/res/drawable/arrow_join.png similarity index 100% rename from astrid/src/main/res/drawable/arrow_join.png rename to src/main/res/drawable/arrow_join.png diff --git a/astrid/src/main/res/drawable/btn_check.xml b/src/main/res/drawable/btn_check.xml similarity index 100% rename from astrid/src/main/res/drawable/btn_check.xml rename to src/main/res/drawable/btn_check.xml diff --git a/astrid/src/main/res/drawable/btn_check_small.xml b/src/main/res/drawable/btn_check_small.xml similarity index 100% rename from astrid/src/main/res/drawable/btn_check_small.xml rename to src/main/res/drawable/btn_check_small.xml diff --git a/astrid/src/main/res/drawable/btn_dismiss.xml b/src/main/res/drawable/btn_dismiss.xml similarity index 100% rename from astrid/src/main/res/drawable/btn_dismiss.xml rename to src/main/res/drawable/btn_dismiss.xml diff --git a/astrid/src/main/res/drawable/btn_dismiss_normal.png b/src/main/res/drawable/btn_dismiss_normal.png similarity index 100% rename from astrid/src/main/res/drawable/btn_dismiss_normal.png rename to src/main/res/drawable/btn_dismiss_normal.png diff --git a/astrid/src/main/res/drawable/btn_dismiss_pressed.png b/src/main/res/drawable/btn_dismiss_pressed.png similarity index 100% rename from astrid/src/main/res/drawable/btn_dismiss_pressed.png rename to src/main/res/drawable/btn_dismiss_pressed.png diff --git a/astrid/src/main/res/drawable/check_box_1.png b/src/main/res/drawable/check_box_1.png similarity index 100% rename from astrid/src/main/res/drawable/check_box_1.png rename to src/main/res/drawable/check_box_1.png diff --git a/astrid/src/main/res/drawable/check_box_2.png b/src/main/res/drawable/check_box_2.png similarity index 100% rename from astrid/src/main/res/drawable/check_box_2.png rename to src/main/res/drawable/check_box_2.png diff --git a/astrid/src/main/res/drawable/check_box_3.png b/src/main/res/drawable/check_box_3.png similarity index 100% rename from astrid/src/main/res/drawable/check_box_3.png rename to src/main/res/drawable/check_box_3.png diff --git a/astrid/src/main/res/drawable/check_box_4.png b/src/main/res/drawable/check_box_4.png similarity index 100% rename from astrid/src/main/res/drawable/check_box_4.png rename to src/main/res/drawable/check_box_4.png diff --git a/astrid/src/main/res/drawable/check_box_checked_1.png b/src/main/res/drawable/check_box_checked_1.png similarity index 100% rename from astrid/src/main/res/drawable/check_box_checked_1.png rename to src/main/res/drawable/check_box_checked_1.png diff --git a/astrid/src/main/res/drawable/check_box_checked_2.png b/src/main/res/drawable/check_box_checked_2.png similarity index 100% rename from astrid/src/main/res/drawable/check_box_checked_2.png rename to src/main/res/drawable/check_box_checked_2.png diff --git a/astrid/src/main/res/drawable/check_box_checked_3.png b/src/main/res/drawable/check_box_checked_3.png similarity index 100% rename from astrid/src/main/res/drawable/check_box_checked_3.png rename to src/main/res/drawable/check_box_checked_3.png diff --git a/astrid/src/main/res/drawable/check_box_checked_4.png b/src/main/res/drawable/check_box_checked_4.png similarity index 100% rename from astrid/src/main/res/drawable/check_box_checked_4.png rename to src/main/res/drawable/check_box_checked_4.png diff --git a/astrid/src/main/res/drawable/check_box_large_1.png b/src/main/res/drawable/check_box_large_1.png similarity index 100% rename from astrid/src/main/res/drawable/check_box_large_1.png rename to src/main/res/drawable/check_box_large_1.png diff --git a/astrid/src/main/res/drawable/check_box_large_2.png b/src/main/res/drawable/check_box_large_2.png similarity index 100% rename from astrid/src/main/res/drawable/check_box_large_2.png rename to src/main/res/drawable/check_box_large_2.png diff --git a/astrid/src/main/res/drawable/check_box_large_3.png b/src/main/res/drawable/check_box_large_3.png similarity index 100% rename from astrid/src/main/res/drawable/check_box_large_3.png rename to src/main/res/drawable/check_box_large_3.png diff --git a/astrid/src/main/res/drawable/check_box_large_4.png b/src/main/res/drawable/check_box_large_4.png similarity index 100% rename from astrid/src/main/res/drawable/check_box_large_4.png rename to src/main/res/drawable/check_box_large_4.png diff --git a/astrid/src/main/res/drawable/check_box_repeat_1.png b/src/main/res/drawable/check_box_repeat_1.png similarity index 100% rename from astrid/src/main/res/drawable/check_box_repeat_1.png rename to src/main/res/drawable/check_box_repeat_1.png diff --git a/astrid/src/main/res/drawable/check_box_repeat_2.png b/src/main/res/drawable/check_box_repeat_2.png similarity index 100% rename from astrid/src/main/res/drawable/check_box_repeat_2.png rename to src/main/res/drawable/check_box_repeat_2.png diff --git a/astrid/src/main/res/drawable/check_box_repeat_3.png b/src/main/res/drawable/check_box_repeat_3.png similarity index 100% rename from astrid/src/main/res/drawable/check_box_repeat_3.png rename to src/main/res/drawable/check_box_repeat_3.png diff --git a/astrid/src/main/res/drawable/check_box_repeat_4.png b/src/main/res/drawable/check_box_repeat_4.png similarity index 100% rename from astrid/src/main/res/drawable/check_box_repeat_4.png rename to src/main/res/drawable/check_box_repeat_4.png diff --git a/astrid/src/main/res/drawable/check_box_repeat_checked_1.png b/src/main/res/drawable/check_box_repeat_checked_1.png similarity index 100% rename from astrid/src/main/res/drawable/check_box_repeat_checked_1.png rename to src/main/res/drawable/check_box_repeat_checked_1.png diff --git a/astrid/src/main/res/drawable/check_box_repeat_checked_2.png b/src/main/res/drawable/check_box_repeat_checked_2.png similarity index 100% rename from astrid/src/main/res/drawable/check_box_repeat_checked_2.png rename to src/main/res/drawable/check_box_repeat_checked_2.png diff --git a/astrid/src/main/res/drawable/check_box_repeat_checked_3.png b/src/main/res/drawable/check_box_repeat_checked_3.png similarity index 100% rename from astrid/src/main/res/drawable/check_box_repeat_checked_3.png rename to src/main/res/drawable/check_box_repeat_checked_3.png diff --git a/astrid/src/main/res/drawable/check_box_repeat_checked_4.png b/src/main/res/drawable/check_box_repeat_checked_4.png similarity index 100% rename from astrid/src/main/res/drawable/check_box_repeat_checked_4.png rename to src/main/res/drawable/check_box_repeat_checked_4.png diff --git a/astrid/src/main/res/drawable/default_list_0.png b/src/main/res/drawable/default_list_0.png similarity index 100% rename from astrid/src/main/res/drawable/default_list_0.png rename to src/main/res/drawable/default_list_0.png diff --git a/astrid/src/main/res/drawable/default_list_1.png b/src/main/res/drawable/default_list_1.png similarity index 100% rename from astrid/src/main/res/drawable/default_list_1.png rename to src/main/res/drawable/default_list_1.png diff --git a/astrid/src/main/res/drawable/default_list_2.png b/src/main/res/drawable/default_list_2.png similarity index 100% rename from astrid/src/main/res/drawable/default_list_2.png rename to src/main/res/drawable/default_list_2.png diff --git a/astrid/src/main/res/drawable/default_list_3.png b/src/main/res/drawable/default_list_3.png similarity index 100% rename from astrid/src/main/res/drawable/default_list_3.png rename to src/main/res/drawable/default_list_3.png diff --git a/astrid/src/main/res/drawable/dialog_full_holo_light.9.png b/src/main/res/drawable/dialog_full_holo_light.9.png similarity index 100% rename from astrid/src/main/res/drawable/dialog_full_holo_light.9.png rename to src/main/res/drawable/dialog_full_holo_light.9.png diff --git a/astrid/src/main/res/drawable/drawer_shadow.9.png b/src/main/res/drawable/drawer_shadow.9.png similarity index 100% rename from astrid/src/main/res/drawable/drawer_shadow.9.png rename to src/main/res/drawable/drawer_shadow.9.png diff --git a/astrid/src/main/res/drawable/file_type_background.xml b/src/main/res/drawable/file_type_background.xml similarity index 100% rename from astrid/src/main/res/drawable/file_type_background.xml rename to src/main/res/drawable/file_type_background.xml diff --git a/astrid/src/main/res/drawable/filter_row_selector.xml b/src/main/res/drawable/filter_row_selector.xml similarity index 100% rename from astrid/src/main/res/drawable/filter_row_selector.xml rename to src/main/res/drawable/filter_row_selector.xml diff --git a/astrid/src/main/res/drawable/filter_selected_icon.png b/src/main/res/drawable/filter_selected_icon.png similarity index 100% rename from astrid/src/main/res/drawable/filter_selected_icon.png rename to src/main/res/drawable/filter_selected_icon.png diff --git a/astrid/src/main/res/drawable/filter_selected_icon_black.png b/src/main/res/drawable/filter_selected_icon_black.png similarity index 100% rename from astrid/src/main/res/drawable/filter_selected_icon_black.png rename to src/main/res/drawable/filter_selected_icon_black.png diff --git a/astrid/src/main/res/drawable/footer_editbutton.xml b/src/main/res/drawable/footer_editbutton.xml similarity index 100% rename from astrid/src/main/res/drawable/footer_editbutton.xml rename to src/main/res/drawable/footer_editbutton.xml diff --git a/astrid/src/main/res/drawable/footer_editbutton_normal.9.png b/src/main/res/drawable/footer_editbutton_normal.9.png similarity index 100% rename from astrid/src/main/res/drawable/footer_editbutton_normal.9.png rename to src/main/res/drawable/footer_editbutton_normal.9.png diff --git a/astrid/src/main/res/drawable/footer_editbutton_pressed.9.png b/src/main/res/drawable/footer_editbutton_pressed.9.png similarity index 100% rename from astrid/src/main/res/drawable/footer_editbutton_pressed.9.png rename to src/main/res/drawable/footer_editbutton_pressed.9.png diff --git a/astrid/src/main/res/drawable/google.png b/src/main/res/drawable/google.png similarity index 100% rename from astrid/src/main/res/drawable/google.png rename to src/main/res/drawable/google.png diff --git a/astrid/src/main/res/drawable/grabber.png b/src/main/res/drawable/grabber.png similarity index 100% rename from astrid/src/main/res/drawable/grabber.png rename to src/main/res/drawable/grabber.png diff --git a/astrid/src/main/res/drawable/gtasks_icon.png b/src/main/res/drawable/gtasks_icon.png similarity index 100% rename from astrid/src/main/res/drawable/gtasks_icon.png rename to src/main/res/drawable/gtasks_icon.png diff --git a/astrid/src/main/res/drawable/ic_action_add.png b/src/main/res/drawable/ic_action_add.png similarity index 100% rename from astrid/src/main/res/drawable/ic_action_add.png rename to src/main/res/drawable/ic_action_add.png diff --git a/astrid/src/main/res/drawable/ic_action_add_light.png b/src/main/res/drawable/ic_action_add_light.png similarity index 100% rename from astrid/src/main/res/drawable/ic_action_add_light.png rename to src/main/res/drawable/ic_action_add_light.png diff --git a/astrid/src/main/res/drawable/ic_action_attachment_2.png b/src/main/res/drawable/ic_action_attachment_2.png similarity index 100% rename from astrid/src/main/res/drawable/ic_action_attachment_2.png rename to src/main/res/drawable/ic_action_attachment_2.png diff --git a/astrid/src/main/res/drawable/ic_action_camera.png b/src/main/res/drawable/ic_action_camera.png similarity index 100% rename from astrid/src/main/res/drawable/ic_action_camera.png rename to src/main/res/drawable/ic_action_camera.png diff --git a/astrid/src/main/res/drawable/ic_action_cancel.png b/src/main/res/drawable/ic_action_cancel.png similarity index 100% rename from astrid/src/main/res/drawable/ic_action_cancel.png rename to src/main/res/drawable/ic_action_cancel.png diff --git a/astrid/src/main/res/drawable/ic_action_discard.png b/src/main/res/drawable/ic_action_discard.png similarity index 100% rename from astrid/src/main/res/drawable/ic_action_discard.png rename to src/main/res/drawable/ic_action_discard.png diff --git a/astrid/src/main/res/drawable/ic_action_gear.png b/src/main/res/drawable/ic_action_gear.png similarity index 100% rename from astrid/src/main/res/drawable/ic_action_gear.png rename to src/main/res/drawable/ic_action_gear.png diff --git a/astrid/src/main/res/drawable/ic_action_mic.png b/src/main/res/drawable/ic_action_mic.png similarity index 100% rename from astrid/src/main/res/drawable/ic_action_mic.png rename to src/main/res/drawable/ic_action_mic.png diff --git a/astrid/src/main/res/drawable/ic_action_save.png b/src/main/res/drawable/ic_action_save.png similarity index 100% rename from astrid/src/main/res/drawable/ic_action_save.png rename to src/main/res/drawable/ic_action_save.png diff --git a/astrid/src/main/res/drawable/ic_action_search.png b/src/main/res/drawable/ic_action_search.png similarity index 100% rename from astrid/src/main/res/drawable/ic_action_search.png rename to src/main/res/drawable/ic_action_search.png diff --git a/astrid/src/main/res/drawable/ic_menu_close.png b/src/main/res/drawable/ic_menu_close.png similarity index 100% rename from astrid/src/main/res/drawable/ic_menu_close.png rename to src/main/res/drawable/ic_menu_close.png diff --git a/astrid/src/main/res/drawable/icn_arrow_down.png b/src/main/res/drawable/icn_arrow_down.png similarity index 100% rename from astrid/src/main/res/drawable/icn_arrow_down.png rename to src/main/res/drawable/icn_arrow_down.png diff --git a/astrid/src/main/res/drawable/icn_arrow_left.png b/src/main/res/drawable/icn_arrow_left.png similarity index 100% rename from astrid/src/main/res/drawable/icn_arrow_left.png rename to src/main/res/drawable/icn_arrow_left.png diff --git a/astrid/src/main/res/drawable/icn_arrow_right.png b/src/main/res/drawable/icn_arrow_right.png similarity index 100% rename from astrid/src/main/res/drawable/icn_arrow_right.png rename to src/main/res/drawable/icn_arrow_right.png diff --git a/astrid/src/main/res/drawable/icn_arrow_up.png b/src/main/res/drawable/icn_arrow_up.png similarity index 100% rename from astrid/src/main/res/drawable/icn_arrow_up.png rename to src/main/res/drawable/icn_arrow_up.png diff --git a/astrid/src/main/res/drawable/icn_check_off.png b/src/main/res/drawable/icn_check_off.png similarity index 100% rename from astrid/src/main/res/drawable/icn_check_off.png rename to src/main/res/drawable/icn_check_off.png diff --git a/astrid/src/main/res/drawable/icn_check_on.png b/src/main/res/drawable/icn_check_on.png similarity index 100% rename from astrid/src/main/res/drawable/icn_check_on.png rename to src/main/res/drawable/icn_check_on.png diff --git a/astrid/src/main/res/drawable/icn_edit_timer.png b/src/main/res/drawable/icn_edit_timer.png similarity index 100% rename from astrid/src/main/res/drawable/icn_edit_timer.png rename to src/main/res/drawable/icn_edit_timer.png diff --git a/astrid/src/main/res/drawable/icn_timer_stop.png b/src/main/res/drawable/icn_timer_stop.png similarity index 100% rename from astrid/src/main/res/drawable/icn_timer_stop.png rename to src/main/res/drawable/icn_timer_stop.png diff --git a/astrid/src/main/res/drawable/icon.png b/src/main/res/drawable/icon.png similarity index 100% rename from astrid/src/main/res/drawable/icon.png rename to src/main/res/drawable/icon.png diff --git a/astrid/src/main/res/drawable/importance_background_selected.xml b/src/main/res/drawable/importance_background_selected.xml similarity index 100% rename from astrid/src/main/res/drawable/importance_background_selected.xml rename to src/main/res/drawable/importance_background_selected.xml diff --git a/astrid/src/main/res/drawable/none.png b/src/main/res/drawable/none.png similarity index 100% rename from astrid/src/main/res/drawable/none.png rename to src/main/res/drawable/none.png diff --git a/astrid/src/main/res/drawable/notif_astrid.png b/src/main/res/drawable/notif_astrid.png similarity index 100% rename from astrid/src/main/res/drawable/notif_astrid.png rename to src/main/res/drawable/notif_astrid.png diff --git a/astrid/src/main/res/drawable/panel_background.9.png b/src/main/res/drawable/panel_background.9.png similarity index 100% rename from astrid/src/main/res/drawable/panel_background.9.png rename to src/main/res/drawable/panel_background.9.png diff --git a/astrid/src/main/res/drawable/reminder_dialog_background.xml b/src/main/res/drawable/reminder_dialog_background.xml similarity index 100% rename from astrid/src/main/res/drawable/reminder_dialog_background.xml rename to src/main/res/drawable/reminder_dialog_background.xml diff --git a/astrid/src/main/res/drawable/reminder_dialog_inset_background.xml b/src/main/res/drawable/reminder_dialog_inset_background.xml similarity index 100% rename from astrid/src/main/res/drawable/reminder_dialog_inset_background.xml rename to src/main/res/drawable/reminder_dialog_inset_background.xml diff --git a/astrid/src/main/res/drawable/single_gear.png b/src/main/res/drawable/single_gear.png similarity index 100% rename from astrid/src/main/res/drawable/single_gear.png rename to src/main/res/drawable/single_gear.png diff --git a/astrid/src/main/res/drawable/speech_bubble_reminder.9.png b/src/main/res/drawable/speech_bubble_reminder.9.png similarity index 100% rename from astrid/src/main/res/drawable/speech_bubble_reminder.9.png rename to src/main/res/drawable/speech_bubble_reminder.9.png diff --git a/astrid/src/main/res/drawable/tango_alpha.png b/src/main/res/drawable/tango_alpha.png similarity index 100% rename from astrid/src/main/res/drawable/tango_alpha.png rename to src/main/res/drawable/tango_alpha.png diff --git a/astrid/src/main/res/drawable/tango_calendar.png b/src/main/res/drawable/tango_calendar.png similarity index 100% rename from astrid/src/main/res/drawable/tango_calendar.png rename to src/main/res/drawable/tango_calendar.png diff --git a/astrid/src/main/res/drawable/tango_warning.png b/src/main/res/drawable/tango_warning.png similarity index 100% rename from astrid/src/main/res/drawable/tango_warning.png rename to src/main/res/drawable/tango_warning.png diff --git a/astrid/src/main/res/drawable/task_edit_background.xml b/src/main/res/drawable/task_edit_background.xml similarity index 100% rename from astrid/src/main/res/drawable/task_edit_background.xml rename to src/main/res/drawable/task_edit_background.xml diff --git a/astrid/src/main/res/drawable/task_edit_background_transparent_white.xml b/src/main/res/drawable/task_edit_background_transparent_white.xml similarity index 100% rename from astrid/src/main/res/drawable/task_edit_background_transparent_white.xml rename to src/main/res/drawable/task_edit_background_transparent_white.xml diff --git a/astrid/src/main/res/drawable/task_edit_background_white.xml b/src/main/res/drawable/task_edit_background_white.xml similarity index 100% rename from astrid/src/main/res/drawable/task_edit_background_white.xml rename to src/main/res/drawable/task_edit_background_white.xml diff --git a/astrid/src/main/res/drawable/task_row_bg_dark.xml b/src/main/res/drawable/task_row_bg_dark.xml similarity index 100% rename from astrid/src/main/res/drawable/task_row_bg_dark.xml rename to src/main/res/drawable/task_row_bg_dark.xml diff --git a/astrid/src/main/res/drawable/task_row_bg_white.xml b/src/main/res/drawable/task_row_bg_white.xml similarity index 100% rename from astrid/src/main/res/drawable/task_row_bg_white.xml rename to src/main/res/drawable/task_row_bg_white.xml diff --git a/astrid/src/main/res/drawable/tea_icn_addcal.png b/src/main/res/drawable/tea_icn_addcal.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_addcal.png rename to src/main/res/drawable/tea_icn_addcal.png diff --git a/astrid/src/main/res/drawable/tea_icn_addcal_gray.png b/src/main/res/drawable/tea_icn_addcal_gray.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_addcal_gray.png rename to src/main/res/drawable/tea_icn_addcal_gray.png diff --git a/astrid/src/main/res/drawable/tea_icn_date.png b/src/main/res/drawable/tea_icn_date.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_date.png rename to src/main/res/drawable/tea_icn_date.png diff --git a/astrid/src/main/res/drawable/tea_icn_date_gray.png b/src/main/res/drawable/tea_icn_date_gray.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_date_gray.png rename to src/main/res/drawable/tea_icn_date_gray.png diff --git a/astrid/src/main/res/drawable/tea_icn_date_red.png b/src/main/res/drawable/tea_icn_date_red.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_date_red.png rename to src/main/res/drawable/tea_icn_date_red.png diff --git a/astrid/src/main/res/drawable/tea_icn_edit.png b/src/main/res/drawable/tea_icn_edit.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_edit.png rename to src/main/res/drawable/tea_icn_edit.png diff --git a/astrid/src/main/res/drawable/tea_icn_edit_gray.png b/src/main/res/drawable/tea_icn_edit_gray.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_edit_gray.png rename to src/main/res/drawable/tea_icn_edit_gray.png diff --git a/astrid/src/main/res/drawable/tea_icn_files.png b/src/main/res/drawable/tea_icn_files.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_files.png rename to src/main/res/drawable/tea_icn_files.png diff --git a/astrid/src/main/res/drawable/tea_icn_files_gray.png b/src/main/res/drawable/tea_icn_files_gray.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_files_gray.png rename to src/main/res/drawable/tea_icn_files_gray.png diff --git a/astrid/src/main/res/drawable/tea_icn_hide.png b/src/main/res/drawable/tea_icn_hide.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_hide.png rename to src/main/res/drawable/tea_icn_hide.png diff --git a/astrid/src/main/res/drawable/tea_icn_hide_gray.png b/src/main/res/drawable/tea_icn_hide_gray.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_hide_gray.png rename to src/main/res/drawable/tea_icn_hide_gray.png diff --git a/astrid/src/main/res/drawable/tea_icn_lists.png b/src/main/res/drawable/tea_icn_lists.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_lists.png rename to src/main/res/drawable/tea_icn_lists.png diff --git a/astrid/src/main/res/drawable/tea_icn_lists_gray.png b/src/main/res/drawable/tea_icn_lists_gray.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_lists_gray.png rename to src/main/res/drawable/tea_icn_lists_gray.png diff --git a/astrid/src/main/res/drawable/tea_icn_priority.png b/src/main/res/drawable/tea_icn_priority.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_priority.png rename to src/main/res/drawable/tea_icn_priority.png diff --git a/astrid/src/main/res/drawable/tea_icn_priority_gray.png b/src/main/res/drawable/tea_icn_priority_gray.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_priority_gray.png rename to src/main/res/drawable/tea_icn_priority_gray.png diff --git a/astrid/src/main/res/drawable/tea_icn_reminder.png b/src/main/res/drawable/tea_icn_reminder.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_reminder.png rename to src/main/res/drawable/tea_icn_reminder.png diff --git a/astrid/src/main/res/drawable/tea_icn_reminder_gray.png b/src/main/res/drawable/tea_icn_reminder_gray.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_reminder_gray.png rename to src/main/res/drawable/tea_icn_reminder_gray.png diff --git a/astrid/src/main/res/drawable/tea_icn_repeat.png b/src/main/res/drawable/tea_icn_repeat.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_repeat.png rename to src/main/res/drawable/tea_icn_repeat.png diff --git a/astrid/src/main/res/drawable/tea_icn_repeat_gray.png b/src/main/res/drawable/tea_icn_repeat_gray.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_repeat_gray.png rename to src/main/res/drawable/tea_icn_repeat_gray.png diff --git a/astrid/src/main/res/drawable/tea_icn_timer.png b/src/main/res/drawable/tea_icn_timer.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_timer.png rename to src/main/res/drawable/tea_icn_timer.png diff --git a/astrid/src/main/res/drawable/tea_icn_timer_gray.png b/src/main/res/drawable/tea_icn_timer_gray.png similarity index 100% rename from astrid/src/main/res/drawable/tea_icn_timer_gray.png rename to src/main/res/drawable/tea_icn_timer_gray.png diff --git a/astrid/src/main/res/drawable/timepicker_down_btn.xml b/src/main/res/drawable/timepicker_down_btn.xml similarity index 100% rename from astrid/src/main/res/drawable/timepicker_down_btn.xml rename to src/main/res/drawable/timepicker_down_btn.xml diff --git a/astrid/src/main/res/drawable/timepicker_down_disabled.9.png b/src/main/res/drawable/timepicker_down_disabled.9.png similarity index 100% rename from astrid/src/main/res/drawable/timepicker_down_disabled.9.png rename to src/main/res/drawable/timepicker_down_disabled.9.png diff --git a/astrid/src/main/res/drawable/timepicker_down_normal.9.png b/src/main/res/drawable/timepicker_down_normal.9.png similarity index 100% rename from astrid/src/main/res/drawable/timepicker_down_normal.9.png rename to src/main/res/drawable/timepicker_down_normal.9.png diff --git a/astrid/src/main/res/drawable/timepicker_down_pressed.9.png b/src/main/res/drawable/timepicker_down_pressed.9.png similarity index 100% rename from astrid/src/main/res/drawable/timepicker_down_pressed.9.png rename to src/main/res/drawable/timepicker_down_pressed.9.png diff --git a/astrid/src/main/res/drawable/timepicker_down_selected.9.png b/src/main/res/drawable/timepicker_down_selected.9.png similarity index 100% rename from astrid/src/main/res/drawable/timepicker_down_selected.9.png rename to src/main/res/drawable/timepicker_down_selected.9.png diff --git a/astrid/src/main/res/drawable/timepicker_input.xml b/src/main/res/drawable/timepicker_input.xml similarity index 100% rename from astrid/src/main/res/drawable/timepicker_input.xml rename to src/main/res/drawable/timepicker_input.xml diff --git a/astrid/src/main/res/drawable/timepicker_input_disabled.9.png b/src/main/res/drawable/timepicker_input_disabled.9.png similarity index 100% rename from astrid/src/main/res/drawable/timepicker_input_disabled.9.png rename to src/main/res/drawable/timepicker_input_disabled.9.png diff --git a/astrid/src/main/res/drawable/timepicker_input_normal.9.png b/src/main/res/drawable/timepicker_input_normal.9.png similarity index 100% rename from astrid/src/main/res/drawable/timepicker_input_normal.9.png rename to src/main/res/drawable/timepicker_input_normal.9.png diff --git a/astrid/src/main/res/drawable/timepicker_input_pressed.9.png b/src/main/res/drawable/timepicker_input_pressed.9.png similarity index 100% rename from astrid/src/main/res/drawable/timepicker_input_pressed.9.png rename to src/main/res/drawable/timepicker_input_pressed.9.png diff --git a/astrid/src/main/res/drawable/timepicker_input_selected.9.png b/src/main/res/drawable/timepicker_input_selected.9.png similarity index 100% rename from astrid/src/main/res/drawable/timepicker_input_selected.9.png rename to src/main/res/drawable/timepicker_input_selected.9.png diff --git a/astrid/src/main/res/drawable/timepicker_up_btn.xml b/src/main/res/drawable/timepicker_up_btn.xml similarity index 100% rename from astrid/src/main/res/drawable/timepicker_up_btn.xml rename to src/main/res/drawable/timepicker_up_btn.xml diff --git a/astrid/src/main/res/drawable/timepicker_up_disabled.9.png b/src/main/res/drawable/timepicker_up_disabled.9.png similarity index 100% rename from astrid/src/main/res/drawable/timepicker_up_disabled.9.png rename to src/main/res/drawable/timepicker_up_disabled.9.png diff --git a/astrid/src/main/res/drawable/timepicker_up_normal.9.png b/src/main/res/drawable/timepicker_up_normal.9.png similarity index 100% rename from astrid/src/main/res/drawable/timepicker_up_normal.9.png rename to src/main/res/drawable/timepicker_up_normal.9.png diff --git a/astrid/src/main/res/drawable/timepicker_up_pressed.9.png b/src/main/res/drawable/timepicker_up_pressed.9.png similarity index 100% rename from astrid/src/main/res/drawable/timepicker_up_pressed.9.png rename to src/main/res/drawable/timepicker_up_pressed.9.png diff --git a/astrid/src/main/res/drawable/timepicker_up_selected.9.png b/src/main/res/drawable/timepicker_up_selected.9.png similarity index 100% rename from astrid/src/main/res/drawable/timepicker_up_selected.9.png rename to src/main/res/drawable/timepicker_up_selected.9.png diff --git a/astrid/src/main/res/drawable/timers_notification.png b/src/main/res/drawable/timers_notification.png similarity index 100% rename from astrid/src/main/res/drawable/timers_notification.png rename to src/main/res/drawable/timers_notification.png diff --git a/astrid/src/main/res/layout-land/astrid_reminder_view.xml b/src/main/res/layout-land/astrid_reminder_view.xml similarity index 100% rename from astrid/src/main/res/layout-land/astrid_reminder_view.xml rename to src/main/res/layout-land/astrid_reminder_view.xml diff --git a/astrid/src/main/res/layout-land/date_time_picker_no_shortcuts.xml b/src/main/res/layout-land/date_time_picker_no_shortcuts.xml similarity index 100% rename from astrid/src/main/res/layout-land/date_time_picker_no_shortcuts.xml rename to src/main/res/layout-land/date_time_picker_no_shortcuts.xml diff --git a/astrid/src/main/res/layout-w820dp/task_edit_wrapper_activity.xml b/src/main/res/layout-w820dp/task_edit_wrapper_activity.xml similarity index 100% rename from astrid/src/main/res/layout-w820dp/task_edit_wrapper_activity.xml rename to src/main/res/layout-w820dp/task_edit_wrapper_activity.xml diff --git a/astrid/src/main/res/layout-w820dp/task_list_wrapper.xml b/src/main/res/layout-w820dp/task_list_wrapper.xml similarity index 100% rename from astrid/src/main/res/layout-w820dp/task_list_wrapper.xml rename to src/main/res/layout-w820dp/task_list_wrapper.xml diff --git a/astrid/src/main/res/layout/aac_record_activity.xml b/src/main/res/layout/aac_record_activity.xml similarity index 100% rename from astrid/src/main/res/layout/aac_record_activity.xml rename to src/main/res/layout/aac_record_activity.xml diff --git a/astrid/src/main/res/layout/alarm_edit_row.xml b/src/main/res/layout/alarm_edit_row.xml similarity index 100% rename from astrid/src/main/res/layout/alarm_edit_row.xml rename to src/main/res/layout/alarm_edit_row.xml diff --git a/astrid/src/main/res/layout/astrid_calendar_list_creator_view.xml b/src/main/res/layout/astrid_calendar_list_creator_view.xml similarity index 100% rename from astrid/src/main/res/layout/astrid_calendar_list_creator_view.xml rename to src/main/res/layout/astrid_calendar_list_creator_view.xml diff --git a/astrid/src/main/res/layout/astrid_calendar_reminder_view.xml b/src/main/res/layout/astrid_calendar_reminder_view.xml similarity index 100% rename from astrid/src/main/res/layout/astrid_calendar_reminder_view.xml rename to src/main/res/layout/astrid_calendar_reminder_view.xml diff --git a/astrid/src/main/res/layout/astrid_missed_call_view.xml b/src/main/res/layout/astrid_missed_call_view.xml similarity index 100% rename from astrid/src/main/res/layout/astrid_missed_call_view.xml rename to src/main/res/layout/astrid_missed_call_view.xml diff --git a/astrid/src/main/res/layout/astrid_record_audio_view.xml b/src/main/res/layout/astrid_record_audio_view.xml similarity index 100% rename from astrid/src/main/res/layout/astrid_record_audio_view.xml rename to src/main/res/layout/astrid_record_audio_view.xml diff --git a/astrid/src/main/res/layout/astrid_reminder_view.xml b/src/main/res/layout/astrid_reminder_view.xml similarity index 100% rename from astrid/src/main/res/layout/astrid_reminder_view.xml rename to src/main/res/layout/astrid_reminder_view.xml diff --git a/astrid/src/main/res/layout/astrid_reminder_view_portrait.xml b/src/main/res/layout/astrid_reminder_view_portrait.xml similarity index 100% rename from astrid/src/main/res/layout/astrid_reminder_view_portrait.xml rename to src/main/res/layout/astrid_reminder_view_portrait.xml diff --git a/astrid/src/main/res/layout/astrid_speech_bubble.xml b/src/main/res/layout/astrid_speech_bubble.xml similarity index 100% rename from astrid/src/main/res/layout/astrid_speech_bubble.xml rename to src/main/res/layout/astrid_speech_bubble.xml diff --git a/astrid/src/main/res/layout/astrid_time_picker_horizontal.xml b/src/main/res/layout/astrid_time_picker_horizontal.xml similarity index 100% rename from astrid/src/main/res/layout/astrid_time_picker_horizontal.xml rename to src/main/res/layout/astrid_time_picker_horizontal.xml diff --git a/astrid/src/main/res/layout/beast_mode_pref_activity.xml b/src/main/res/layout/beast_mode_pref_activity.xml similarity index 100% rename from astrid/src/main/res/layout/beast_mode_pref_activity.xml rename to src/main/res/layout/beast_mode_pref_activity.xml diff --git a/astrid/src/main/res/layout/calendar_alarm_list_creator.xml b/src/main/res/layout/calendar_alarm_list_creator.xml similarity index 100% rename from astrid/src/main/res/layout/calendar_alarm_list_creator.xml rename to src/main/res/layout/calendar_alarm_list_creator.xml diff --git a/astrid/src/main/res/layout/calendar_reminder_activity.xml b/src/main/res/layout/calendar_reminder_activity.xml similarity index 100% rename from astrid/src/main/res/layout/calendar_reminder_activity.xml rename to src/main/res/layout/calendar_reminder_activity.xml diff --git a/astrid/src/main/res/layout/control_dialog_ok.xml b/src/main/res/layout/control_dialog_ok.xml similarity index 100% rename from astrid/src/main/res/layout/control_dialog_ok.xml rename to src/main/res/layout/control_dialog_ok.xml diff --git a/astrid/src/main/res/layout/control_set_alarms.xml b/src/main/res/layout/control_set_alarms.xml similarity index 100% rename from astrid/src/main/res/layout/control_set_alarms.xml rename to src/main/res/layout/control_set_alarms.xml diff --git a/astrid/src/main/res/layout/control_set_deadline.xml b/src/main/res/layout/control_set_deadline.xml similarity index 100% rename from astrid/src/main/res/layout/control_set_deadline.xml rename to src/main/res/layout/control_set_deadline.xml diff --git a/astrid/src/main/res/layout/control_set_deadline_display.xml b/src/main/res/layout/control_set_deadline_display.xml similarity index 100% rename from astrid/src/main/res/layout/control_set_deadline_display.xml rename to src/main/res/layout/control_set_deadline_display.xml diff --git a/astrid/src/main/res/layout/control_set_default_display.xml b/src/main/res/layout/control_set_default_display.xml similarity index 100% rename from astrid/src/main/res/layout/control_set_default_display.xml rename to src/main/res/layout/control_set_default_display.xml diff --git a/astrid/src/main/res/layout/control_set_files.xml b/src/main/res/layout/control_set_files.xml similarity index 100% rename from astrid/src/main/res/layout/control_set_files.xml rename to src/main/res/layout/control_set_files.xml diff --git a/astrid/src/main/res/layout/control_set_files_display.xml b/src/main/res/layout/control_set_files_display.xml similarity index 100% rename from astrid/src/main/res/layout/control_set_files_display.xml rename to src/main/res/layout/control_set_files_display.xml diff --git a/astrid/src/main/res/layout/control_set_gcal.xml b/src/main/res/layout/control_set_gcal.xml similarity index 100% rename from astrid/src/main/res/layout/control_set_gcal.xml rename to src/main/res/layout/control_set_gcal.xml diff --git a/astrid/src/main/res/layout/control_set_gcal_display.xml b/src/main/res/layout/control_set_gcal_display.xml similarity index 100% rename from astrid/src/main/res/layout/control_set_gcal_display.xml rename to src/main/res/layout/control_set_gcal_display.xml diff --git a/astrid/src/main/res/layout/control_set_hide.xml b/src/main/res/layout/control_set_hide.xml similarity index 100% rename from astrid/src/main/res/layout/control_set_hide.xml rename to src/main/res/layout/control_set_hide.xml diff --git a/astrid/src/main/res/layout/control_set_importance.xml b/src/main/res/layout/control_set_importance.xml similarity index 100% rename from astrid/src/main/res/layout/control_set_importance.xml rename to src/main/res/layout/control_set_importance.xml diff --git a/astrid/src/main/res/layout/control_set_notes.xml b/src/main/res/layout/control_set_notes.xml similarity index 100% rename from astrid/src/main/res/layout/control_set_notes.xml rename to src/main/res/layout/control_set_notes.xml diff --git a/astrid/src/main/res/layout/control_set_notes_display.xml b/src/main/res/layout/control_set_notes_display.xml similarity index 100% rename from astrid/src/main/res/layout/control_set_notes_display.xml rename to src/main/res/layout/control_set_notes_display.xml diff --git a/astrid/src/main/res/layout/control_set_reminders.xml b/src/main/res/layout/control_set_reminders.xml similarity index 100% rename from astrid/src/main/res/layout/control_set_reminders.xml rename to src/main/res/layout/control_set_reminders.xml diff --git a/astrid/src/main/res/layout/control_set_repeat.xml b/src/main/res/layout/control_set_repeat.xml similarity index 100% rename from astrid/src/main/res/layout/control_set_repeat.xml rename to src/main/res/layout/control_set_repeat.xml diff --git a/astrid/src/main/res/layout/control_set_repeat_display.xml b/src/main/res/layout/control_set_repeat_display.xml similarity index 100% rename from astrid/src/main/res/layout/control_set_repeat_display.xml rename to src/main/res/layout/control_set_repeat_display.xml diff --git a/astrid/src/main/res/layout/control_set_tags.xml b/src/main/res/layout/control_set_tags.xml similarity index 100% rename from astrid/src/main/res/layout/control_set_tags.xml rename to src/main/res/layout/control_set_tags.xml diff --git a/astrid/src/main/res/layout/control_set_timers.xml b/src/main/res/layout/control_set_timers.xml similarity index 100% rename from astrid/src/main/res/layout/control_set_timers.xml rename to src/main/res/layout/control_set_timers.xml diff --git a/astrid/src/main/res/layout/control_set_title.xml b/src/main/res/layout/control_set_title.xml similarity index 100% rename from astrid/src/main/res/layout/control_set_title.xml rename to src/main/res/layout/control_set_title.xml diff --git a/astrid/src/main/res/layout/custom_filter_activity.xml b/src/main/res/layout/custom_filter_activity.xml similarity index 100% rename from astrid/src/main/res/layout/custom_filter_activity.xml rename to src/main/res/layout/custom_filter_activity.xml diff --git a/astrid/src/main/res/layout/custom_filter_row.xml b/src/main/res/layout/custom_filter_row.xml similarity index 100% rename from astrid/src/main/res/layout/custom_filter_row.xml rename to src/main/res/layout/custom_filter_row.xml diff --git a/astrid/src/main/res/layout/date_time_dialog.xml b/src/main/res/layout/date_time_dialog.xml similarity index 100% rename from astrid/src/main/res/layout/date_time_dialog.xml rename to src/main/res/layout/date_time_dialog.xml diff --git a/astrid/src/main/res/layout/date_time_picker_no_shortcuts.xml b/src/main/res/layout/date_time_picker_no_shortcuts.xml similarity index 100% rename from astrid/src/main/res/layout/date_time_picker_no_shortcuts.xml rename to src/main/res/layout/date_time_picker_no_shortcuts.xml diff --git a/astrid/src/main/res/layout/deadline_number_picker.xml b/src/main/res/layout/deadline_number_picker.xml similarity index 100% rename from astrid/src/main/res/layout/deadline_number_picker.xml rename to src/main/res/layout/deadline_number_picker.xml diff --git a/astrid/src/main/res/layout/file_display_row.xml b/src/main/res/layout/file_display_row.xml similarity index 100% rename from astrid/src/main/res/layout/file_display_row.xml rename to src/main/res/layout/file_display_row.xml diff --git a/astrid/src/main/res/layout/file_row.xml b/src/main/res/layout/file_row.xml similarity index 100% rename from astrid/src/main/res/layout/file_row.xml rename to src/main/res/layout/file_row.xml diff --git a/astrid/src/main/res/layout/filter_adapter_row.xml b/src/main/res/layout/filter_adapter_row.xml similarity index 100% rename from astrid/src/main/res/layout/filter_adapter_row.xml rename to src/main/res/layout/filter_adapter_row.xml diff --git a/astrid/src/main/res/layout/fragment_navigation_drawer.xml b/src/main/res/layout/fragment_navigation_drawer.xml similarity index 100% rename from astrid/src/main/res/layout/fragment_navigation_drawer.xml rename to src/main/res/layout/fragment_navigation_drawer.xml diff --git a/astrid/src/main/res/layout/gtasks_login_activity.xml b/src/main/res/layout/gtasks_login_activity.xml similarity index 100% rename from astrid/src/main/res/layout/gtasks_login_activity.xml rename to src/main/res/layout/gtasks_login_activity.xml diff --git a/astrid/src/main/res/layout/missed_call_activity.xml b/src/main/res/layout/missed_call_activity.xml similarity index 100% rename from astrid/src/main/res/layout/missed_call_activity.xml rename to src/main/res/layout/missed_call_activity.xml diff --git a/astrid/src/main/res/layout/n_number_picker_dialog.xml b/src/main/res/layout/n_number_picker_dialog.xml similarity index 100% rename from astrid/src/main/res/layout/n_number_picker_dialog.xml rename to src/main/res/layout/n_number_picker_dialog.xml diff --git a/astrid/src/main/res/layout/notes_view_dialog.xml b/src/main/res/layout/notes_view_dialog.xml similarity index 100% rename from astrid/src/main/res/layout/notes_view_dialog.xml rename to src/main/res/layout/notes_view_dialog.xml diff --git a/astrid/src/main/res/layout/number_picker.xml b/src/main/res/layout/number_picker.xml similarity index 100% rename from astrid/src/main/res/layout/number_picker.xml rename to src/main/res/layout/number_picker.xml diff --git a/astrid/src/main/res/layout/number_picker_dialog.xml b/src/main/res/layout/number_picker_dialog.xml similarity index 100% rename from astrid/src/main/res/layout/number_picker_dialog.xml rename to src/main/res/layout/number_picker_dialog.xml diff --git a/astrid/src/main/res/layout/preference_draggable_row.xml b/src/main/res/layout/preference_draggable_row.xml similarity index 100% rename from astrid/src/main/res/layout/preference_draggable_row.xml rename to src/main/res/layout/preference_draggable_row.xml diff --git a/astrid/src/main/res/layout/repeat_until_dialog.xml b/src/main/res/layout/repeat_until_dialog.xml similarity index 100% rename from astrid/src/main/res/layout/repeat_until_dialog.xml rename to src/main/res/layout/repeat_until_dialog.xml diff --git a/astrid/src/main/res/layout/scrollable_widget_dark.xml b/src/main/res/layout/scrollable_widget_dark.xml similarity index 100% rename from astrid/src/main/res/layout/scrollable_widget_dark.xml rename to src/main/res/layout/scrollable_widget_dark.xml diff --git a/astrid/src/main/res/layout/scrollable_widget_light.xml b/src/main/res/layout/scrollable_widget_light.xml similarity index 100% rename from astrid/src/main/res/layout/scrollable_widget_light.xml rename to src/main/res/layout/scrollable_widget_light.xml diff --git a/astrid/src/main/res/layout/simple_list_item_multiple_choice_themed.xml b/src/main/res/layout/simple_list_item_multiple_choice_themed.xml similarity index 100% rename from astrid/src/main/res/layout/simple_list_item_multiple_choice_themed.xml rename to src/main/res/layout/simple_list_item_multiple_choice_themed.xml diff --git a/astrid/src/main/res/layout/snooze_dialog.xml b/src/main/res/layout/snooze_dialog.xml similarity index 100% rename from astrid/src/main/res/layout/snooze_dialog.xml rename to src/main/res/layout/snooze_dialog.xml diff --git a/astrid/src/main/res/layout/sort_selection_dialog.xml b/src/main/res/layout/sort_selection_dialog.xml similarity index 100% rename from astrid/src/main/res/layout/sort_selection_dialog.xml rename to src/main/res/layout/sort_selection_dialog.xml diff --git a/api/src/main/res/layout/status_preference.xml b/src/main/res/layout/status_preference.xml similarity index 100% rename from api/src/main/res/layout/status_preference.xml rename to src/main/res/layout/status_preference.xml diff --git a/astrid/src/main/res/layout/tag_edit_row.xml b/src/main/res/layout/tag_edit_row.xml similarity index 100% rename from astrid/src/main/res/layout/tag_edit_row.xml rename to src/main/res/layout/tag_edit_row.xml diff --git a/astrid/src/main/res/layout/tag_settings_activity.xml b/src/main/res/layout/tag_settings_activity.xml similarity index 100% rename from astrid/src/main/res/layout/tag_settings_activity.xml rename to src/main/res/layout/tag_settings_activity.xml diff --git a/astrid/src/main/res/layout/task_adapter_row_simple.xml b/src/main/res/layout/task_adapter_row_simple.xml similarity index 100% rename from astrid/src/main/res/layout/task_adapter_row_simple.xml rename to src/main/res/layout/task_adapter_row_simple.xml diff --git a/astrid/src/main/res/layout/task_edit_activity.xml b/src/main/res/layout/task_edit_activity.xml similarity index 100% rename from astrid/src/main/res/layout/task_edit_activity.xml rename to src/main/res/layout/task_edit_activity.xml diff --git a/astrid/src/main/res/layout/task_edit_when_controls.xml b/src/main/res/layout/task_edit_when_controls.xml similarity index 100% rename from astrid/src/main/res/layout/task_edit_when_controls.xml rename to src/main/res/layout/task_edit_when_controls.xml diff --git a/astrid/src/main/res/layout/task_edit_wrapper_activity.xml b/src/main/res/layout/task_edit_wrapper_activity.xml similarity index 100% rename from astrid/src/main/res/layout/task_edit_wrapper_activity.xml rename to src/main/res/layout/task_edit_wrapper_activity.xml diff --git a/astrid/src/main/res/layout/task_list_activity.xml b/src/main/res/layout/task_list_activity.xml similarity index 100% rename from astrid/src/main/res/layout/task_list_activity.xml rename to src/main/res/layout/task_list_activity.xml diff --git a/astrid/src/main/res/layout/task_list_body_standard.xml b/src/main/res/layout/task_list_body_standard.xml similarity index 100% rename from astrid/src/main/res/layout/task_list_body_standard.xml rename to src/main/res/layout/task_list_body_standard.xml diff --git a/astrid/src/main/res/layout/task_list_body_subtasks.xml b/src/main/res/layout/task_list_body_subtasks.xml similarity index 100% rename from astrid/src/main/res/layout/task_list_body_subtasks.xml rename to src/main/res/layout/task_list_body_subtasks.xml diff --git a/astrid/src/main/res/layout/task_list_swipe_layout_empty.xml b/src/main/res/layout/task_list_swipe_layout_empty.xml similarity index 100% rename from astrid/src/main/res/layout/task_list_swipe_layout_empty.xml rename to src/main/res/layout/task_list_swipe_layout_empty.xml diff --git a/astrid/src/main/res/layout/task_list_wrapper.xml b/src/main/res/layout/task_list_wrapper.xml similarity index 100% rename from astrid/src/main/res/layout/task_list_wrapper.xml rename to src/main/res/layout/task_list_wrapper.xml diff --git a/astrid/src/main/res/layout/toolbar.xml b/src/main/res/layout/toolbar.xml similarity index 100% rename from astrid/src/main/res/layout/toolbar.xml rename to src/main/res/layout/toolbar.xml diff --git a/astrid/src/main/res/layout/update_adapter_row.xml b/src/main/res/layout/update_adapter_row.xml similarity index 100% rename from astrid/src/main/res/layout/update_adapter_row.xml rename to src/main/res/layout/update_adapter_row.xml diff --git a/astrid/src/main/res/layout/widget_config_activity.xml b/src/main/res/layout/widget_config_activity.xml similarity index 100% rename from astrid/src/main/res/layout/widget_config_activity.xml rename to src/main/res/layout/widget_config_activity.xml diff --git a/astrid/src/main/res/layout/widget_initialized.xml b/src/main/res/layout/widget_initialized.xml similarity index 100% rename from astrid/src/main/res/layout/widget_initialized.xml rename to src/main/res/layout/widget_initialized.xml diff --git a/astrid/src/main/res/layout/widget_initialized_dark.xml b/src/main/res/layout/widget_initialized_dark.xml similarity index 100% rename from astrid/src/main/res/layout/widget_initialized_dark.xml rename to src/main/res/layout/widget_initialized_dark.xml diff --git a/astrid/src/main/res/layout/widget_loading.xml b/src/main/res/layout/widget_loading.xml similarity index 100% rename from astrid/src/main/res/layout/widget_loading.xml rename to src/main/res/layout/widget_loading.xml diff --git a/astrid/src/main/res/layout/widget_row.xml b/src/main/res/layout/widget_row.xml similarity index 100% rename from astrid/src/main/res/layout/widget_row.xml rename to src/main/res/layout/widget_row.xml diff --git a/astrid/src/main/res/layout/widget_separator.xml b/src/main/res/layout/widget_separator.xml similarity index 100% rename from astrid/src/main/res/layout/widget_separator.xml rename to src/main/res/layout/widget_separator.xml diff --git a/astrid/src/main/res/menu/tag_settings_activity.xml b/src/main/res/menu/tag_settings_activity.xml similarity index 100% rename from astrid/src/main/res/menu/tag_settings_activity.xml rename to src/main/res/menu/tag_settings_activity.xml diff --git a/astrid/src/main/res/menu/task_edit_fragment.xml b/src/main/res/menu/task_edit_fragment.xml similarity index 100% rename from astrid/src/main/res/menu/task_edit_fragment.xml rename to src/main/res/menu/task_edit_fragment.xml diff --git a/astrid/src/main/res/menu/task_list_activity.xml b/src/main/res/menu/task_list_activity.xml similarity index 100% rename from astrid/src/main/res/menu/task_list_activity.xml rename to src/main/res/menu/task_list_activity.xml diff --git a/astrid/src/main/res/raw/gestures b/src/main/res/raw/gestures similarity index 100% rename from astrid/src/main/res/raw/gestures rename to src/main/res/raw/gestures diff --git a/astrid/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml similarity index 68% rename from astrid/src/main/res/values-ar/strings.xml rename to src/main/res/values-ar/strings.xml index 43d9fefcf..2c11200d9 100644 --- a/astrid/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -82,4 +82,39 @@ مؤقت حذف المهمة + اليوم + غدا + أمس + غدا + أمس + أكّد + سؤال: + معلومة + إغلاق + إنتظر من فضلك... + تحيين و نسخ احتياطي + الحالة + الحالة: %s + لم يتم تسجيل الدخول + جاري التحيين... + آخر تحيين:\n%s + فشل في: %s + فشل مع أخطاء في: %s + لم يتم التحيين قَطّ + الخيارات + تحيين في الخلفية + إرسال تقرير + خروج + + تعطيل + كل 15 دقيقة + every thirty minutes + every hour + every three hours + every six hours + كل 12 ساعة + every day + every three days + every week + \ No newline at end of file diff --git a/astrid/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml similarity index 89% rename from astrid/src/main/res/values-bg-rBG/strings.xml rename to src/main/res/values-bg-rBG/strings.xml index 8c814537d..8f2a080bf 100644 --- a/astrid/src/main/res/values-bg-rBG/strings.xml +++ b/src/main/res/values-bg-rBG/strings.xml @@ -348,4 +348,50 @@ Изтрий задача Добавена задача Не може да достъпвате до външната памет + + 1 задача + %d задачи + + Днес + Утре + Вчера + Утре + Вчера + Потвърждавате? + Въпрос: + Информация + Затвори + Ами сега, изглежда е станала грешка! Ето какво се случи:\n\n%s + Моля, изчакайте... + Синхронизиране и Резервни копия + Състояние + Състояние: %s + Синхронизирането продължава ... + Последна синхронизация:\n%s + Грешка при: %s + Никога не е синхронизиран! + Опции + Синхронзиране във фонов режим + Синхронизация във фонов режим е изключена + В момента е зададено на: %s + Синхронизирай сега + Кликнете, за да изпрати доклад до екипа на Tasks + Изпрати отчет + Излизане + Изчистване на всички данни от синхронзация + Изход/изчистване на данните от синхронизация? + Възникна проблем при свързване към мрежата +при последна синхронизация с %s. Моля, опитайте отново по-късно. + + изключено + на всеки 15 минути + на всеки 30 минути + на всеки час + на всеки три часа + на всеки шест часа + на всеки дванадесет часа + всеки ден + на всеки три дена + всяка седмица + \ No newline at end of file diff --git a/astrid/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml similarity index 90% rename from astrid/src/main/res/values-ca/strings.xml rename to src/main/res/values-ca/strings.xml index f13728ae5..7b2a5dacb 100644 --- a/astrid/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -290,4 +290,41 @@ finalització d\'aquesta tasca: Eliminar tasca Assistència + + 1 tasca + %d tasques + + Avui + Demà + Ahir + Confirmar? + Pregunta: + Informació + Tancar + ¡Ui, sembla que hi ha hagut un problema! Això es el que ha passat:\n\n%s + Si us plau, espera... + Estat + Sincronització en curs... + Última sincronització:\n%s + Fallida el: %s + Mai sincronitzat! + Opcions + Sincronitzar en segon pla + Desactivada la sincronització en segon pla + Actualment configurat en: %s + Surt + Esborra tota la informació de sincronització + Tancar sessió / esborra la informació de sincronització? + + desactivat + cada quince minuts + cada trenta minuts + cada hora + cada tres hores + cada sis hores + cada dotze hores + diàriament + cada tres dies + setmanalment + \ No newline at end of file diff --git a/astrid/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml similarity index 91% rename from astrid/src/main/res/values-cs/strings.xml rename to src/main/res/values-cs/strings.xml index 6744435d4..ac105850a 100644 --- a/astrid/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -490,4 +490,53 @@ Podpora Přidán úkol Není přístup k externí databázi + + 1 úkol + %d úkolů + + Dnes + Zítra + Včera + Zítra + Včera + Potvrdit? + Otázka: + Informace + Zavřít + Jejda, vypadá to, že se vyskytla chyba! Tady je co se stalo:\n\n%s + Čekejte prosím... + Synchronizace + Google Tasks, uložená data, lokální záloha + Stav + Stav: %s + Nepřihlášen + Probíhá synchronizace... + Poslední synchronizace:\n%s + Selhalo: %s + Sync w/ chyby: %s + Nikdo nesynchronizováno! + Možnosti + Synchronizace na pozadí + Synchronizace na pozadí je zakázána + Současně nastaveno na: %s + Synchronizovat nyní + Stavové hlášení + Klepnutím odešlete zprávu týmu Tasks + Odeslat zprávu + Odhlásit se + Smazat všechny synchronizační data + Odhlásit se / vymazat synchronizační data? + Během posledního pokusu o synchronizaci se službou %s nastal problém s připojením k síti. Zkuste to prosím později. + + zakázat + každých patnáct minut + každých třicet minut + každou hodinu + každé tři hodiny + každých šest hodin + každých dvanáct hodin + každý den + každé tři dny + každý týden + \ No newline at end of file diff --git a/astrid/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml similarity index 91% rename from astrid/src/main/res/values-da/strings.xml rename to src/main/res/values-da/strings.xml index b1363b203..29934b52e 100644 --- a/astrid/src/main/res/values-da/strings.xml +++ b/src/main/res/values-da/strings.xml @@ -248,4 +248,33 @@ Omdøbte %1$s med %2$s for %3$d opgaver Indstillinger for lister Slet opgave + + 1 opgave + %d opgaver + + I dag + I morgen + I går + Bekræft? + Spørsmål: + Luk + Vent venligst... + Synkronisering + Indstillinger + Baggrunds Synk + Baggrunds synkronisering er slået fra + Log af + Sletter al synkroniserings data + + disable + every fifteen minutes + every thirty minutes + hver time + hver 3. time + hver 6. time + hver 12. time + hver dag + hver 3. dag + hver uge + \ No newline at end of file diff --git a/astrid/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml similarity index 92% rename from astrid/src/main/res/values-de/strings.xml rename to src/main/res/values-de/strings.xml index 391eca7cc..8eaf0e261 100644 --- a/astrid/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -496,4 +496,50 @@ Unterstützung Hinzugefügte Aufgabe Kein Zugriff auf externen Speicher + + 1 Aufgabe + %d Aufgaben + + Heute + Morgen + Gestern + Morg. + Gest. + Bestätigen? + Frage: + Schließen + Ups, sieht aus, als ob ein Fehler aufgetreten ist! Folgendes ist passiert:\n\n%s + Bitte warten... + Synchronisation & Backup + Google Tasks, Gespeicherte Daten, Lokale Backups + Nicht angemeldet + Synchronisierung läuft... + Letzte Synchronisierung:\n%s + Fehlgeschlagen am: %s + Synchronisation m. Fehler: %s + Noch nie synchronisiert! + Optionen + Hintergrund-Synchronisierung + Hintergrund-Synchronisierung ist deaktiviert + Gesetzt auf: %s + Jetzt synchronisieren + Statusbericht + Klicke um einen Bericht ans Tasks-Team zu senden + Bericht senden + Abmelden + Alle Synchronisationsdaten löschen + Ausloggen / Synchronisierte Daten löschen? + Es gab ein Problem mit der Netzwerkverbindung während der letzten Synchronisation mit %s. Versuche es bitte später noch einmal. + + deaktivieren + alle 15 Minuten + alle 30 Minuten + stündlich + alle 3 Stunden + alle 6 Stunden + alle 12 Stunden + täglich + jeden dritten Tag + wöchentlich + \ No newline at end of file diff --git a/astrid/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml similarity index 98% rename from astrid/src/main/res/values-el/strings.xml rename to src/main/res/values-el/strings.xml index f503c7a00..df2be7c7a 100644 --- a/astrid/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -363,4 +363,9 @@ Καθήκοντα Widget σκοτεινού θέματος Διαγραφή καθήκοντος + Σήμερα + Αύριο + Χθές + Κατάσταση + Ρυθμίσεις \ No newline at end of file diff --git a/astrid/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml similarity index 92% rename from astrid/src/main/res/values-es/strings.xml rename to src/main/res/values-es/strings.xml index 512be8c1e..ed1267bb5 100644 --- a/astrid/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -505,4 +505,53 @@ Tasks podría no avisarle cuanto venza una tarea.\n Soporte Tarea agregada Almacenamiento externo inaccesible + + 1 tarea + %d tareas + + Hoy + Mañana + Ayer + Mñna + Ayer + ¿Confirmar? + Pregunta: + Información + Cerrar + ¡Uy, parece que ocurró un error! Esto es lo que pasó:\n\n%s + Por favor, espere... + Sincronización y copia de seguridad + Google Tasks, información guardada, copia de seguridad local + Estado + Estado: %s + Sesión no iniciada + Sincronización en marcha + Ultima sincronización:\n%s + Falló en: %s + Sincronización con errores: %s + ¡Nunca sincronizado! + Opciones + Sincronización en segundo plano + Sincronización en segundo plano deshabilitada + Actualmente configurado a: %s + Sincronizar ahora + Informe de estado + Click para enviar un informe al equipo de Tasks + Enviar informe + Cerrar sesión + Limpia todos los datos de la sincronización + Cerrar sesión/Limpiar datos de sincronización? + Ha ocurrido un problema conectando a la red durante la última sincronización con %s. Por favor inténtelo nuevamente después. + + deshabilitar + cada quince minutos + cada treinta minutos + cada hora + cada tres horas + cada seis horas + cada doce horas + cada día + cada tres días + cada semana + \ No newline at end of file diff --git a/astrid/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml similarity index 100% rename from astrid/src/main/res/values-fi/strings.xml rename to src/main/res/values-fi/strings.xml diff --git a/astrid/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml similarity index 92% rename from astrid/src/main/res/values-fr/strings.xml rename to src/main/res/values-fr/strings.xml index 4a4c4c463..c8997edac 100644 --- a/astrid/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -499,4 +499,52 @@ Assistance Tâche ajoutée Impossible d\'accéder au stockage externe + + 1 tâche + %d tâches + + Aujourd\'hui + Demain + Hier + Demain + Hier + Confirmer ? + Question : + Informations + Fermer + Oups, une erreur est survenue ! Voici ce qu\'il s\'est passé :\n\n%s + Veuillez patienter... + Synchronisation + Tâches Google, données enregistrées, sauvegarde locale + Statut + État : %s + Non connecté + Synchronisation en cours... + Dernière synchro. :\n%s + Échec sur : %s + Synchro avec Erreurs: %s + Jamais synchronisé ! + Synchro. en arrière-plan + Synchronisation en arrière-plan désactivée + Actuellement configuré sur : %s + Synchroniser maintenant + Rapport d\'état + Cliquez pour envoyer un rapport à l\'équipe Tasks + Envoyer le rapport + Se déconnecter + Purger toutes les données de synchronisation + Se déconnecter/purger les données de synchronisation ? + Un problème de connexion réseau est survenu lors de la dernière synchronisation avec %s. Merci de réessayer plus tard. + + désactiver + toutes les quinze minutes + toutes les trente minutes + toutes les heures + toutes les trois heures + toutes les six heures + toutes les douze heures + tous les jours + tous les trois jours + toutes les semaines + \ No newline at end of file diff --git a/astrid/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml similarity index 91% rename from astrid/src/main/res/values-it/strings.xml rename to src/main/res/values-it/strings.xml index a4e852ee7..55fad41f8 100644 --- a/astrid/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -444,4 +444,52 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat Tasks pronuncerà il nome dell\'attività durante i promemoria Tasks emetterà una suoneria durante i promemoria Supporto + + 1 attività + %d attività + + Oggi + Domani + Ieri + Domani + Ieri + Confermi? + Domanda: + Informazione + Chiudi + Oops, sembra che ci sia stato un errore! E\' successo questo:\n\n%s + Attendi... + Sincronizza & archivia + Attività Google, dati salvati, backup locale + Stato + Stato: %s + Non connesso + Sincronizzazione in corso... + Ultima Sincronizzazione:\n%s + Fallita Su: %s + Sincronizza con gli errori: %s + Mai sincronizzato! + Preferenze + Sincronizzazione eseguita in background + La sincronizzazione in background è disattivata + Attualmente impostata su: %s + Sincronizza ora + \"Clicca per inviare un rapporto al team Tasks\" + Invia rapporto + Esci + Cancella tutti i dati di sincronizzazione + Esci / cancella i file di sincronizzazione? + Problema di connessione alla rete durante l\'ultima sincronizzazione con %s. Riprova dopo. + + disabilita + ogni quindici minuti + ogni trenta minuti + ogni ora + ogni tre ore + ogni sei ore + ogni dodici ore + ogni giorno + ogni tre giorni + Ogni settimana + \ No newline at end of file diff --git a/astrid/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml similarity index 92% rename from astrid/src/main/res/values-iw/strings.xml rename to src/main/res/values-iw/strings.xml index 59658699b..93c83e301 100644 --- a/astrid/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -497,4 +497,53 @@ משימות מחק משימה תמיכה + + משימה אחת + %d משימות + + היום + מחר + אתמול + מחר + אתמול + האם לאשר? + שאלה: + פרטים + סגור + אוּפְּס, נראה שארעה שגיאה! הנה מה שקה:\n\n%s + אנא המתן... + סינכרון וגיבוי + אתר אסטריד, ״משימות גוגל״, מידע שמור, גיבוי מקומי + מצב + מצב: %s + לא מחובר + הסינכרון מתבצע + סנכרון אחרון:\n%s + נכשל ב: %s + סנכרון עם שגיאות: %s + לעולם לא סונכרן! + אפשרויות + סנכרון ברקע + סנכרון ברקע אינו מופעל + כרגע מוגדר ל: %s + מסנכרן כעת + דו\"ח מצב + הקלק כדי לשלוח דוח לצוות של אסטריד + שלח דו\"ח + התנתק + מסיר את כל נתוני הסנכרון + צא מהחשבון \\ הסר נתוני סנכרון? + נתקלתי בבעית חיבור לרשת בזמן הסינכרון האחרון עם %s. אנא נסה מאוחר יותר. + + מִנְעִי + כל רבע שעה + כל חצי שעה + כל שעה + כל שלוש שעות + כל שש שעות + כל שתים עשרה שעות + כל יום + כל שלושה ימים + כל שבוע + \ No newline at end of file diff --git a/astrid/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml similarity index 92% rename from astrid/src/main/res/values-ja/strings.xml rename to src/main/res/values-ja/strings.xml index 2d646cb6c..318fd5d13 100644 --- a/astrid/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -507,4 +507,54 @@ サポート 追加されたタスク 外部メモリーにアクセスできません + + タスク 1 件 + タスク %d 件 + + 今日 + 明日 + 昨日 + 明日 + 昨日 + 確認 + 確認 + インフォメーション + 閉じる + エラーが発生しました! 発生した内容\n\n%s + お待ちください + 同期 + Google Tasks, 保存したデータ, ローカルのバックアップ + 状況 + 状況: %s + ログインしていません + 同期中 + 前回の同期:\n%s + 失敗: %s + 同期でエラー: %s + 同期していません + オプション + バックグラウンド同期 + バックグラウンド同期は無効になっています + 現在の設定: %s + すぐに同期 + 状況レポート + クリックするとTasks チームにレポートを送信します + レポートを送信 + ログアウト + すべての同期データを消去します + ログアウトと同期データを消去しますか? + %s と前回の同期中にネットワークの接続の問題がありました. +後で再度実行してください. + + 無効 + 15分毎 + 30分毎 + 1時間毎 + 3時間毎 + 6時間毎 + 12時間毎 + 毎日 + 3日に一度 + 毎週 + \ No newline at end of file diff --git a/astrid/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml similarity index 92% rename from astrid/src/main/res/values-ko/strings.xml rename to src/main/res/values-ko/strings.xml index 73c5562f1..8030c4493 100644 --- a/astrid/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -504,4 +504,53 @@ 일정 알림기간 동안 일정 이름을 직접 말해 줍니다 일정 알림기간 동안 벨소리를 울려줍니다 지원 + + 1 일정 + %d 일정 + + 오늘 + 내일 + 어제 + 내일 + 어제 + 확인? + 질문: + 정보 + 닫기 + 에러가 발생한 것 같습니다! 발생한 에러는 다음과 같습니다:\n\n%s + 잠시 기다리세요... + 동기화 & 백업 + 구글 일정, 저장한 자료, 로컬 백업 + 상태 + 상태: %s + 로그인 안 됨 + 동기화 진행 중... + 마지막 동기화: \n%s + 실패: %s + 동기화 중 에러: %s + 동기화 한 적이 없습니다! + 설정 + 백그라운드 동기화 + 백그라운드 동기화를 사용하지 않습니다. + 현재 설정: %s + 지금 동기화하기 + 상태 보고 + 아스트리드 팀에게 보고서를 보내려면 클릭하세요 + 보고서 보내기 + 로그아웃 + 모든 동기화 자료 삭제 + 로그아웃 / 모든 동기화 데이터 삭제? + %s 과 마지막 동기화 중에 네트워크 연결 문제가 있었습니다.나중에 다시 시도해 주세요. + + 사용안함 + 15분마다 + 30분마다 + 매시간 + 3시간마다 + 6시간마다 + 12시간마다 + 매일 + 3일마다 + 일주일마다 + \ No newline at end of file diff --git a/astrid/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml similarity index 87% rename from astrid/src/main/res/values-nb/strings.xml rename to src/main/res/values-nb/strings.xml index 1eac08a65..213cc6309 100644 --- a/astrid/src/main/res/values-nb/strings.xml +++ b/src/main/res/values-nb/strings.xml @@ -231,4 +231,43 @@ Tasks vil lese opp oppgaver ved påminnelse Tasks vil spille en ringetone ved påminnelse Slett oppgave + + 1 oppgave + %d oppgaver + + I dag + I morgen + I går + Bekreft? + Spørsmål: + Informasjon + Lukk + Oi, det oppstod en feil! Dette skjedde:\n\n%s + Vennligst vent... + Synkronisering pågår... + Siste synkronisering:\n%s + Mislykket: %s + Aldri synkronisert! + Alternativer + Bakgrunnssynkronisering + Bakgrunnssynkronisering er deaktivert + Aktuell innstilling: %s + Synkronisere nå + Statusrapport + Send rapport + Logg ut + Sletter all synkroniseringsdata + Logg ut / slett synkroniseringsdata? + + deaktiver + hvert kvarter + hver halvtime + hver time + hver tredje time + hver sjette time + hver tolvte time + daglig + hver tredje dag + hver uke + \ No newline at end of file diff --git a/astrid/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml similarity index 92% rename from astrid/src/main/res/values-nl/strings.xml rename to src/main/res/values-nl/strings.xml index bed8c3442..5788060ed 100644 --- a/astrid/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -503,4 +503,51 @@ Ondersteuning Toegevoegde taak Geen toegang tot externe opslag + + 1 taak + %d taken + + Vandaag + Morgen + Gisteren + mrgn + gisteren + OK? + Vraag: + Informatie + Sluit + Er is een fout opgetreden:\n\n%s + Even geduld a.u.b. + Synchronisatie + Google Taken, opgeslagen data, lokale back-up + Niet aangemeld + Synchronisatie bezig... + Vorige:\n%s + Mislukt op: %s + Gesync. met fouten: %s + Nooit gesynct! + Opties + Achtergrond synchronisatie + Achtergrond synchronisatie uitgeschakeld + Huidige instelling: %s + Nu synchroniseren + Statusrapport + Klik om een rapport naar het Tasks team te versturen + Rapport verzenden + Afmelden + Alle synchronisatie gegevens verwijderen + Afmelden / synchronisatie gegevens verwijderen? + Er was een probleem met de netwerkverbinding tijdens de laatste synchronisatie met %s. Probeer het a.u.b. later nog eens. + + uitschakelen + elke 15 min. + elke 30 min. + elk uur + elke 3 uur + elke 6 uur + elke 12 uur + elke dag + elke 3 dagen + elke week + \ No newline at end of file diff --git a/astrid/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml similarity index 92% rename from astrid/src/main/res/values-pl/strings.xml rename to src/main/res/values-pl/strings.xml index 35fb8fd48..9a999ef8c 100644 --- a/astrid/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -504,4 +504,52 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup-&g Wsparcie Dodane zadanie Brak dostępu do pamięci zewnętrznej + + 1 zadanie + %d zadań + + Dzisiaj + Jutro + Wczoraj + jtr + wcz + Potwierdzić? + Pytanie: + Informacja + Zamknij + Ups! Wygląda na to, że wystąpił jakiś błąd! Oto, co się stało:\n\n%s + Proszę czekać... + Synchronizacja + Zadania Google, zapisane dane, lokalna kopia zapasowa + Stan + Niezalogowany + Synchronizacja trwa... + Ostatnia synchronizacja:\n%s + Nieudana: %s + Synch w/ Błędy: %s + Nigdy nie synchronizowano! + Opcje + Synchronizacja w tle + Synchronizacja w tle wyłączona + Aktualnie ustawione na: %s + Synchronizuj teraz + Raport statusu + Kliknij by wysłać raport do zespłu Tasks + Wyślij raport + Wyloguj + Czyści wszystkie dane synchronizacji + Wyloguj / wyczyść dane synchronizacji? + Wystąpił problem łączenia się z siecią w trakcie ostatniej synchronizacji z %s. Spróbuj później. + + Wyłączone + co 15 minut + co 30 minut + co godzinę + co 3 godziny + co 6 godzin + co 12 godzin + raz dziennie + co 3 dni + co tydzień + \ No newline at end of file diff --git a/astrid/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml similarity index 91% rename from astrid/src/main/res/values-pt-rBR/strings.xml rename to src/main/res/values-pt-rBR/strings.xml index d967c347c..4c4b0e580 100644 --- a/astrid/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -466,4 +466,52 @@ Tasks irá falar o nome das tarefas durante os lembretes Tasks irá tocar um som durante o lembrete Suporte + + 1 tarefa + %d tarefas + + Hoje + Amanhã + Ontem + amanhã + ontem + Confirmar? + Pergunta: + Informações + Fechar + Opa, parece que ocorreu um erro! Aqui está o que aconteceu:\n\n%s + Por favor, aguarde... + Sincronização + Google Tasks, dados salvos, backup local + Estado + Não Registrado + Sincronizando... + Última sincronização:\n%s + Falhou em: %s + Sicronizou com erros: %s + Nunca sincronizado! + Opções + Sincronização em segundo plano + O serviço de sincronização em segundo plano está desativado + Atualmente definido para: %s + Sincronizar agora + Relatório de status + Clique para enviar um relatório para a equipe do Tasks + Enviar relatório + Desconectar + Limpar todos os dados de sincronização + Desconectar / limpar dados de sincronização? + Houve um problema na conexão durante a última sincronia com %s. Por favor tente novamente mais tarde. + + desabilitar + a cada quinze minutos + a cada trinta minutos + a cada hora + a cada três horas + a cada seis horas + a cada doze horas + diariamente + a cada três dias + semanalmente + \ No newline at end of file diff --git a/astrid/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml similarity index 92% rename from astrid/src/main/res/values-pt/strings.xml rename to src/main/res/values-pt/strings.xml index 4245a9cf0..812b592f7 100644 --- a/astrid/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -509,4 +509,54 @@ das tarefas através de um backup em Definições->Sincronização e backup-& Suporte Tarefa adicionada Não foi possível aceder ao disco externo + + 1 tarefa + %d tarefas + + Hoje + Amanhã + Ontem + Amanhã + Ontem + Confirma? + Pergunta: + Informação + Fechar + Parece que ocorreu um erro! Isto foi o que aconteceu:\n\n%s + Por favor aguarde... + Sincronização e backup + Tarefas Google, dados e backups + Estado + Estado: %s + Sessão não iniciada + A sincronizar... + Última sincronização:\n%s + Falhou em: %s + Sincronização com erros: %s + Nunca sincronizado! + Opções + Sincronização em segundo plano + Sincronização em segundo plano desativada + Atualmente definido para: %s + Sincronizar agora + Relatório de estado + Clique para enviar um relatório à equipa do Tasks + Enviar relatório + Sair + Remove todos os dados de sincronização + Sair/limpar dados de sincronização? + Ocorreu um erro ao estabelecer ligação à rede durante +a última sincronização com %s. Tente mais tarde. + + desativar + cada 15 minutos + cada 30 minutos + cada hora + cada 3 horas + cada 6 horas + cada 12 horas + todos os dias + cada 3 dias + todas as semanas + \ No newline at end of file diff --git a/astrid/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml similarity index 92% rename from astrid/src/main/res/values-ru/strings.xml rename to src/main/res/values-ru/strings.xml index 19b484b82..2c75b4aa4 100644 --- a/astrid/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -508,4 +508,53 @@ Поддержка добавлена Задача Не могу открыть внешний накопитель + + 1 задача + %d задач(а/и) + + Сегодня + Завтра + Вчера + Завт + Вчера + Подтвердить? + Вопрос: + Информация + Закрыть + Ой, похоже произошла ошибка! Подробности ниже:\n\n%s + Пожалуйста, подождите… + Синхронизация и резервное копирование + Задачи Google, сохраненные данные, локальная резервная копия + Состояние + Состояние: %s + Вход не выполнен + Процесс синхронизации… + Последняя синхронизация\n%s + Ошибка: %s + Синхронизировано с ошибками: %s + Синхронизаций не выполнялось! + Параметры + Фоновая синхронизация + Фоновая синхронизация отключена + Сейчас установлено: %s + Синхронизировать + Отчёт о состоянии + Нажмите, чтобы отправить отчет команде Tasks + Отправить отчет + Выйти + Очищает все данные синхронизации + Выйти / очистить данные синхронизации? + В процессе последней синхронизации с %s возникли проблемы подключения к сети. Пожалуйста, повторите попытку позже. + + отключить + каждые 15 минут + каждые 30 минут + каждый час + каждые 3 часа + каждые 6 часов + каждые 12 часов + каждый день + каждые 3 дня + каждую неделю + \ No newline at end of file diff --git a/astrid/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml similarity index 92% rename from astrid/src/main/res/values-sl-rSI/strings.xml rename to src/main/res/values-sl-rSI/strings.xml index 341695b38..c7b7157a6 100644 --- a/astrid/src/main/res/values-sl-rSI/strings.xml +++ b/src/main/res/values-sl-rSI/strings.xml @@ -502,4 +502,52 @@ Opravki Temni videz gradnika Zbriši opravek + + 1 opravek + Št. opravkov: %d + + Danes + Jutri + Včeraj + Jutr + Včer + Potrdi? + Vprašanje: + Informacija + Zapri + Ups, zdi se, da je prišlo do napake! Tole se je zgodilo:\n\n%s + Prosimo, počakajte... + Uskladitev & varnostna kopija + Google Naloge, shranjeni podatki, varnostna kopija na napravi + Niste prijavljeni + Usklajevanje poteka... + Najnovejše usklajevanje:\n%s + Neuspel v: %s + Usklajevanje z napakami:%s + Nikoli usklajeno! + Možnosti + Usklajevanje v ozadju + Usklajevanje v ozadju je onemogočeno + Trenutno nastavljeno na: %s + Začni z usklajevanjem + Poročilo o statusu + Kliknite, da se pošlje poročilo izdelovalcem aplikacije Opravki + Pošlji poročilo + Odjava + Zbriše vse usklajene podatke + Odjava/brisanje usklajenih podatkov? + Med najnovejšim usklajevanjem z %s je bilo problematično povezovanje v omrežje. +Prosimo ponovno poskusite kasneje. + + onemogoči + vsakih 15 minut + vsakih 30 minut + vsako uro + vsake 3 ure + vsakih 6 ur + vsakih 12 ur + vsak dan + vsake 3 dni + vsak teden + \ No newline at end of file diff --git a/astrid/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml similarity index 92% rename from astrid/src/main/res/values-sv/strings.xml rename to src/main/res/values-sv/strings.xml index 496f9ce24..4a8dc8041 100644 --- a/astrid/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -487,4 +487,51 @@ och återställer dina aktuella uppgifter från en backup Tasks kommer att spela en ringsignal vid påminnelse Uppgifter Radera uppgift + + 1 uppgift + %d uppgifter + + Idag + Imorgon + Igår + imorn + Igår + Bekräfta? + Fråga: + Stäng + Oj, det uppstod ett fel! Detta hände:\n\n%s + Var god vänta... + Synkronisering + Google Aktiviteter, sparad data, lokal backup + Ej inloggad + Synkronisering pågår... + Synkroniserades senast:\n%s + Misslyckades: %s + Synkade med fel: %s + Aldrig synkroniserad! + Alternativ + Bakgrundssynkronisering + Bakgrundssynkronisering är inaktiverad + Aktuell inställning: %s + Synkronisera nu + Status rapport + Klicka för att skicka en rapport till Tasks-teamet + Skicka rapport + Logga ut + Rensar alla synkroniseringsdata + Logga ut / rensa synkroniseringsdata? + Ett nätverksproblem uppstod +vid senaste synkroniseringen med %s. Vänligen försök igen. + + inaktivera + varje kvartstimme + varje halvtimme + varje timme + var tredje timme + var sjätte timme + var tolfte timme + varje dag + var tredje dag + varje vecka + \ No newline at end of file diff --git a/astrid/src/main/res/values-th/strings.xml b/src/main/res/values-th/strings.xml similarity index 95% rename from astrid/src/main/res/values-th/strings.xml rename to src/main/res/values-th/strings.xml index 0a30e7316..bba10a66b 100644 --- a/astrid/src/main/res/values-th/strings.xml +++ b/src/main/res/values-th/strings.xml @@ -123,4 +123,10 @@ Next Month Settings: + วันนี้ + พรุ่งนี้ + เมื่อวาน + ข้อมูล + สถานะ + ตัวเลือก \ No newline at end of file diff --git a/astrid/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml similarity index 92% rename from astrid/src/main/res/values-tr/strings.xml rename to src/main/res/values-tr/strings.xml index 846485d1b..c597d1dc3 100644 --- a/astrid/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -451,4 +451,51 @@ Tasks görev isimlerini görev hatırlatmaları sırasında söyleyecek Tasks görev hatırlatmaları sırasında zil sesi çalacak Destek + + 1 görev + %d görev + + Bugün + Yarın + Dün + Yarın + Dün + Onayla? + Soru: + Bilgi + Kapat + Oops, bir sorun meydana geldi! Olan şu:\n\n%s + Lütfen bekleyin... + Durum + Durum: %s + Oturum açılmadı + Senkronizasyon devam ediyor... + Son Senk.\n%s + Başarısız: %s + Hatalı Senkron: %s + Hiç Eşleme Yapılmamış! + Ayarlar + Arkaplanda senkronizasyon + Arkaplanda senkronizasyon devre dışı + Mevcut ayar: %s + Şimdi Eşle + Durum Raporu + Tasks takımına bildirmek için tıklayın + Rapor Gönder + Çıkış Yap + Bütün eşleme verilerini temizle + Çıkış Yap / Senkron verisini sil? + %s ile son eşleme yapılırken bir ağ bağlantı sorunu oluştu. Lütfen daha sonra yeniden deneyin. + + devre dışı bırak + her 15 dakika + her 30 dakika + her saat + her 3 saat + her 6 saat + her 12 saat + hergün + her 3 gün + her hafta + \ No newline at end of file diff --git a/astrid/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml similarity index 93% rename from astrid/src/main/res/values-uk/strings.xml rename to src/main/res/values-uk/strings.xml index e27b03683..53732668c 100644 --- a/astrid/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -488,4 +488,49 @@ Оповіщення звуком під час нагадування Видалити завдання Підтримка + + 1 завдання + %d завдань + + Сьогодні + Завтра + Вчора + Завт. + Вчор. + Підтверджуєте? + Питання: + Інформація + Закрити + На жаль, схоже, сталася помилка! Ось що вийшло:\n\n%s + Будь ласка, зачекайте... + Синхронізація і резерв. копіювання + Google Tasks, збережені дані, локальне резервне копіювання + Статус + Статус: %s + Не залогований + Процес синхронізації + Остання синхр.:\n%s + Синхр. з помилками: %s + Ніколи не було синхронізовано! + Опції + Фонова синхронізація + Фонова синхронізація відключена + Синхронізувати зараз + Відіслати звіт + Вийти + У процесі останньої синхронізації %s. + Виникли проблеми підключення до мережі. + Будь ласка, спробуйте ще раз пізніше. + + вимкнути + що 15 хвилин + що 30 хвилин + кожну годину + кожних 3 години + кожних 6 годин + кожних 12 годин + щодня + кожного 3-го дня + кожного тижня + \ No newline at end of file diff --git a/astrid/src/main/res/values-v11/styles.xml b/src/main/res/values-v11/styles.xml similarity index 100% rename from astrid/src/main/res/values-v11/styles.xml rename to src/main/res/values-v11/styles.xml diff --git a/astrid/src/main/res/values-v14/dimens.xml b/src/main/res/values-v14/dimens.xml similarity index 100% rename from astrid/src/main/res/values-v14/dimens.xml rename to src/main/res/values-v14/dimens.xml diff --git a/astrid/src/main/res/values-v21/styles.xml b/src/main/res/values-v21/styles.xml similarity index 100% rename from astrid/src/main/res/values-v21/styles.xml rename to src/main/res/values-v21/styles.xml diff --git a/astrid/src/main/res/values-w820dp/dimens.xml b/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from astrid/src/main/res/values-w820dp/dimens.xml rename to src/main/res/values-w820dp/dimens.xml diff --git a/astrid/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml similarity index 91% rename from astrid/src/main/res/values-zh-rCN/strings.xml rename to src/main/res/values-zh-rCN/strings.xml index 1f0559ef3..c1909515d 100644 --- a/astrid/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -432,4 +432,53 @@ Tasks在任务提醒时会以语音说出任务名称 Tasks在任务提醒时将会播放铃声 支持 + + 1 个任务 + %d 个任务 + + 今天 + 明天 + 昨天 + 明天 + 昨天 + 确认? + 问题： + 信息 + 关闭 + 糟糕，发生错误！状况是:\n\n%s + 请稍候... + 同步和备份 + 谷歌任务，已存数据，本地备份 + 状态 + 状态：%s + 未登陆 + 同步中... + 上次同步：\n%s + 失败：%s + 同步 w/ 错误： %s 上次同步日期 + 未同步过！ + 选项 + 后台同步 + 后台同步已关闭 + 目前同步间隔：%s + 现在同步 + 状态报告 + 点击给 Tasks 团队发送报告 + 发送报告 + 登出 + 清除所有同步资料 + 登出/清除同步资料? + 在最近与 %s 同步时网络连接发生问题。请重试。 + + 停用 + 每15分钟 + 每30分钟 + 每小时 + 每3小时 + 每6小时 + 每12小时 + 每天 + 每3天 + 每周 + \ No newline at end of file diff --git a/astrid/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml similarity index 92% rename from astrid/src/main/res/values-zh-rTW/strings.xml rename to src/main/res/values-zh-rTW/strings.xml index 2c3ba54c0..9e26be1f1 100644 --- a/astrid/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -476,4 +476,53 @@ 暗色小工具主題 刪除工作 支持 + + 1 個工作 + %d 個工作 + + 今天 + 明天 + 昨天 + 明天 + 昨天 + 確認? + 問題： + 資訊 + 關閉 + 糟糕，發生錯誤！狀況是:\n\n%s + 請稍候... + 同步和備份 + 谷歌任務，已存數據，本地備份 + 狀態 + 狀態：%s + 未登陸 + 同步中... + 上次同步：\n%s + 失敗：%s + 同步w/ 錯誤： %s 上次同步日期 + 未同步過！ + 選項 + 後台同步 + 後台同步已關閉 + 目前同步間隔：%s + 現在同步 + 狀態報告 + 點擊給 Tasks 團隊發送報告 + 發送報告 + 登出 + 清除所有同步資料 + 登出/清除同步資料? + 在最近與%s 同步時網絡連接發生問題。請重試。 + + 停用 + 每15分鐘 + 每30分鐘 + 每小時 + 每3小時 + 每6小時 + 每12小時 + 每天 + 每3天 + 每週 + \ No newline at end of file diff --git a/astrid/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml similarity index 100% rename from astrid/src/main/res/values/attrs.xml rename to src/main/res/values/attrs.xml diff --git a/astrid/src/main/res/values/colors.xml b/src/main/res/values/colors.xml similarity index 80% rename from astrid/src/main/res/values/colors.xml rename to src/main/res/values/colors.xml index 735bfdbbf..b9955ef92 100644 --- a/astrid/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -27,5 +27,13 @@ #dddddd #efefef + + #ffff5555 + #fffea400 + #ff33a5e8 + #ff808080 + #ff505050 + #ff202020 + diff --git a/astrid/src/main/res/values/cwac_touchlist_attrs.xml b/src/main/res/values/cwac_touchlist_attrs.xml similarity index 100% rename from astrid/src/main/res/values/cwac_touchlist_attrs.xml rename to src/main/res/values/cwac_touchlist_attrs.xml diff --git a/astrid/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml similarity index 100% rename from astrid/src/main/res/values/dimens.xml rename to src/main/res/values/dimens.xml diff --git a/astrid/src/main/res/values/integers.xml b/src/main/res/values/integers.xml similarity index 100% rename from astrid/src/main/res/values/integers.xml rename to src/main/res/values/integers.xml diff --git a/astrid/src/main/res/values/keys.xml b/src/main/res/values/keys.xml similarity index 100% rename from astrid/src/main/res/values/keys.xml rename to src/main/res/values/keys.xml diff --git a/astrid/src/main/res/values/strings-actfm.xml b/src/main/res/values/strings-actfm.xml similarity index 100% rename from astrid/src/main/res/values/strings-actfm.xml rename to src/main/res/values/strings-actfm.xml diff --git a/astrid/src/main/res/values/strings-alarms.xml b/src/main/res/values/strings-alarms.xml similarity index 100% rename from astrid/src/main/res/values/strings-alarms.xml rename to src/main/res/values/strings-alarms.xml diff --git a/astrid/src/main/res/values/strings-backup.xml b/src/main/res/values/strings-backup.xml similarity index 100% rename from astrid/src/main/res/values/strings-backup.xml rename to src/main/res/values/strings-backup.xml diff --git a/astrid/src/main/res/values/strings-core.xml b/src/main/res/values/strings-core.xml similarity index 100% rename from astrid/src/main/res/values/strings-core.xml rename to src/main/res/values/strings-core.xml diff --git a/astrid/src/main/res/values/strings-defaults.xml b/src/main/res/values/strings-defaults.xml similarity index 100% rename from astrid/src/main/res/values/strings-defaults.xml rename to src/main/res/values/strings-defaults.xml diff --git a/astrid/src/main/res/values/strings-filters.xml b/src/main/res/values/strings-filters.xml similarity index 100% rename from astrid/src/main/res/values/strings-filters.xml rename to src/main/res/values/strings-filters.xml diff --git a/astrid/src/main/res/values/strings-gcal.xml b/src/main/res/values/strings-gcal.xml similarity index 100% rename from astrid/src/main/res/values/strings-gcal.xml rename to src/main/res/values/strings-gcal.xml diff --git a/astrid/src/main/res/values/strings-gtasks.xml b/src/main/res/values/strings-gtasks.xml similarity index 100% rename from astrid/src/main/res/values/strings-gtasks.xml rename to src/main/res/values/strings-gtasks.xml diff --git a/astrid/src/main/res/values/strings-locale.xml b/src/main/res/values/strings-locale.xml similarity index 100% rename from astrid/src/main/res/values/strings-locale.xml rename to src/main/res/values/strings-locale.xml diff --git a/astrid/src/main/res/values/strings-ppack.xml b/src/main/res/values/strings-ppack.xml similarity index 100% rename from astrid/src/main/res/values/strings-ppack.xml rename to src/main/res/values/strings-ppack.xml diff --git a/astrid/src/main/res/values/strings-premium.xml b/src/main/res/values/strings-premium.xml similarity index 100% rename from astrid/src/main/res/values/strings-premium.xml rename to src/main/res/values/strings-premium.xml diff --git a/astrid/src/main/res/values/strings-reminders.xml b/src/main/res/values/strings-reminders.xml similarity index 100% rename from astrid/src/main/res/values/strings-reminders.xml rename to src/main/res/values/strings-reminders.xml diff --git a/astrid/src/main/res/values/strings-repeat.xml b/src/main/res/values/strings-repeat.xml similarity index 100% rename from astrid/src/main/res/values/strings-repeat.xml rename to src/main/res/values/strings-repeat.xml diff --git a/astrid/src/main/res/values/strings-tags.xml b/src/main/res/values/strings-tags.xml similarity index 100% rename from astrid/src/main/res/values/strings-tags.xml rename to src/main/res/values/strings-tags.xml diff --git a/astrid/src/main/res/values/strings-timers.xml b/src/main/res/values/strings-timers.xml similarity index 100% rename from astrid/src/main/res/values/strings-timers.xml rename to src/main/res/values/strings-timers.xml diff --git a/astrid/src/main/res/values/strings-voice.xml b/src/main/res/values/strings-voice.xml similarity index 100% rename from astrid/src/main/res/values/strings-voice.xml rename to src/main/res/values/strings-voice.xml diff --git a/astrid/src/main/res/values/strings-widget.xml b/src/main/res/values/strings-widget.xml similarity index 100% rename from astrid/src/main/res/values/strings-widget.xml rename to src/main/res/values/strings-widget.xml diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml new file mode 100644 index 000000000..014141d65 --- /dev/null +++ b/src/main/res/values/strings.xml @@ -0,0 +1,131 @@ + + + Dark widget theme + Delete task + Support + Added task + Cannot access external storage + + Open navigation drawer + Close navigation drawer + + + + + + 1 task + + %d tasks + + + + Today + + + Tomorrow + + + Yesterday + + + Tmrw + + + Yest + + + + + Confirm? + + + Question: + + + Information + + + Close + + + Oops, looks like an error occurred! Here\'s what happened:\n\n%s + + + Please wait... + + + + + Sync & backup + + + Google Tasks, saved data, local backup + + + + + Status + + + Status: %s + + Not logged in + + Sync ongoing... + + Last sync:\n%s + + Failed on: %s + + Sync w/ errors: %s + + Never synchronized! + + + Options + + + Background sync + + Background synchronization is disabled + + Currently set to: %s + + + Synchronize now + + + Status report + + + Click to send a report to the Tasks team + + Send report + + + Log out + + Clears all synchronization data + + + Log out/clear synchronization data? + + + There was a problem connecting to the network + during the last sync with %s. Please try again later. + + + + disable + every fifteen minutes + every thirty minutes + every hour + every three hours + every six hours + every twelve hours + every day + every three days + every week + + + \ No newline at end of file diff --git a/astrid/src/main/res/values/styles.xml b/src/main/res/values/styles.xml similarity index 100% rename from astrid/src/main/res/values/styles.xml rename to src/main/res/values/styles.xml diff --git a/astrid/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml similarity index 100% rename from astrid/src/main/res/xml/preferences.xml rename to src/main/res/xml/preferences.xml diff --git a/astrid/src/main/res/xml/preferences_backup.xml b/src/main/res/xml/preferences_backup.xml similarity index 100% rename from astrid/src/main/res/xml/preferences_backup.xml rename to src/main/res/xml/preferences_backup.xml diff --git a/astrid/src/main/res/xml/preferences_blank.xml b/src/main/res/xml/preferences_blank.xml similarity index 100% rename from astrid/src/main/res/xml/preferences_blank.xml rename to src/main/res/xml/preferences_blank.xml diff --git a/astrid/src/main/res/xml/preferences_defaults.xml b/src/main/res/xml/preferences_defaults.xml similarity index 100% rename from astrid/src/main/res/xml/preferences_defaults.xml rename to src/main/res/xml/preferences_defaults.xml diff --git a/astrid/src/main/res/xml/preferences_gtasks.xml b/src/main/res/xml/preferences_gtasks.xml similarity index 100% rename from astrid/src/main/res/xml/preferences_gtasks.xml rename to src/main/res/xml/preferences_gtasks.xml diff --git a/astrid/src/main/res/xml/preferences_misc.xml b/src/main/res/xml/preferences_misc.xml similarity index 100% rename from astrid/src/main/res/xml/preferences_misc.xml rename to src/main/res/xml/preferences_misc.xml diff --git a/astrid/src/main/res/xml/preferences_oldtasks.xml b/src/main/res/xml/preferences_oldtasks.xml similarity index 100% rename from astrid/src/main/res/xml/preferences_oldtasks.xml rename to src/main/res/xml/preferences_oldtasks.xml diff --git a/astrid/src/main/res/xml/preferences_reminders.xml b/src/main/res/xml/preferences_reminders.xml similarity index 100% rename from astrid/src/main/res/xml/preferences_reminders.xml rename to src/main/res/xml/preferences_reminders.xml diff --git a/astrid/src/main/res/xml/scrollable_widget_provider_info.xml b/src/main/res/xml/scrollable_widget_provider_info.xml similarity index 100% rename from astrid/src/main/res/xml/scrollable_widget_provider_info.xml rename to src/main/res/xml/scrollable_widget_provider_info.xml diff --git a/astrid/src/main/res/xml/widget_provider_info.xml b/src/main/res/xml/widget_provider_info.xml similarity index 100% rename from astrid/src/main/res/xml/widget_provider_info.xml rename to src/main/res/xml/widget_provider_info.xml