DeskClock: Squashed AOSP changes before java app was removed.
* This includes all the java changes that were made to DeskClock during the conversion to kotlin. Squash of the following: AOSP/DeskClock - Add Kotlin code for alarmclock/ files Test: none currently, DeskClockKotlin target builds successfully, testing is a work in progress BUG: 157255731 Original-Change-Id: I4c245d209ac733c4fb5ec527bc9ed84444b8cbd6 AOSP/DeskClock - Add Kotlin file for DataModel Test: manual - Ran the following on Sargo phone. Tested all app interactions (alarms, stopwatch, timer, cities, settings). $ source build/envsetup.sh $ lunch aosp_sargo-userdebug $ make DeskClockKotlin -j $ adb install out/target/product/sargo/product/app/DeskClockKotlin/DeskClockKotlin.apk BUG: 157255731 Original-Change-Id: I2fe53bbdddc9f473ece01bacb386e9ad08efcdc7 AOSP/DeskClock - Add Kotlin file for RingtonePickerActivity Test: manual testing by running the following (1) on Sargo phone and testing the UI, also unit tests ran as follows (2) (1) $ source build/envsetup.sh $ lunch aosp_sargo-userdebug $ make DeskClockKotlin -j $ adb install out/target/product/sargo/product/app/DeskClockKotlin/DeskClockKotlin.apk (2) $ make DeskClockTests $ adb install out/target/product/sargo/testcases/DeskClockTests/arm64/DeskClockTests.apk $ adb shell am instrument -w com.android.deskclock.tests BUG: 157255731 Original-Change-Id: I1eff3fe6e19a19aa35c6fbda541bce72b369b6ae AOSP/DeskClock - Add Kotlin files for TimerService, SetupView, Receiver Additionally, a small bug was fixed in the TimerModel and DataModel Kotlin code (found by new unit tests). Test: manual, ensuring the DeskClock UI is correct, also unit tests were run as follows $ source build/envsetup.sh $ lunch aosp_sargo-userdebug $ make DeskClockKotlin -j $ adb install out/target/product/sargo/product/app/DeskClockKotlin/DeskClockKotlin.apk $ make DeskClockTests $ adb install out/target/product/sargo/testcases/DeskClockTests/arm64/DeskClockTests.apk $ adb shell am instrument -w com.android.deskclock.tests BUG: 157255731 Original-Change-Id: I82a4836ab55281a73168d35ea4f50d39279ce5da AOSP/DeskClock - Add Kotlin files for Timer classes Test: manual, ensuring the DeskClock UI and Timers function correctly, as well as unit tests, ran as follows $ source build/envsetup.sh $ lunch aosp_sargo-userdebug $ make DeskClockKotlin -j $ adb install out/target/product/sargo/product/app/DeskClockKotlin/DeskClockKotlin.apk $ make DeskClockTests $ adb install out/target/product/sargo/testcases/DeskClockTests/arm64/DeskClockTests.apk $ adb shell am instrument -w com.android.deskclock.tests BUG: 157255731 Original-Change-Id: Idb33290c6bf11ee6147f547c85b5f6e3859c17b7 AOSP/DeskClock - Add Kotlin file for ExpiredTimersActivity Test: manual, tested the DeskClock UI including running timers to expiration. Also ran the unit tests as follows $ source build/envsetup.sh $ lunch aosp_sargo-userdebug $ make DeskClockKotlin $ adb install out/target/product/sargo/product/app/DeskClockKotlin/DeskClockKotlin.apk $ make DeskClockTests $ adb install out/target/product/sargo/testcases/DeskClockTests/arm64/DeskClockTests.apk $ adb shell am instrument -w com.android.deskclock.tests BUG: 157255731 Original-Change-Id: I93ec96bae36dc353c0c252c0ef6769965a7172e7 AOSP/DeskClock - Add Kotlin file for TimerFragment Test: manual, tested the DeskClock UI and Timers specifically. As well, unit tests were ran as follows $ source build/envsetup.sh $ lunch aosp_sargo-userdebug $ make DeskClockKotlin $ adb install out/target/product/sargo/product/app/DeskClockKotlin/DeskClockKotlin.apk $ make DeskClockTests $ adb install out/target/product/sargo/testcases/DeskClockTests/arm64/DeskClockTests.apk $ adb shell am instrument -w com.android.deskclock.tests BUG: 157255731 Original-Change-Id: Ib3769584161d6e712a8eafde977f58b3c55f69e3 AOSP/DeskClock - Add Kotlin for FormattedStringModel, PeriodicCallbackModel Test: manual - Tested the DeskClock UI. As well, unit tests were ran as follows $ source build/envsetup.sh $ lunch aosp_sargo-userdebug $ make DeskClockKotlin $ adb install out/target/product/sargo/product/app/DeskClockKotlin/DeskClockKotlin.apk $ make DeskClockTests $ adb install out/target/product/sargo/testcases/DeskClockTests/arm64/DeskClockTests.apk $ adb shell am instrument -w com.android.deskclock.tests BUG: 157255731 Original-Change-Id: I7cc4fb5aa20cd32be51e65de1b2b6a12a7cfa795 AOSP/DeskClock - Add Kotlin for Tab related UI Data files Test: manual - Tested the DeskClock UI and tab interactions. As well, unit tests were run as follows $ source build/envsetup.sh $ lunch aosp_sargo-userdebug $ make DeskClockKotlin $ adb install out/target/product/sargo/product/app/DeskClockKotlin/DeskClockKotlin.apk $ make DeskClockTests $ adb install out/target/product/sargo/testcases/DeskClockTests/arm64/DeskClockTests.apk $ adb shell am instrument -w com.android.deskclock.tests` BUG: 157255731 Original-Change-Id: Ibd7871edf20e548a1cd548246f0a6be88f5cfb88 AOSP/DeskClock - Add Kotlin file for CitySelectionActivity Test: manual - tested DeskClock UI. As well, tests were run as follows $ source build/envsetup.sh $ lunch aosp_sargo-userdebug $ make DeskClockKotlin $ adb install out/target/product/sargo/product/app/DeskClockKotlin/DeskClockKotlin.apk $ atest DeskClockTests BUG: 157255731 Original-Change-Id: I3bd0952f753130e655d1b9f3c911863f34e6e41a AOSP/DeskClock - Add Kotlin files for BaseActivity, CircleButtonsLayout Test: manual - Tested the DeskClock UI. As well, tests were run as follows $ source build/envsetup.sh $ lunch aosp_sargo-userdebug $ make DeskClockKotlin $ adb install out/target/product/sargo/product/app/DeskClockKotlin/DeskClockKotlin.apk $ atest DeskClockTests BUG: 157255731 Original-Change-Id: I019825f173305756633389a26a0bb0e973f2172c AOSP/DeskClock - Add Kotlin file for DeskClock class The onNewIntent call in TimerFragmentTest was changed to setIntent since the visibility of the protected onNewIntent method in Kotlin was more restrictive than before. Test: manual - Tested the DeskClock UI. As well tests were ran as follows $ source build/envsetup.sh $ lunch aosp_sargo-userdebug $ make DeskClockKotlin $ adb install out/target/product/sargo/product/app/DeskClockKotlin/DeskClockKotlin.apk $ atest DeskClockTests BUG: 157255731 Original-Change-Id: I9711dd8068a29fc0a25ee1f364ecb1b6ef326d6a Change-Id: I3d63f95cffc257734f803683d477bf3ecf88f208
Loading
Please register or sign in to comment