summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importlineage-17.1Michael Bestas2020-05-237-0/+7
| | | | Change-Id: I72c6e2fa39b5b498cb763ea6beb1a49c4db1cbea
* Revert "AOSP/Calendar - Minimal calendar app."Michael W2020-05-01105-84/+28760
| | | | | | This reverts commit 551499ec6d3878cd3dce99bebe08c4552d05c29c. Change-Id: I6d77c60d79dd7f0c3023f15595020f0a1a9fc79d
* Revert "AOSP/Calendar - Fix the crash bug. Deleted a code fragment that ↵Michael W2020-05-013-2/+114
| | | | | | | | remained that was selecting and viewing of the calendar events.." This reverts commit efcbc24475404dc572b9eba84537f0e3562981fd. Change-Id: Ib380324066f16f249bf0d3ab8bd3058764aae474
* Revert "Calendar: Drop no longer existing activity from manifest"Michael W2020-05-011-0/+21
| | | | | | This reverts commit 6eba54303c1de42cac79dc0342ab17b324299346. Change-Id: I766199d60b4fe4a573b94415e3967bc6b9691f29
* Automatic translation importMichael Bestas2020-04-2314-24/+30
| | | | Change-Id: Ice550fd13e4162211d864624e8fe054cf52368ba
* Automatic translation importMichael Bestas2020-01-2714-0/+2770
| | | | Change-Id: Ie35eab8c9fdd3a06708d3b689e29a9288bba3e16
* Calendar: Drop no longer existing activity from manifeststaging/lineage-17.0_merge-android-10.0.0_r9LuK13372019-12-111-21/+0
| | | | | | * It was removed in 551499e. Change-Id: If8d4cf7e7522d862e413ff5156df310b8c9f4fef
* Calendar: Don't optimize out no-arg Fragment constructorsLuK13372019-12-111-0/+4
| | | | | | | * Fixes FC after configuration changes. Test: Open app and rotate the device. Change-Id: Id5bbb3e569ec3bf13970ae9a8427ca4577b14da5
* Calendar: Fix translatablesMarco Brohet2019-12-112-24/+4
| | | | Change-Id: I04976dfce170f98b8820f713da04edadb0ac2643
* Calendar: adaptive iconAsher Simonds2019-12-1116-1/+22
| | | | | Change-Id: Ie04adc9e759820bb0d813ffb0efdca687b0a1fe4 Signed-off-by: Joey <joey@lineageos.org>
* Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
|\ | | | | | | | | | | am: bad1d095b2 Change-Id: I2ce32b7ed98d77efe4cee63d6b0d8cb03b74cfb1
| * Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\ | | | | | | | | | | | | Bug: 126125118 Change-Id: If9e509d67b18dc787fccf3e65bac30fcaa91d7bc
| | * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | |\ | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: I6a4db2f974f6aa23afb63c8d1a498ce7b655a2e2
* | | | [automerger skipped] Merge "Convert Calendar to androidx" am: 284cf496ed am: ↵Aurimas Liutikas2019-02-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f477e745e am: d893f9933a -s ours am skip reason: change_id I0ee57de3ba43b44799af37efdb6815f88a29eac3 with SHA1 99b87507e1 is in history Change-Id: I06754ecae1cf5e7f0d35c78d70dca53d21781146
| * | | Merge "Convert Calendar to androidx" am: 284cf496edAurimas Liutikas2019-02-192-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | am: 9f477e745e Change-Id: Ie89dc6d93e56e9e432c23647871b11ba2918e319
| | * | Merge "Convert Calendar to androidx"Aurimas Liutikas2019-02-192-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: 284cf496ed Change-Id: If391636753a32be605163d8d30ccb7ab5265de5d
| | | * \ Merge "Convert Calendar to androidx"Treehugger Robot2019-02-192-2/+2
| | | |\ \
| | | | * | Convert Calendar to androidxAurimas Liutikas2019-02-162-2/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: make Calendar Bug: 76692459 Change-Id: I0ee57de3ba43b44799af37efdb6815f88a29eac3 Merged-In: I0ee57de3ba43b44799af37efdb6815f88a29eac3
* | | | | Merge "Add default code reviewers into OWNERS" am: 26cc6b707c am: cc81fe2b42Chih-hung Hsieh2019-01-181-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1254616910 Change-Id: I15f1738e808baa94daee97e8782fd26c69e2792d
| * | | | Merge "Add default code reviewers into OWNERS" am: 26cc6b707cChih-hung Hsieh2019-01-181-0/+3
| |\| | | | | |_|/ | |/| | | | | | | | | | | | | | am: cc81fe2b42 Change-Id: Ic33e4d2b86a468464d462aad86c17330e445c500
| | * | Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh2019-01-181-0/+3
| | |\| | | | | | | | | | | | | | | | | | | | | am: 26cc6b707c Change-Id: If7aa4fcdc48821254fa622c2d43d15eaeb206941
| | | * Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh2019-01-181-0/+3
| | | |\
| | | | * Add default code reviewers into OWNERSChih-Hung Hsieh2019-01-181-0/+3
| | | |/ | | | | | | | | | | | | | | | | | | | | Bug: 33166666 Test: gerrit uploader Change-Id: I4c25c88231527a7b508739631b15345284d5d0c8
* | | | Merge "AOSP/Calendar - Fix the crash bug. Deleted a code fragment that ↵Bob Badour2019-01-153-114/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remained that was selecting and viewing of the calendar events.." am: 7deece52eb am: fd21e606e9 am: 68f30b7f39 Change-Id: Id0732b49a1acd5f6391acbc30bb8165b4e5da65c
| * | | Merge "AOSP/Calendar - Fix the crash bug. Deleted a code fragment that ↵Bob Badour2019-01-153-114/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remained that was selecting and viewing of the calendar events.." am: 7deece52eb am: fd21e606e9 Change-Id: Id97f8b8eb80d25dd2470bf680eac79fbd0bf62a2
| | * | Merge "AOSP/Calendar - Fix the crash bug. Deleted a code fragment that ↵Bob Badour2019-01-153-114/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | remained that was selecting and viewing of the calendar events.." am: 7deece52eb Change-Id: Ia063342f02aaffe42be72b47ee17f7ffb540ea50
| | | * Merge "AOSP/Calendar - Fix the crash bug. Deleted a code fragment that ↵Bob Badour2019-01-153-114/+2
| | | |\ | | | | | | | | | | | | | | | remained that was selecting and viewing of the calendar events.."
| | | | * AOSP/Calendar - Fix the crash bug. Deleted a code fragment that remained ↵Raman Tenneti2019-01-143-114/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that was selecting and viewing of the calendar events.. Bug: 122643303 Test: manual - Ran the following CTS tests on Pixel phone. Tested the calendar UI. $ make -j 40 $ adb install -r out/target/product/marlin/system/app/Calendar/Calendar.apk $ make CalendarTests -j $ adb install -r out/target/product/marlin/testcases/CalendarTests/CalendarTests.apk $ adb shell am instrument -w com.android.calendar.tests (same as before) Tests run: 22, Failures: 1, Errors: 0 $ ./development/testrunner/runtest.py --path cts/tests/tests/provider/src/android/provider/cts/CalendarTest.java adb shell am instrument -e class 'android.provider.cts.CalendarTest' -w 'android.provider.cts/android.support.test.runner.AndroidJUnitRunner' android.provider.cts.CalendarTest:................................ Time: 15.914 OK (32 tests) $ ./development/testrunner/runtest.py --path cts/tests/tests/content/src/android/content/cts/AvailableIntentsTest.java android.content.cts.AvailableIntentsTest:................................. Time: 0.317 OK (33 tests) $ ./development/testrunner/runtest.py --path cts/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/src/com/android/cts/privilegedupdate/PrivilegedUpdateTest.java com.android.cts.privilegedupdate.PrivilegedUpdateTest:... Time: 0.082 OK (3 tests) $ ./development/testrunner/runtest.py --path cts/tests/tests/permission2/src/android/permission2/cts/ProtectedBroadcastsTest.java android.permission2.cts.ProtectedBroadcastsTest:.. Time: 0.097 OK (2 tests) Change-Id: I2195d5f1e88a039622bda68cd649bcc5d6cc35cc
* | | | | Merge "Move Calendar to /product" am: faf91459ac am: 6037344914Anton Hansson2019-01-142-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c2ed09a133 Change-Id: Ic4ec00e37c156fa2c70d9be0c6e06200688a7ec3
| * | | | Merge "Move Calendar to /product" am: faf91459acAnton Hansson2019-01-142-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6037344914 Change-Id: Iabe6fe63e0848a912172be46a00ad579721ebf0f
| | * | | Merge "Move Calendar to /product"Anton Hansson2019-01-142-0/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: faf91459ac Change-Id: Ifa0b97abe30b082268cdedce119c444e75b911f9
| | | * | Merge "Move Calendar to /product"Anton Hansson2019-01-142-0/+3
| | | |\ \ | | | | |/ | | | |/|
| | | | * Move Calendar to /productAnton Hansson2019-01-112-0/+3
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This app is frequently overriden by proprietary apps on shipping devices, so move it to /product. Bug: 122353713 Test: launch calendar on aosp_arm64 emulator Change-Id: I52e96b5eca097e8d075b771b5d4d0d7f0ba0be08
* | | | Merge "AOSP/Calendar - update the Calendar version to target P (28) or ↵Raman Tenneti2018-11-141-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | higher." am: 0bd5cedb0d am: 1f0ae17565 am: df996bcf63 Change-Id: Ia44af7de7e5291748a37779efb9ffc07a9aadb18
| * | | Merge "AOSP/Calendar - update the Calendar version to target P (28) or ↵Raman Tenneti2018-11-141-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | higher." am: 0bd5cedb0d am: 1f0ae17565 Change-Id: I75f4e107eb7dee212a259d7fb65c1d598466f2ef
| | * | Merge "AOSP/Calendar - update the Calendar version to target P (28) or higher."Raman Tenneti2018-11-141-1/+2
| | |\| | | | | | | | | | | | | | | | | | | | | am: 0bd5cedb0d Change-Id: I7852aa455cc450b688c7a5935b3b0fad3ea6db17
| | | * Merge "AOSP/Calendar - update the Calendar version to target P (28) or higher."Treehugger Robot2018-11-141-1/+2
| | | |\
| | | | * AOSP/Calendar - update the Calendar version to target P (28) or higher.Treehugger Robot2018-11-14105-28761/+86
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 119500483 Test: manual - Ran the following CTS tests on Pixel phone. Tested the calendar UI. $ adb shell am instrument -w com.android.calendar.tests $ ./development/testrunner/runtest.py --path cts/tests/tests/provider/src/android/provider/cts/CalendarTest.java android.provider.cts.CalendarTest:................................ Time: 16.918 OK (32 tests) $ ./development/testrunner/runtest.py --path cts/tests/tests/content/src/android/content/cts/AvailableIntentsTest.java android.content.cts.AvailableIntentsTest:................................. Time: 0.202 OK (33 tests) $ ./development/testrunner/runtest.py --path cts/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/src/com/android/cts/privilegedupdate/PrivilegedUpdateTest.java com.android.cts.privilegedupdate.PrivilegedUpdateTest:... Time: 0.204 OK (3 tests) $ ./development/testrunner/runtest.py --path cts/tests/tests/permission2/src/android/permission2/cts/ProtectedBroadcastsTest.java android.permission2.cts.ProtectedBroadcastsTest:.. Time: 0.139 OK (2 tests) Change-Id: Id3e48f100d685aaf03c2c726b75def4437b980cb
* | | | | | Merge "AOSP/Calendar - Minimal calendar app." am: a4438e61ac am: 142020ee38Raman Tenneti2018-11-01105-28760/+84
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b651744046 Change-Id: I589e05919bfb5a00c3417bdb39e1e7e6a6d563f7
| * | | | | Merge "AOSP/Calendar - Minimal calendar app." am: a4438e61acRaman Tenneti2018-11-01105-28760/+84
| |\| | | | | | |_|/ / | |/| | | | | | | | | | | | | | | | | | am: 142020ee38 Change-Id: Ic21489e055a1ed8db1d71f0e4125e49799849272
| | * | | Merge "AOSP/Calendar - Minimal calendar app."Raman Tenneti2018-11-01105-28760/+84
| |/| | | | | |/ / | | | | | | | | | | | | | | | | am: a4438e61ac Change-Id: I3a8d08d1a8e3d9ec561fb4d8d35480584d2f7cb3
| | * / Merge "AOSP/Calendar - Minimal calendar app."Treehugger Robot2018-11-01105-28760/+84
| |/| | | | |/
| | * AOSP/Calendar - Minimal calendar app.Raman Tenneti2018-10-31105-28760/+84
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Calendar UI shows day/week/month calendars. + Calendar can be scrolled different days/weeks/months + Clicking on day icon shows the today. + New events can not be created. + Fixed the tests so that they pass. + Deleted src/com/android/calendar/AbstractCalendarActivity.java and tested everything. Bug: 118760450 Bug: 118712914 Test: manual - Ran the following CTS tests on Pixel phone. Tested the calendar UI. $ adb shell am instrument -w com.android.calendar.tests com.android.calendar.FormatDateRangeTest:. com.android.calendar.UtilsTests:.................. com.android.calendar.WeekNumberTest:. com.android.calendar.widget.CalendarAppWidgetServiceTest:.. Test results for InstrumentationTestRunner=...................... Time: 0.315 OK (22 tests) + android.provider.cts.CalendarTest:................................ Time: 17.842 OK (32 tests) + android.content.cts.AvailableIntentsTest:................................. Time: 0.441 OK (33 tests) + com.android.cts.privilegedupdate.PrivilegedUpdateTest:... Time: 0.119 OK (3 tests) + android.permission2.cts.ProtectedBroadcastsTest:.. Time: 0.285 OK (2 tests) Change-Id: Ib6a3df46e46619248d2e45d71622109d3085eb64
* | Merge "Fix errors caught by aapt2" am: ce4abe56b9 am: fa0b0f36aeColin Cross2018-05-142-2/+0
|\| | | | | | | | | | | am: 7b051c6e9e Change-Id: Ie69241f0ae670c3bf7ae389bc2c52c928d0f55d4
| * Merge "Fix errors caught by aapt2" am: ce4abe56b9Colin Cross2018-05-142-2/+0
| |\ | | | | | | | | | | | | | | | am: fa0b0f36ae Change-Id: I9252e54dc3408b0a044f27bee6d6bce55caa8ab4
| | * Merge "Fix errors caught by aapt2"Colin Cross2018-05-142-2/+0
| |/| | | | | | | | | | | | | | | | am: ce4abe56b9 Change-Id: I1acf4f7e8384cc6005ffd1997d39cdccee5c8dc0
| | * Merge "Fix errors caught by aapt2"Colin Cross2018-05-142-2/+0
| |/|
| | * Fix errors caught by aapt2Colin Cross2018-05-102-2/+0
| |/ | | | | | | | | | | | | | | | | | | | | Remove dangling symlinks, which were ignored by aapt but cause an error with aapt2. Fixes: packages/apps/Calendar/assets/backward: error: failed to open file. Bug: 21548934 Bug: 79481102 Test: m java FORCE_AAPT2=true Change-Id: I1fe884269ec59a348d611796c66a27887f6e720f
* / Convert Calendar to androidxAurimas Liutikas2018-04-102-2/+2
|/ | | | | | Test: make Calendar Bug: 76692459 Change-Id: I0ee57de3ba43b44799af37efdb6815f88a29eac3
* Rename language+country resources to just languagestaging/lineage-15.1staging/lineage-15.0_rebase-android-8.0.0_r23lineage-15.0Roozbeh Pournader2017-01-1044-0/+0
| | | | | | Bug: 26496609 Test: none Change-Id: I483cbdef4f29f1562395755f543bdd00aa7ca405