summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-07-15Merge "API level 30 upgrade: AOSP/Calendar"android-s-beta-5android-s-beta-5Treehugger Robot
2021-07-15API level 30 upgrade: AOSP/CalendarDamian Patel
The AndroidManifest.xml file of the AOSP Calendar app has been upgrade so that its targetSDKversion is 30. Test: manual - after the change, the Calendar app built, initialized, and ran successfully with all of the UI features functioning properly. Unit tests for calendar were also run and the output can be seen below: com.android.calendar.FormatDateRangeTest:. com.android.calendar.UtilsTests:.................. com.android.calendar.WeekNumberTest:. com.android.calendar.widget.CalendarAppWidgetServiceTest:.. Test results for InstrumentationTestRunner=...................... Time: 0.203 OK (22 tests) General CTS tests were run as well and the output is below: ================= Results ================== =============== Consumed Time ============== arm64-v8a CtsProviderTestCases: 14m 0s Total aggregated tests run time: 14m 0s ============== TOP 1 Slow Modules ============== arm64-v8a CtsProviderTestCases: 0.45 tests/sec [376 tests / 840170 msec] ============== Modules Preparation Times ============== arm64-v8a CtsProviderTestCases => prep = 8439 ms || clean = 2153 ms Total preparation time: 8s || Total tear down time: 2s ======================================================= =============== Summary =============== Total Run time: 15m 38s 1/1 modules completed Total Tests : 376 PASSED : 362 FAILED : 0 IGNORED : 6 ASSUMPTION_FAILURE: 8 ============== End of Results ============== Change-Id: If7c8b12fb37b126ebc0d00df8f0d65730e631c20
2021-07-14Merge "AOSP/Calendar - .java files deleted"android-s-beta-4android-s-beta-3android-s-beta-4Treehugger Robot
2021-07-13Merge "AOSP/Calendar - Android.bp changes"Treehugger Robot
2021-07-13AOSP/Calendar - Android.bp changesDamian Patel
The "CalendarJava" android app property has been deleted along with the "exclude_srcs" property since the .java files in the source code directory have been deleted. Test: manual - "make Calendar" build successfully. Change-Id: I861d131fcce9f43a0e8993be50eb0f2bd2a422a0
2021-07-13AOSP/Calendar - .java files deletedDamian Patel
Since the AOSP Calendar app has been fully converted to Kotlin, the .java files have been deleted. The app has gone through the general battery of tests such as unit, cts, and manual testing to ensure the app still functions properly. Test: manual - build tests, unit tests, and CTS tests were conducted using the following commands: $ make Calendar $ make CalendarTests -j $ adb install -r -t -d out/target/product/bonito/ testcases/CalendarTests/arm64/CalendarTests.apk Success $ 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.162 OK (22 tests) General CTS Tests: $ tools/cts-tradefed cts-tf > run cts -m CtsProviderTestCases ================= Results ================== =============== Consumed Time ============== arm64-v8a CtsProviderTestCases: 13m 38s Total aggregated tests run time: 13m 38s ============== TOP 1 Slow Modules ============== arm64-v8a CtsProviderTestCases: 0.46 tests/sec [376 tests / 818070 msec] ============== Modules Preparation Times ============== arm64-v8a CtsProviderTestCases => prep = 10106 ms || clean = 2243 ms Total preparation time: 10s || Total tear down time: 2s ======================================================= =============== Summary =============== Total Run time: 15m 16s 1/1 modules completed Total Tests : 376 PASSED : 362 FAILED : 0 IGNORED : 6 ASSUMPTION_FAILURE: 8 ============== End of Results ============== Change-Id: I48d05571f02e77edac5e9522922d890f1adb2cf0
2021-07-12Merge changes from topic "MonthWeekEventsView"Mahi Kolla
* changes: AOSP/Calendar - Add Kotlin code for MonthWeekEventsView.kt. Also uploaded corresponding Android.bp file AOSP/Calendar - Initial conversion of MonthWeekEventsView as performed by Android Studio's automatic converter. AOSP/Calendar - Add Kotlin copy of MonthWeekEventsView.java
2021-07-12AOSP/Calendar - Add Kotlin code for MonthWeekEventsView.kt. Also uploaded ↵Mahi Kolla
corresponding Android.bp file This class contained a lot of calculations which resulted in needing to add .toFloat() or .toInt() to these expressions. In addition, as a subclass of SimpleWeekView, some of the methods and variables needed override modifiers. A few changes were made in SimpleWeekView such as variable declarations to accomodate the way the variables are used in MonthWeekEventsView. Test: manual (ran build and unit tests) and CTS testing suite $ source build/envsetup.sh $ lunch aosp_bonito-userdebug $ make Calendar $ adb install -r -d -t out/target/product/bonito/product/app/Calendar/Calendar.apk $ make CalendarTests -j $ adb install -r -d -t out/target/product/bonito/testcases/CalendarTests/arm64/CalendarTests.apk $ 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.15 OK (22 tests) CTS TESTING: $ tools/cts-tradefed cts-tf > run cts -m CtsProviderTestCases ============================================ ================= Results ================== =============== Consumed Time ============== arm64-v8a CtsProviderTestCases: 7m 28s Total aggregated tests run time: 7m 28s ============== TOP 1 Slow Modules ============== arm64-v8a CtsProviderTestCases: 0.84 tests/sec [376 tests / 448391 msec] ============== Modules Preparation Times ============== arm64-v8a CtsProviderTestCases => prep = 12537 ms || clean = 2820 ms Total preparation time: 12s || Total tear down time: 2s ======================================================= =============== Summary =============== Total Run time: 9m 26s 1/1 modules completed Total Tests : 376 PASSED : 362 FAILED : 0 IGNORED : 6 ASSUMPTION_FAILURE: 8 ============== End of Results ============== ============================================ Change-Id: I9941c06d860aefc3382f5314c817da44ac0db088
2021-07-12AOSP/Calendar - Initial conversion of MonthWeekEventsView as performed by ↵Mahi Kolla
Android Studio's automatic converter. Test: none, no functional change in this commit when merged with corresponding Kotlin conversion. Change-Id: Ie0face86c3e53b34b14785e248d894c2ebaa82a8
2021-07-12AOSP/Calendar - Add Kotlin copy of MonthWeekEventsView.javaMahi Kolla
Test: none, no functional change in this commit when merged with corresponding Kotlin conversion. Change-Id: I4d956b5f0ae5f983ac30d09e01b55ff3a75bd606
2021-07-10Merge changes from topic "MonthByWeek/SimpleWeeks"Treehugger Robot
* changes: AOSP/Calendar - MonthByWeekAdapter and SimpleWeeksAdapter fully converted with bp file AOSP/Calendar - Initial conversion of MonthByWeekAdapter and SimpleWeeksAdapter AOSP/Calendar - Copy of MonthByWeekAdapter.java and SimpleWeeksAdapter.java
2021-07-10Merge changes from topic "EventInfoFragment"Treehugger Robot
* changes: AOSP/Calendar - EventInfoFragment fully converted with bp file AOSP/Calendar - Initial Conversion of EventInfoFragment AOSP/Calendar - Copy of EventInfoFragment.java
2021-07-09AOSP/Calendar - MonthByWeekAdapter and SimpleWeeksAdapterDamian Patel
fully converted with bp file This is the fully converted and touched-up Kotlin file after the converter was run once. A few other files had to be tweaked in order ensure all files within the month packages worked together properly. For instance, a few variables in SimpleWeekView.kt had to have their visibility modifier be changed to "internal" rather than "protected". This is because the "protected" modifier in Kotlin means only subclasses have visiblity. Otherwise, it is identical to the "private" modifier. The "internal' modifier more closely resembles "protected" since it is package-private while subclasses still have access to members. I also tried to move away from the "Integer" type and replace it with "Int?" since it is not proper practice according to Kotlin docs to use "Integer" as a type since it is deprecated. Moreover, various functions in SimpleWeeksAdapter.kt had to have the "open" modifier added since these functions were being overridden in MonthByWeekAdapter.kt. Test: manual - build tests, unit tests, and CTS tests were conducted using the following commands: $ make Calendar $ make CalendarTests -j $ adb install -r -t -d out/target/product/bonito/ testcases/CalendarTests/arm64/CalendarTests.apk Success $ 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.141 OK (22 tests) General CTS Tests: $ tools/cts-tradefed cts-tf > run cts -m CtsProviderTestCases ================= Results ================== =============== Consumed Time ============== arm64-v8a CtsProviderTestCases: 7m 48s Total aggregated tests run time: 7m 48s ============== TOP 1 Slow Modules ============== arm64-v8a CtsProviderTestCases: 0.80 tests/sec [376 tests / 468191 msec] ============== Modules Preparation Times ============== arm64-v8a CtsProviderTestCases => prep = 9130 ms || clean = 2088 ms Total preparation time: 9s || Total tear down time: 2s ======================================================= =============== Summary =============== Total Run time: 9m 30s 1/1 modules completed Total Tests : 376 PASSED : 362 FAILED : 0 IGNORED : 6 ASSUMPTION_FAILURE: 8 ============== End of Results ============== Change-Id: Ia0fa3cebf53983c3915ed668c9a2f7a570826738
2021-07-09AOSP/Calendar - Initial conversion of MonthByWeekAdapterDamian Patel
and SimpleWeeksAdapter This is how Android Studio's built-in converter converted MonthByWeekAdapter.java and SimpleWeeksAdapter.java to Kotlin without any additional edits. Change-Id: Ic727bcfd5bef2b1e70dc6c96ddea398b881ad5ec
2021-07-09AOSP/Calendar - Copy of MonthByWeekAdapter.javaDamian Patel
and SimpleWeeksAdapter.java The Java code in MonthByWeekAdapter.java and SimpleWeeksAdapter.java has been copied into corresponding .kt files. Test: manual - opening both .java and .kt shows that they are identical. Change-Id: Ifda8edf7caf80084c45265ecf4a57de5fa62fbdc
2021-07-08AOSP/Calendar - EventInfoFragment fully converted with bp fileDamian Patel
This is the fully converted and touched-up Kotlin file after the converter was run once. All import statements were properly imported form the original Java file; however, there was one static import from the CalendarController class that did not translate correctly. Since CalendarController has already been converted to Kotlin, all static members are within a companion object, thus we must import "CalendarController.Companion" in order to have access to the static members of the class. Moreover, it seems that the "findViewById()" method was causing Kotlin build errors because the compiler could not infer generic type 'T', which is the return type of the aforementioned method according to android documentation. To solve this, the method must be called as: "findViewById<View>()" where "View" may be replaced with the type of the variable invoking the method. Apart from these issues, the "override" modifier had to be manually added, and certain object references had to be made nullable. Test: manual - build tests, unit tests, and CTS tests were conducted using the following commands: $ make Calendar $ make CalendarTests -j $ adb install -r -t -d out/target/product/bonito/ testcases/CalendarTests/arm64/CalendarTests.apk Success $ 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.164 OK (22 tests) General CTS Tests: $ tools/cts-tradefed cts-tf > run cts -m CtsProviderTestCases ================= Results ================== =============== Consumed Time ============== arm64-v8a CtsProviderTestCases: 8m 30s Total aggregated tests run time: 8m 30s ============== TOP 1 Slow Modules ============== arm64-v8a CtsProviderTestCases: 0.74 tests/sec [376 tests / 510540 msec] ============== Modules Preparation Times ============== arm64-v8a CtsProviderTestCases => prep = 6766 ms || clean = 2089 ms Total preparation time: 6s || Total tear down time: 2s ======================================================= =============== Summary =============== Total Run time: 10m 10s 1/1 modules completed Total Tests : 376 PASSED : 362 FAILED : 0 IGNORED : 6 ASSUMPTION_FAILURE: 8 ============== End of Results ============== Change-Id: Ia71f2cd9d30d38b4b1882c07b4fc2e380d457062
2021-07-08AOSP/Calendar - Initial Conversion of EventInfoFragmentDamian Patel
This is how Android Studio's built-in converter converted EventInfoFragment.java to Kotlin without any additional edits. Change-Id: I047a566b7784475933c7db94823ce7affaabc25e
2021-07-08AOSP/Calendar - Copy of EventInfoFragment.javaDamian Patel
The Java code in Event EventInfoFragment.java has been copied into a corresponding .kt file. Test: manual - opening both files shows that they are identical. Change-Id: I49c7240ba4ea471d7cc0fae53f402dfaf29b73c8
2021-07-08Merge changes from topic "DayView"Treehugger Robot
* changes: AOSP/Calendar - DayView fully converted with bp file AOSP/Calendar - Initial Conversion of DayView AOSP/Calendar - Copy of DayView.java
2021-07-03AOSP/Calendar - DayView fully converted with bp fileDamian Patel
This is the fully converted and touched-up Kotlin file after the converted was run once. Only one import statement was translated over to the converted file. The rest were deleted. Moreover, the "override" modifier had to be manually added various times to avoid compilation errors. There were also many type mismatches that had to corrected to allow Calendar to successfully build. Regarding runtime errors, a null pointer exception that was causing the Calendar app to crash was corrected by making a certain variables nullable. The converter also seemed to automatically cast certain numberical types with the "as" keyword. For example, "as Long" and "as Int" were the source of other runtime exceptions that caused the app to crash. Invoking ".toInt()" and "toLong()" corrected this issue. A few minor tweaks had to made to DayFragment in order to accommodate for the changes made in DayView. Test: manual - build tests, unit tests, and CTS tests were conducted using the following commands: $ make Calendar $ make CalendarTests -j $ adb install -r -t -d out/target/product/bonito/ testcases/CalendarTests/arm64/CalendarTests.apk Success $ 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.157 General CTS Tests: $ tools/cts-tradefed cts-tf > run cts -m CtsProviderTestCases ================= Results ================== =============== Consumed Time ============== arm64-v8a CtsProviderTestCases: 6m 14s Total aggregated tests run time: 6m 14s ============== TOP 1 Slow Modules ============== arm64-v8a CtsProviderTestCases: 1.01 tests/sec [376 tests / 374028 msec] ============== Modules Preparation Times ============== arm64-v8a CtsProviderTestCases => prep = 12179 ms || clean = 2877 ms Total preparation time: 12s || Total tear down time: 2s ======================================================= =============== Summary =============== Total Run time: 8m 6s 1/1 modules completed Total Tests : 376 PASSED : 362 FAILED : 0 IGNORED : 6 ASSUMPTION_FAILURE: 8 ============== End of Results ============== Change-Id: Ieaf65157b9b748b7a9f540edc0922bb6fabae949
2021-07-03AOSP/Calendar - Initial Conversion of DayViewDamian Patel
This is how Android Studio's built-in converter converted DayView.java to Kotlin without any additional edits. Change-Id: Icc9a779706d9962b2edd4975d1df2b209cb9dea0
2021-07-03AOSP/Calendar - Copy of DayView.javaDamian Patel
The Java code in DayView.java has been copied into a corresponding .kt file. Test: manual - opening both .java and .kt files shows that both are identical. Change-Id: Iff918c5b12a25a124fe8498a7a5e631500ec55a7
2021-07-03Merge changes from topic "CalendarAppWidgetService"Treehugger Robot
* changes: AOSP/Calendar - CalendarAppWidgetService fully converted with bp file AOSP/Calendar - Initial conversion of CalendarAppWidgetService AOSP/Calendar - Copy of CalendarAppWidgetService.java
2021-07-02AOSP/Calendar - CalendarAppWidgetService fully converted with bp fileDamian Patel
This is the fully converted and touched-up Kotlin file after the automatic converter was run. The converter failed to assign certain variables to be nullable and even did not add the "override" modifier. One interesting issue was the "buildAppWidgetModel()" static method whose static visibility was failing compilation and unit tests. The fix to this was to add the "internal" modifier to the companion object that stored the JVM static methods in Kotlin. Test: manual - build tests, unit tests, and CTS tests were conducted using the following commands: $ make Calendar $ make CalendarTests -j $ adb install -r -t -d out/target/product/bonito/ testcases/CalendarTests/arm64/CalendarTests.apk Success $ 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.202 OK (22 tests) General CTS Tests: $ tools/cts-tradefed cts-tf > run cts -m CtsProviderTestCases ================= Results ================== =============== Consumed Time ============== arm64-v8a CtsProviderTestCases: 7m 44s Total aggregated tests run time: 7m 44s ============== TOP 1 Slow Modules ============== arm64-v8a CtsProviderTestCases: 0.81 tests/sec [376 tests / 464727 msec] ============== Modules Preparation Times ============== arm64-v8a CtsProviderTestCases => prep = 6929 ms || clean = 2179 ms Total preparation time: 6s || Total tear down time: 2s ======================================================= =============== Summary =============== Total Run time: 9m 14s 1/1 modules completed Total Tests : 376 PASSED : 362 FAILED : 0 IGNORED : 6 ASSUMPTION_FAILURE: 8 ============== End of Results ============== Change-Id: Ic23ffc6c4db458574d417751f531d17cec8723c4
2021-07-02AOSP/Calendar - Initial conversion of CalendarAppWidgetServiceDamian Patel
This is how Android Studio's built in converter converted CalendarAppWidgetService.java to Kotlin without any additional edits. Change-Id: I9746433948abd781d74ee957f7485d24a1f9321b
2021-07-02AOSP/Calendar - Copy of CalendarAppWidgetService.javaDamian Patel
The Java code in CalendarAppWidgetSerivce.java has been copied into a corresponding .kt file. Test: manual - opening both files shows that they are identical. Change-Id: I7f46bd71e83c1cc16faa99193511dd8b5f3abc35
2021-07-01Merge changes from topic "CalendarAppWidgetProvider"Treehugger Robot
* changes: AOSP/Calendar - CalendarAppWidgetProvider fully converted with bp file AOSP/Calendar - Initial Conversion of CalendarAppWidgetProvider AOSP/Calendar - Copy of CalendarAppWidgetProvider.java
2021-07-01Merge changes from topic "AllInOneActivity"Treehugger Robot
* changes: AOSP/Calendar - AllInOneActivity fully converted with bp file AOSP/Calendar - Initial Conversion of AllInOneActivity AOSP/Calendar - Copy of AllInOneActivity.java
2021-07-01AOSP/Calendar - AllInOneActivity fully converted with bp fileDamian Patel
This is the fully converted and touched-up Kotlin file after the automatic converter was run. I decided to tweak CalendarController as well so that Int is used in the place of the deprecated Integer type. The override modifier had to be added manually. Moreover, the converter did not make certain variables and parameters nullable which caused both compile and runtime errors. For instance, the parameter "Object" had to be changed to "Any?" in order to avoid a null pointer exception that caused the app to crash upon opening. Furthermore, I came the realization that casting from Float to Int cannot be done using the "as Int" expression; instead, invoking the ".toInt()" function is necessary to avoid casting exceptions. Test: manual - build tests, unit tests, and CTS tests were conducted using the following commands: $ make Calendar $ make CalendarTests -j $ adb install -r -t -d out/target/product/bonito/ testcases/CalendarTests/arm64/CalendarTests.apk Success $ 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.21 OK (22 tests) General CTS Tests: $ tools/cts-tradefed cts-tf > run cts -m CtsProviderTestCases ================= Results ================== =============== Consumed Time ============== arm64-v8a CtsProviderTestCases: 17m 53s Total aggregated tests run time: 17m 53s ============== TOP 1 Slow Modules ============== arm64-v8a CtsProviderTestCases: 0.35 tests/sec [376 tests / 1073330 msec] ============== Modules Preparation Times ============== arm64-v8a CtsProviderTestCases => prep = 8936 ms || clean = 2335 ms Total preparation time: 8s || Total tear down time: 2s ======================================================= =============== Summary =============== Total Run time: 19m 36s 1/1 modules completed Total Tests : 376 PASSED : 362 FAILED : 0 IGNORED : 6 ASSUMPTION_FAILURE: 8 ============== End of Results ============== Change-Id: I83f47550fd74764e8d24bb55e54ca764d6bc808b
2021-07-01AOSP/Calendar - Initial Conversion of AllInOneActivityDamian Patel
This is how the automatic converter, built into Android Studio, converted AllInOneActivity.java to Kotlin. Change-Id: I8dc8b9a47c66ac6482eb771fc940d39836114875
2021-07-01AOSP/Calendar - Copy of AllInOneActivity.javaDamian Patel
The Java code in AllInOneActivity.java has been copied into a corresponding .kt file. Test: manual - opening both files shows that they are identical. Change-Id: Ie99a3056d89f2b285fe4fd4d0b5729680c97f24f
2021-06-30AOSP/Calendar - CalendarAppWidgetProvider fully converted with bp fileDamian Patel
This is the fully converted and touched-up Kotlin file after the automatic converter was run. Apart from the "override" modifier being added to the correct methods, a few object references had to be casted to their non-nullable type to satisfy certain function parameters. Test: manual - build tests, unit tests, and CTS tests were conducted using the following commands: $ make Calendar $ make CalendarTests -j $ adb install -r -t -d out/target/product/bonito/ testcases/CalendarTests/arm64/CalendarTests.apk Success $ 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.162 OK (22 tests) General CTS Tests: $ tools/cts-tradefed cts-tf > run cts -m CtsProviderTestCases ================= Results ================== =============== Consumed Time ============== arm64-v8a CtsProviderTestCases: 8m 48s Total aggregated tests run time: 8m 48s ============== TOP 1 Slow Modules ============== arm64-v8a CtsProviderTestCases: 0.71 tests/sec [376 tests / 528577 msec] ============== Modules Preparation Times ============== arm64-v8a CtsProviderTestCases => prep = 7044 ms || clean = 2096 ms Total preparation time: 7s || Total tear down time: 2s ======================================================= =============== Summary =============== Total Run time: 10m 15s 1/1 modules completed Total Tests : 376 PASSED : 362 FAILED : 0 IGNORED : 6 ASSUMPTION_FAILURE: 8 ============== End of Results ============== Change-Id: I3bd2f1f243a0af10191f77a8985485add8b2ee09
2021-06-30AOSP/Calendar - Initial Conversion of CalendarAppWidgetProviderDamian Patel
This is how the automatic converter, built into Android Studio, converted CalendarAppWidgetProvider.java to Kotlin. Change-Id: I344d4c05c38f4199aad8cfef59838cb6d47625f1
2021-06-30AOSP/Calendar - Copy of CalendarAppWidgetProvider.javaDamian Patel
The Java code in CalendarAppWidgetProvider.java has been copied into a corresponding .kt file. Test: manual - opening both files shows that they are both identical. Change-Id: Ia6ea76cd2bee15247af3e8f2dc8cb66984fce399
2021-06-29Merge changes from topic "SimpleDayPickerFragment"Mahi Kolla
* changes: AOSP/Calendar - Add Kotlin code for SimpleDayPickerFragment.kt. Also uploaded corresponding Android.bp file AOSP/Calendar - Given the changes to SimpleDayPickerFragment.kt, these 3 other files had to be modified to fix build errors AOSP/Calendar - Initial conversion of SimpleDayPickerFragment as performed by Android Studio's automatic converter. AOSP/Calendar - Add Kotlin copy of SimpleDayPickerFragment.java
2021-06-29AOSP/Calendar - Add Kotlin code for SimpleDayPickerFragment.kt. Also ↵Mahi Kolla
uploaded corresponding Android.bp file A few functions required override modifiers and a few variable declarations to include nullability references. I also added @JvmField annotations to the instance variables in both classes. Because SimpleDayPickerFragment is a parent class, a few overriden methods were marked as "open" as opposed to "final". Test: manual (ran build and unit tests) and CTS testing suite $ source build/envsetup.sh $ lunch aosp_bonito-userdebug $ make Calendar $ adb install -r -d -t out/target/product/bonito/product/app/Calendar/Calendar.apk $ make CalendarTests -j $ adb install -r -d -t out/target/product/bonito/testcases/CalendarTests/arm64/CalendarTests.apk $ 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.148 OK (22 tests) CTS TESTING: $ tools/cts-tradefed cts-tf > run cts -m CtsProviderTestCases ============================================ ================= Results ================== =============== Consumed Time ============== arm64-v8a CtsProviderTestCases: 14m 1s Total aggregated tests run time: 14m 1s ============== TOP 1 Slow Modules ============== arm64-v8a CtsProviderTestCases: 0.45 tests/sec [376 tests / 841553 msec] ============== Modules Preparation Times ============== arm64-v8a CtsProviderTestCases => prep = 12894 ms || clean = 3057 ms Total preparation time: 12s || Total tear down time: 3s ======================================================= =============== Summary =============== Total Run time: 20m 22s 1/1 modules completed Total Tests : 376 PASSED : 362 FAILED : 0 IGNORED : 6 ASSUMPTION_FAILURE: 8 ============== End of Results ============== ============================================ Change-Id: I72d1ec3e631c9c79ebea306c72b857bdbbc8b5d3
2021-06-29AOSP/Calendar - Given the changes to SimpleDayPickerFragment.kt, these 3 ↵Mahi Kolla
other files had to be modified to fix build errors Test: none, must be merged with SimpleDayPickerFragment.kt changes to build and run tests Change-Id: I69fe87fdf4fceb8c459a2ec840c3f5feca4896aa
2021-06-29AOSP/Calendar - Initial conversion of SimpleDayPickerFragment as performed ↵Mahi Kolla
by Android Studio's automatic converter. Test: none, no functional change in this commit when merged with corresponding Kotlin conversion. Change-Id: If7951b07d8871c47bd9cbc1417f5ffcbaf45174d
2021-06-29AOSP/Calendar - Add Kotlin copy of SimpleDayPickerFragment.javaMahi Kolla
Test: none, no functional change in this commit when merged with corresponding Kotlin conversion. Change-Id: Ib6921677f4b7bb13d60c17fc359275a58c13a185
2021-06-29Merge changes from topic "MonthByWeekFragment"Treehugger Robot
* changes: AOSP/Calendar - MonthByWeekFragment fully converted with bp file AOSP/Calendar - Inital conversion of MonthByWeekFragment AOSP/Calendar - Copy of MonthByWeekFragment.java
2021-06-28AOSP/Calendar - MonthByWeekFragment fully converted with bp fileDamian Patel
This is the fully touched-up converted Kotlin file after the first instance of Android Studio's automatic converter was run. The override modifier had to had to be manually added and certain object references had to made nullable to avoid runtime errrors. Test: manual - build tests, unit tests, and CTS tests were conducted using the following commands: $ make Calendar $ make CalendarTests -j $ adb install -r -t -d out/target/product/bonito/ testcases/CalendarTests/arm64/CalendarTests.apk Success $ 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.166 OK (22 tests) General CTS Tests: $ tools/cts-tradefed cts-tf > run cts -m CtsProviderTestCases ================= Results ================== =============== Consumed Time ============== arm64-v8a CtsProviderTestCases: 8m 5s Total aggregated tests run time: 8m 5s ============== TOP 1 Slow Modules ============== arm64-v8a CtsProviderTestCases: 0.77 tests/sec [376 tests / 485544 msec] ============== Modules Preparation Times ============== arm64-v8a CtsProviderTestCases => prep = 9497 ms || clean = 2144 ms Total preparation time: 9s || Total tear down time: 2s ======================================================= =============== Summary =============== Total Run time: 11m 10s 1/1 modules completed Total Tests : 376 PASSED : 362 FAILED : 0 IGNORED : 6 ASSUMPTION_FAILURE: 8 ============== End of Results ============== Change-Id: I51838ac07c68c7360ee0368a55b152814669d350
2021-06-28AOSP/Calendar - Inital conversion of MonthByWeekFragmentDamian Patel
This is how the automatic converter built into Android Studio converted MonthByWeekFragment.java to Kotlin. Change-Id: If269640b19e6b0c9381246d4ed34cffe49e1457a
2021-06-28AOSP/Calendar - Copy of MonthByWeekFragment.javaDamian Patel
The Java code in MonthByWeekFragment.java has been copied into a corresponding .kt file. Test: manual - opening both files shows that they are identical. Change-Id: I6d2ab8bfa5961f759a06022e73bdd23aee1d036f
2021-06-28Merge "AOSP/Calendar - Month View Bug Fix"Raman Tenneti
2021-06-26Merge changes from topic "CalendarAppWidgetModel"Treehugger Robot
* changes: AOSP/Calendar - CalendarAppWidgetModel fully converted with bp file AOSP/Calendar - Copy of CalendarAppWidgetModel.java
2021-06-26AOSP/Calendar - Month View Bug FixDamian Patel
Prior to this change, clicking on a certain day in the month viewer would bring the user to a random day in November in 1956. This change resolves this issue. I believe that the elimination of the firstJulianDay variable has fixed this issue. Test: manual - open the AOSP Calendar app --> go into the month view --> click on a particular day --> ensure that the day viewer you've now entered has the accurate day, month, and year. Change-Id: Ib3b8a93be8e7b44d2f158b48ddf36aa2283672ca
2021-06-25AOSP/Calendar - CalendarAppWidgetModel fully converted with bp fileDamian Patel
Using Android Studio, CalendarAppWidgetModel.java has been fully converted to Kotlin. The only real issue that I ran into dealt with the visibility of some instance fields after the conversion. This was corrected by adding the @JvmField annotation beside each instance field. Another small correction that had to be made was the substitution of ::class for .getClass() since .getClass() is an unresolved function in Kotlin. Test: manual - build tests, unit tests, and CTS tests were conducted using the following commands: $ make Calendar $ make CalendarTests -j $ adb install -r -t -d out/target/product/bonito/ testcases/CalendarTests/arm64/CalendarTests.apk Success $ 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.161 OK (22 Tests) General CTS Tests: $ tools/cts-tradefed cts-tf > run cts -m CtsProviderTestCases ================= Results ================== =============== Consumed Time ============== arm64-v8a CtsProviderTestCases: 6m 24s Total aggregated tests run time: 6m 24s ============== TOP 1 Slow Modules ============== arm64-v8a CtsProviderTestCases: 0.98 tests/sec [376 tests / 384855 msec] ============== Modules Preparation Times ============== arm64-v8a CtsProviderTestCases => prep = 9299 ms || clean = 3246 ms Total preparation time: 9s || Total tear down time: 3s ======================================================= =============== Summary =============== Total Run time: 8m 16s 1/1 modules completed Total Tests : 376 PASSED : 362 FAILED : 0 IGNORED : 6 ASSUMPTION_FAILURE: 8 ============== End of Results ============== Change-Id: I898c10d7662fba1c9ec0d190194d8d135294ce0f
2021-06-25Merge "AOSP/Calendar - Runtime error fix"Treehugger Robot
2021-06-25AOSP/Calendar - Copy of CalendarAppWidgetModel.javaDamian Patel
The Java code in CalendarAppWidgetModel.java has been copied into a corresponding .kt file. Test: manual - opening both .java and .kt files shows that both are identical. Change-Id: I6c4253e5b949b500805a319f5d06d6fce591a249
2021-06-25AOSP/Calendar - Runtime error fixDamian Patel
In SimpleWeekView.kt, there were various occurrences where Int was being casted a Float instead of being parsed with .toFloat(). Without this change, the app would crash upon selecting the "Month" view. Change-Id: I6a89b864562fa380ee05d272233cb9c21b5075c3
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-31 00:33:02 +0000