| Age | Commit message (Collapse) | Author |
|---|
|
Bug: 205056467
Merged-In: I39bc668a5671cce94372063246c13bc09dd569fa
Change-Id: Ic5d56619c6d4baea7610bfe80293cb8616acbd47
|
|
Deleted closeNotificationShade method thus not invoking ACTION_CLOSE_SYSTEM_DIALOGS intent.
Making same changes as java from https://googleplex-android-review.git.corp.google.com/c/platform/packages/apps/Calendar/+/15845189
Test: are done in ag/15845189 and on aosp-master
Bug: 190403923
Bug: 201673759
Change-Id: I39bc668a5671cce94372063246c13bc09dd569fa
(cherry picked from commit 21ea50b26386b3a68db5fef6f8d2519db596debf)
|
|
am skip reason: skipped by user rtenneti
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/15831943
Change-Id: Ib053fcc18961da9e00709d2bb26c99518abb3f2c
|
|
AOSP/Calendar - Fix closing of system dialogs broadcast without permission.
Deleted closeNotificationShade method thus not invoking ACTION_CLOSE_SYSTEM_DIALOGS intent.
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/product/app/Calendar/Calendar.apk
Success
$ adb install -r -t -d out/target/product/bonito/testcases/CalendarTests/arm64/CalendarTests.apk
Success
$ adb shell am instrument -w com.android.calendar.tests
General CTS Tests:
$ tools/cts-tradefed
cts-tf > run cts -m CtsProviderTestCases
The following CTS test results are same as before the change:
================= Results ==================
=============== Consumed Time ==============
arm64-v8a CtsProviderTestCases: 15m 17s
Total aggregated tests run time: 15m 17s
============== TOP 1 Slow Modules ==============
arm64-v8a CtsProviderTestCases: 0.41 tests/sec [376 tests / 917885 msec]
============== Modules Preparation Times ==============
arm64-v8a CtsProviderTestCases => prep = 4124 ms || clean = 1569 ms
Total preparation time: 4s || Total tear down time: 1s
=======================================================
=============== Summary ===============
Total Run time: 16m 48s
1/1 modules completed
Total Tests : 376
PASSED : 362
FAILED : 0
IGNORED : 6
ASSUMPTION_FAILURE: 8
============== End of Results ==============
.../bug_190403923$ adb install -r -t -d ./poc.apk
Performing Streamed Install
Success
.../bug_190403923$ adb shell am start -n com.example.poc/.MainActivity
Starting: Intent { cmp=com.example.poc/.MainActivity }
.../bug_190403923$ adb logcat -d | grep AutofillManagerService
Bug: 190403923
Change-Id: I47f3c5845d960c1f7515282af4b757b0b9e9ae8e
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1768565
Change-Id: I43181ebbd8b9cff17a34dd7de569be1d8b5fbc10
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1768565
Change-Id: Ia90b6c0b0c612b9113d55e6bc0649a322f4dc393
|
|
|
|
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
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1764567
Change-Id: I141fb5b8f09af2419c621d9b2587fb946a082069
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1764567
Change-Id: Ib24a11af59e975d47d0cab65251595bd19f2e0c6
|
|
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1765265
Change-Id: Icec593eb6bd96e83955c12b36068b179aaf9a2b7
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1765265
Change-Id: I86b4c29622800c914c93cb41d9595647f01d267f
|
|
|
|
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
|
|
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
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1763591
Change-Id: I29ba8cd7809ab44217d18115b95b70c236a0ff66
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1763591
Change-Id: I723a77096c8112f8d895ccb75256f8cf1698ad3c
|
|
* 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
|
|
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
|
|
Android Studio's automatic converter.
Test: none, no functional change in this commit when merged with corresponding Kotlin conversion.
Change-Id: Ie0face86c3e53b34b14785e248d894c2ebaa82a8
|
|
Test: none, no functional change in this commit when merged with corresponding Kotlin conversion.
Change-Id: I4d956b5f0ae5f983ac30d09e01b55ff3a75bd606
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1761887
Change-Id: I20411966b3ed93034b0b3cd4513cb61caec8e10d
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1761887
Change-Id: I86aa3e4835b6c9c3853fb92ca864eae5f1429c0d
|
|
* 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
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1760908
Change-Id: Ie765a8ee68aa6017f72497cd11ba17fc5516c13f
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1760908
Change-Id: I924f6504f7faf441f5f744c303a51e878df1c54b
|
|
* changes:
AOSP/Calendar - EventInfoFragment fully converted with bp file
AOSP/Calendar - Initial Conversion of EventInfoFragment
AOSP/Calendar - Copy of EventInfoFragment.java
|
|
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
|
|
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
|
|
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
|
|
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
|
|
This is how Android Studio's built-in converter
converted EventInfoFragment.java to Kotlin without
any additional edits.
Change-Id: I047a566b7784475933c7db94823ce7affaabc25e
|
|
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
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1755671
Change-Id: I73a08e09278b0343b134763771125b0e521ec5d0
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1755671
Change-Id: I087a9534ec88eb8d9a06635e84a177e24a74e7fc
|
|
* changes:
AOSP/Calendar - DayView fully converted with bp file
AOSP/Calendar - Initial Conversion of DayView
AOSP/Calendar - Copy of DayView.java
|
|
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
|
|
This is how Android Studio's built-in converter
converted DayView.java to Kotlin without any
additional edits.
Change-Id: Icc9a779706d9962b2edd4975d1df2b209cb9dea0
|
|
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
|
|
d9ace364ed
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1754291
Change-Id: Ic9e9d3072e1b012fb2355a4d39e7739da1445d6c
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1754291
Change-Id: If1cad3405b5d151eb1d72a9547e574bfe4ac073a
|
|
* changes:
AOSP/Calendar - CalendarAppWidgetService fully converted with bp file
AOSP/Calendar - Initial conversion of CalendarAppWidgetService
AOSP/Calendar - Copy of CalendarAppWidgetService.java
|
|
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
|
|
This is how Android Studio's built in converter
converted CalendarAppWidgetService.java to Kotlin
without any additional edits.
Change-Id: I9746433948abd781d74ee957f7485d24a1f9321b
|
|
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
|
|
98b0f36e15
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1753402
Change-Id: I669c789cbfbbcc217792da6e1cdfe89c14d00390
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1752403
Change-Id: Ic2cde6e110b1809e8916ca799efad15264f65d51
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1753402
Change-Id: I24278609dc7108d35da11a121731bd461cfd1ad1
|
|
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1752403
Change-Id: Ia190743f33dffbd8ea30fc24b5de5acccec69051
|
