From d6e0b0dfa3c4c73046885b313ddd381f387ba3cb Mon Sep 17 00:00:00 2001 From: "DESKTOP-H6K4R8U\\Zibi" Date: Wed, 26 Jun 2024 13:17:00 +0100 Subject: [PATCH 1/4] To Kotlin --- car_app_library/.gitignore | 16 + car_app_library/build.gradle | 47 -- car_app_library/build.gradle.kts | 6 + car_app_library/buildSrc/.gitignore | 2 + car_app_library/buildSrc/build.gradle.kts | 22 + car_app_library/buildSrc/settings.gradle.kts | 37 ++ .../gradlePlugins/AndroidApplicationPlugin.kt | 64 ++ .../gradlePlugins/AndroidLibraryPlugin.kt | 66 ++ .../buildSrc/src/main/kotlin/versions.kt | 11 + car_app_library/gradle.properties | 52 +- .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes .../gradle/wrapper/gradle-wrapper.properties | 8 + car_app_library/gradlew | 185 ++++++ car_app_library/gradlew.bat | 89 +++ .../helloworld/automotive/.gitignore | 1 + .../helloworld/automotive/build.gradle | 50 -- .../helloworld/automotive/build.gradle.kts | 21 + .../helloworld/common/build.gradle | 50 -- .../helloworld/common/HelloWorldScreen.java | 45 -- .../helloworld/common/HelloWorldService.java | 65 -- .../common/HelloWorldScreenTest.java | 54 -- .../common/HelloWorldSessionTest.java | 66 -- car_app_library/helloworld/mobile/.gitignore | 1 + .../helloworld/mobile/build.gradle | 52 -- .../helloworld/mobile/build.gradle.kts | 19 + car_app_library/helloworld/shared/.gitignore | 1 + .../helloworld/shared/build.gradle.kts | 13 + .../src/main/AndroidManifest.xml | 0 .../helloworld/common/HelloWorldScreen.kt | 39 ++ .../helloworld/common/HelloWorldService.kt | 55 ++ .../src/main/res/drawable/ic_launcher.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/xml/automotive_app_desc.xml | 0 .../helloworld/common/HelloWorldScreenTest.kt | 0 .../common/HelloWorldSessionTest.kt | 0 .../src/test/resources/robolectric.properties | 0 .../navigation/automotive/.gitignore | 1 + .../navigation/automotive/build.gradle | 52 -- .../navigation/automotive/build.gradle.kts | 21 + .../navigation/common/build.gradle | 41 -- .../navigation/common/app/MainActivity.java | 132 ---- .../common/car/FavoritesScreen.java | 144 ---- .../common/car/MicrophoneRecorder.java | 256 -------- .../common/car/NavigationCarAppService.java | 123 ---- .../common/car/NavigationScreen.java | 343 ---------- .../common/car/NavigationSession.java | 331 ---------- .../common/car/RequestPermissionScreen.java | 83 --- .../common/car/RoutePreviewScreen.java | 123 ---- .../common/car/SearchResultsScreen.java | 125 ---- .../navigation/common/car/SearchScreen.java | 130 ---- .../navigation/common/car/SettingsScreen.java | 102 --- .../common/car/SurfaceRenderer.java | 406 ------------ .../navigation/common/model/DemoScripts.java | 578 ---------------- .../navigation/common/model/Instruction.java | 285 -------- .../navigation/common/model/Script.java | 77 --- .../common/nav/NavigationService.java | 584 ----------------- car_app_library/navigation/mobile/.gitignore | 1 + .../navigation/mobile/build.gradle | 52 -- .../navigation/mobile/build.gradle.kts | 19 + car_app_library/navigation/shared/.gitignore | 1 + .../navigation/shared/build.gradle.kts | 16 + .../src/main/AndroidManifest.xml | 0 .../navigation/common/app/MainActivity.kt | 127 ++++ .../navigation/common/car/FavoritesScreen.kt | 132 ++++ .../common/car/MicrophoneRecorder.kt | 248 +++++++ .../common/car/NavigationCarAppService.kt | 124 ++++ .../navigation/common/car/NavigationScreen.kt | 351 ++++++++++ .../common/car/NavigationSession.kt | 313 +++++++++ .../common/car/RequestPermissionScreen.kt | 72 ++ .../common/car/RoutePreviewScreen.kt | 116 ++++ .../common/car/SearchResultsScreen.kt | 111 ++++ .../navigation/common/car/SearchScreen.kt | 108 +++ .../navigation/common/car/SettingsScreen.kt | 96 +++ .../navigation/common/car/SurfaceRenderer.kt | 431 ++++++++++++ .../navigation/common/model/DemoScripts.kt | 523 +++++++++++++++ .../navigation/common/model/Instruction.kt | 170 +++++ .../navigation/common/model/PlaceInfo.kt} | 18 +- .../sample/navigation/common/model/Script.kt | 71 ++ .../common/nav/NavigationService.kt | 573 ++++++++++++++++ .../src/main/res/drawable/ic_add_stop.xml | 0 .../res/drawable/ic_favorite_white_24dp.xml | 0 .../src/main/res/drawable/ic_launcher.xml | 0 .../src/main/res/drawable/ic_mic.xml | 0 .../src/main/res/drawable/ic_pan_24.xml | 0 .../src/main/res/drawable/ic_recenter_24.xml | 0 .../main/res/drawable/ic_roundabout_ccw.png | Bin .../main/res/drawable/ic_roundabout_cw.png | Bin .../main/res/drawable/ic_search_black36dp.png | Bin .../src/main/res/drawable/ic_settings.png | Bin .../main/res/drawable/ic_turn_destination.png | Bin .../main/res/drawable/ic_turn_fork_left.png | Bin .../main/res/drawable/ic_turn_fork_right.png | Bin .../drawable/ic_turn_merge_symmetrical.png | Bin .../main/res/drawable/ic_turn_name_change.png | Bin .../main/res/drawable/ic_turn_normal_left.png | Bin .../res/drawable/ic_turn_normal_right.png | Bin .../main/res/drawable/ic_turn_sharp_left.png | Bin .../main/res/drawable/ic_turn_sharp_right.png | Bin .../main/res/drawable/ic_turn_slight_left.png | Bin .../res/drawable/ic_turn_slight_right.png | Bin .../main/res/drawable/ic_turn_u_turn_left.png | Bin .../res/drawable/ic_turn_u_turn_right.png | Bin .../src/main/res/drawable/ic_zoom_in_24.xml | 0 .../src/main/res/drawable/ic_zoom_out_24.xml | 0 .../src/main/res/drawable/junction_image.png | Bin .../src/main/res/drawable/lanes.png | Bin .../src/main/res/drawable/map.png | Bin .../src/main/res/layout/activity_main.xml | 0 .../src/main/res/raw-es/turn_right.m4a | Bin .../src/main/res/raw-pt/turn_right.m4a | Bin .../src/main/res/raw/turn_right.m4a | Bin .../src/main/res/values/colors.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/xml/automotive_app_desc.xml | 0 car_app_library/places/automotive/.gitignore | 1 + .../places/automotive/build.gradle | 49 -- .../places/automotive/build.gradle.kts | 21 + car_app_library/places/common/build.gradle | 38 -- .../app/sample/places/common/Constants.java | 59 -- .../app/sample/places/common/Executors.java | 38 -- .../app/sample/places/common/ImageUtil.java | 58 -- .../common/PlaceCategoryListScreen.java | 132 ---- .../places/common/PlaceDetailsScreen.java | 276 -------- .../sample/places/common/PlaceListScreen.java | 233 ------- .../places/common/PlacesCarAppService.java | 72 -- .../common/RequestPermissionScreen.java | 83 --- .../sample/places/common/SearchScreen.java | 157 ----- .../app/sample/places/common/UiExecutor.java | 107 --- .../places/common/places/LocationUtil.java | 49 -- .../places/common/places/PlaceCategory.java | 46 -- .../places/common/places/PlaceDetails.java | 69 -- .../places/common/places/PlaceFinder.java | 254 ------- .../places/common/places/PlaceInfo.java | 70 -- car_app_library/places/mobile/.gitignore | 1 + car_app_library/places/mobile/build.gradle | 49 -- .../places/mobile/build.gradle.kts | 19 + car_app_library/places/shared/.gitignore | 1 + .../places/shared/build.gradle.kts | 14 + .../src/main/AndroidManifest.xml | 0 .../car/app/sample/places/common/Constants.kt | 52 ++ .../car/app/sample/places/common/Executors.kt | 35 + .../car/app/sample/places/common/ImageUtil.kt | 52 ++ .../places/common/PlaceCategoryListScreen.kt | 122 ++++ .../places/common/PlaceDetailsScreen.kt | 268 ++++++++ .../sample/places/common/PlaceListScreen.kt | 225 +++++++ .../places/common/PlacesCarAppService.kt | 68 ++ .../places/common/RequestPermissionScreen.kt | 72 ++ .../app/sample/places/common/SearchScreen.kt | 148 +++++ .../app/sample/places/common/UiExecutor.kt | 87 +++ .../places/common/places/LocationUtil.kt | 40 ++ .../places/common/places/PlaceCategory.kt} | 30 +- .../places/common/places/PlaceDetails.kt | 25 + .../places/common/places/PlaceFinder.kt | 259 ++++++++ .../sample/places/common/places/PlaceInfo.kt | 37 ++ .../src/main/res/drawable/ic_launcher.xml | 0 .../src/main/res/values/places_api_key.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/values/themes.xml | 0 .../src/main/res/xml/automotive_app_desc.xml | 0 car_app_library/settings.gradle.kts | 65 ++ .../showcase/automotive/.gitignore | 1 + .../showcase/automotive/build.gradle | 54 -- .../showcase/automotive/build.gradle.kts | 21 + car_app_library/showcase/automotive/lint.xml | 5 - .../showcase/automotive/proguard-rules.pro | 21 + .../automotive/ExampleInstrumentedTest.kt | 24 + .../showcase/automotive/DebugActivity.java | 57 -- .../showcase/automotive/DebugActivity.kt | 53 ++ .../res/drawable/ic_launcher_background.xml | 170 +++++ .../res/drawable/ic_launcher_foreground.xml | 30 + .../main/res/mipmap-anydpi/ic_launcher.xml | 6 + .../res/mipmap-anydpi/ic_launcher_round.xml | 6 + .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes .../src/main/res/values/strings.xml | 3 + .../automotive/src/main/res/values/themes.xml | 4 + .../showcase/automotive/ExampleUnitTest.kt | 17 + car_app_library/showcase/common/build.gradle | 40 -- .../common/SelectableListsDemoScreen.java | 144 ---- .../showcase/common/ShowcaseService.java | 70 -- .../showcase/common/ShowcaseSession.java | 162 ----- .../sample/showcase/common/StartScreen.java | 130 ---- .../common/TaskRestrictionDemoScreen.java | 176 ----- .../common/common/PlaceDetailsScreen.java | 116 ---- .../showcase/common/common/PlaceInfo.java | 47 -- .../showcase/common/common/SamplePlaces.java | 322 --------- .../sample/showcase/common/common/Utils.java | 68 -- .../common/misc/CarHardwareDemoScreen.java | 92 --- .../common/misc/CarHardwareInfoScreen.java | 275 -------- .../showcase/common/misc/ColorDemoScreen.java | 136 ---- .../common/misc/ContentLimitsDemoScreen.java | 84 --- .../showcase/common/misc/FinishAppScreen.java | 62 -- .../common/misc/LoadingDemoScreen.java | 76 --- .../showcase/common/misc/MiscDemoScreen.java | 117 ---- .../common/misc/NotificationDemoScreen.java | 361 ---------- .../showcase/common/misc/PopToDemoScreen.java | 77 --- .../common/misc/RequestPermissionScreen.java | 194 ------ .../misc/ReservationCancelledScreen.java | 51 -- .../common/misc/ResultDemoScreen.java | 73 --- .../MapTemplateWithListDemoScreen.java | 171 ----- .../MapTemplateWithPaneDemoScreen.java | 200 ------ .../navigation/NavigationDemosScreen.java | 123 ---- .../navigation/NavigationMapOnlyScreen.java | 50 -- .../NavigationNotificationService.java | 250 ------- .../NavigationNotificationsDemoScreen.java | 86 --- ...PlaceListNavigationTemplateDemoScreen.java | 103 --- .../navigation/RoutePreviewDemoScreen.java | 196 ------ .../navigation/routing/ArrivedDemoScreen.java | 56 -- .../routing/JunctionImageDemoScreen.java | 58 -- .../navigation/routing/LoadingDemoScreen.java | 43 -- .../routing/NavigatingDemoScreen.java | 53 -- .../routing/NavigationTemplateDemoScreen.java | 82 --- .../navigation/routing/RoutingDemoModels.java | 298 --------- .../common/renderer/CarHardwareRenderer.java | 549 ---------------- .../common/renderer/DefaultRenderer.java | 119 ---- .../common/renderer/SurfaceController.java | 145 ---- .../templates/GridTemplateDemoScreen.java | 267 -------- .../templates/ListTemplateDemoScreen.java | 125 ---- .../LongMessageTemplateDemoScreen.java | 96 --- .../templates/MessageTemplateDemoScreen.java | 100 --- .../templates/MiscTemplateDemosScreen.java | 103 --- .../templates/PaneTemplateDemoScreen.java | 166 ----- .../PlaceListTemplateBrowseDemoScreen.java | 129 ---- .../PlaceListTemplateDemoScreen.java | 46 -- .../templates/SearchTemplateDemoScreen.java | 87 --- .../templates/SignInTemplateDemoScreen.java | 356 ---------- .../ContentProviderIconsDemoScreen.java | 87 --- .../textandicons/DelayedFileProvider.java | 82 --- .../common/textandicons/IconsDemoScreen.java | 116 ---- .../common/textandicons/RowDemoScreen.java | 123 ---- .../textandicons/TextAndIconsDemosScreen.java | 73 --- car_app_library/showcase/mobile/.gitignore | 1 + car_app_library/showcase/mobile/build.gradle | 54 -- .../showcase/mobile/build.gradle.kts | 19 + .../showcase/mobile/proguard-rules.pro | 21 + .../showcase/ExampleInstrumentedTest.kt | 24 + .../app/sample/showcase/ExampleUnitTest.kt | 17 + car_app_library/showcase/shared/.gitignore | 1 + .../showcase/shared/build.gradle.kts | 13 + .../src/main/AndroidManifest.xml | 0 .../common/SelectableListsDemoScreen.kt | 167 +++++ .../sample/showcase/common/ShowcaseService.kt | 71 ++ .../sample/showcase/common/ShowcaseSession.kt | 149 +++++ .../app/sample/showcase/common/StartScreen.kt | 140 ++++ .../common/TaskRestrictionDemoScreen.kt | 198 ++++++ .../common/common/PlaceDetailsScreen.kt | 110 ++++ .../showcase/common/common/PlaceInfo.kt | 29 + .../showcase/common/common/SamplePlaces.kt | 375 +++++++++++ .../sample/showcase/common/common/Utils.kt | 69 ++ .../common/misc/CarHardwareDemoScreen.kt | 90 +++ .../common/misc/CarHardwareInfoScreen.kt | 245 +++++++ .../showcase/common/misc/ColorDemoScreen.kt | 174 +++++ .../common/misc/ContentLimitsDemoScreen.kt | 96 +++ .../showcase/common/misc/FinishAppScreen.kt | 52 ++ .../showcase/common/misc/LoadingDemoScreen.kt | 73 +++ .../showcase/common/misc/MiscDemoScreen.kt | 138 ++++ .../common/misc/NotificationDemoScreen.kt | 375 +++++++++++ .../showcase/common/misc/PopToDemoScreen.kt | 64 ++ .../common/misc/RequestPermissionScreen.kt | 192 ++++++ .../common/misc/ReservationCancelledScreen.kt | 43 ++ .../showcase/common/misc/ResultDemoScreen.kt | 69 ++ .../MapTemplateWithListDemoScreen.kt | 191 ++++++ .../MapTemplateWithPaneDemoScreen.kt | 208 ++++++ .../navigation/NavigationDemosScreen.kt | 139 ++++ .../navigation/NavigationMapOnlyScreen.kt | 44 ++ .../NavigationNotificationService.kt | 244 +++++++ .../NavigationNotificationsDemoScreen.kt | 77 +++ .../PlaceListNavigationTemplateDemoScreen.kt | 104 +++ .../navigation/RoutePreviewDemoScreen.kt | 225 +++++++ .../navigation/routing/ArrivedDemoScreen.kt | 53 ++ .../routing/JunctionImageDemoScreen.kt | 56 ++ .../navigation/routing/LoadingDemoScreen.kt | 35 + .../routing/NavigatingDemoScreen.kt | 47 ++ .../routing/NavigationTemplateDemoScreen.kt | 78 +++ .../navigation/routing/RoutingDemoModels.kt | 327 +++++++++ .../common/renderer/CarHardwareRenderer.kt | 619 ++++++++++++++++++ .../common/renderer/DefaultRenderer.kt | 133 ++++ .../showcase/common/renderer/Renderer.kt} | 26 +- .../common/renderer/SurfaceController.kt | 133 ++++ .../templates/GridTemplateDemoScreen.kt | 281 ++++++++ .../templates/ListTemplateDemoScreen.kt | 139 ++++ .../LongMessageTemplateDemoScreen.kt | 94 +++ .../templates/MessageTemplateDemoScreen.kt | 97 +++ .../templates/MiscTemplateDemosScreen.kt | 121 ++++ .../templates/PaneTemplateDemoScreen.kt | 167 +++++ .../PlaceListTemplateBrowseDemoScreen.kt | 131 ++++ .../templates/PlaceListTemplateDemoScreen.kt | 37 ++ .../templates/SearchTemplateDemoScreen.kt | 78 +++ .../templates/SignInTemplateDemoScreen.kt | 374 +++++++++++ .../templates/SignInWithGoogleActivity.kt} | 46 +- .../ContentProviderIconsDemoScreen.kt | 85 +++ .../textandicons/DelayedFileProvider.kt | 82 +++ .../common/textandicons/IconsDemoScreen.kt | 130 ++++ .../common/textandicons/RowDemoScreen.kt | 145 ++++ .../textandicons/TextAndIconsDemosScreen.kt | 67 ++ .../src/main/res/drawable-hdpi/banana.png | Bin .../src/main/res/drawable-ldpi/banana.png | Bin .../src/main/res/drawable-mdpi/banana.png | Bin .../src/main/res/drawable-xhdpi/banana.png | Bin .../src/main/res/drawable-xxhdpi/banana.png | Bin .../main/res/drawable/arrow_right_turn.png | Bin .../src/main/res/drawable/arrow_straight.png | Bin .../src/main/res/drawable/ic_520.png | Bin .../res/drawable/ic_baseline_add_alert_24.xml | 0 .../main/res/drawable/ic_bug_report_24px.xml | 0 .../main/res/drawable/ic_close_white_24dp.xml | 0 .../src/main/res/drawable/ic_commute_24px.xml | 0 .../ic_emoji_food_beverage_white_48dp.xml | 0 .../res/drawable/ic_explore_white_24dp.xml | 0 .../src/main/res/drawable/ic_face_24px.xml | 0 .../res/drawable/ic_fastfood_white_48dp.xml | 0 .../res/drawable/ic_fastfood_yellow_48dp.xml | 0 .../ic_favorite_filled_white_24dp.xml | 0 .../res/drawable/ic_favorite_white_24dp.xml | 0 .../src/main/res/drawable/ic_googleg.xml | 0 .../src/main/res/drawable/ic_hi.png | Bin .../src/main/res/drawable/ic_i5.png | Bin .../src/main/res/drawable/ic_launcher.xml | 0 .../ic_local_gas_station_white_48dp.xml | 0 .../main/res/drawable/ic_map_white_48dp.xml | 0 .../main/res/drawable/ic_place_white_24dp.xml | 0 .../main/res/drawable/ic_themed_icon_48dp.xml | 0 .../src/main/res/drawable/ic_zoom_in_24.xml | 0 .../src/main/res/drawable/ic_zoom_out_24.xml | 0 .../main/res/drawable/info_gm_grey_24dp.png | Bin .../src/main/res/drawable/junction_image.png | Bin .../src/main/res/drawable/lanes.png | Bin .../src/main/res/drawable/patio.png | Bin .../main/res/drawable/test_image_square.png | Bin .../main/res/layout/permission_request.xml | 0 .../src/main/res/layout/phone_activity.xml | 0 .../src/main/res/values-af/strings.xml | 0 .../src/main/res/values-am/strings.xml | 0 .../src/main/res/values-ar/strings.xml | 0 .../src/main/res/values-as/strings.xml | 0 .../src/main/res/values-az/strings.xml | 0 .../src/main/res/values-b+sr+Latn/strings.xml | 0 .../src/main/res/values-be/strings.xml | 0 .../src/main/res/values-bg/strings.xml | 0 .../src/main/res/values-bn/strings.xml | 0 .../src/main/res/values-bs/strings.xml | 0 .../src/main/res/values-ca/strings.xml | 0 .../src/main/res/values-cs/strings.xml | 0 .../src/main/res/values-da/strings.xml | 0 .../src/main/res/values-de/strings.xml | 0 .../src/main/res/values-el/strings.xml | 0 .../src/main/res/values-en-rAU/strings.xml | 0 .../src/main/res/values-en-rCA/strings.xml | 0 .../src/main/res/values-en-rGB/strings.xml | 0 .../src/main/res/values-en-rIN/strings.xml | 0 .../src/main/res/values-en-rXC/strings.xml | 0 .../src/main/res/values-es-rUS/strings.xml | 0 .../src/main/res/values-es/strings.xml | 0 .../src/main/res/values-et/strings.xml | 0 .../src/main/res/values-eu/strings.xml | 0 .../src/main/res/values-fa/strings.xml | 0 .../src/main/res/values-fi/strings.xml | 0 .../src/main/res/values-fr-rCA/strings.xml | 0 .../src/main/res/values-fr/strings.xml | 0 .../src/main/res/values-gl/strings.xml | 0 .../src/main/res/values-gu/strings.xml | 0 .../src/main/res/values-hi/strings.xml | 0 .../src/main/res/values-hr/strings.xml | 0 .../src/main/res/values-hu/strings.xml | 0 .../src/main/res/values-hy/strings.xml | 0 .../src/main/res/values-in/strings.xml | 0 .../src/main/res/values-is/strings.xml | 0 .../src/main/res/values-it/strings.xml | 0 .../src/main/res/values-iw/strings.xml | 0 .../src/main/res/values-ja/strings.xml | 0 .../src/main/res/values-ka/strings.xml | 0 .../src/main/res/values-kk/strings.xml | 0 .../src/main/res/values-km/strings.xml | 0 .../src/main/res/values-kn/strings.xml | 0 .../src/main/res/values-ko/strings.xml | 0 .../src/main/res/values-ky/strings.xml | 0 .../src/main/res/values-lo/strings.xml | 0 .../src/main/res/values-lt/strings.xml | 0 .../src/main/res/values-lv/strings.xml | 0 .../src/main/res/values-mk/strings.xml | 0 .../src/main/res/values-ml/strings.xml | 0 .../src/main/res/values-mn/strings.xml | 0 .../src/main/res/values-mr/strings.xml | 0 .../src/main/res/values-ms/strings.xml | 0 .../src/main/res/values-my/strings.xml | 0 .../src/main/res/values-nb/strings.xml | 0 .../src/main/res/values-ne/strings.xml | 0 .../src/main/res/values-nl/strings.xml | 0 .../src/main/res/values-or/strings.xml | 0 .../src/main/res/values-pa/strings.xml | 0 .../src/main/res/values-pl/strings.xml | 0 .../src/main/res/values-pt-rBR/strings.xml | 0 .../src/main/res/values-pt-rPT/strings.xml | 0 .../src/main/res/values-pt/strings.xml | 0 .../src/main/res/values-ro/strings.xml | 0 .../src/main/res/values-ru/strings.xml | 0 .../src/main/res/values-si/strings.xml | 0 .../src/main/res/values-sk/strings.xml | 0 .../src/main/res/values-sl/strings.xml | 0 .../src/main/res/values-sq/strings.xml | 0 .../src/main/res/values-sr/strings.xml | 0 .../src/main/res/values-sv/strings.xml | 0 .../src/main/res/values-sw/strings.xml | 0 .../src/main/res/values-ta/strings.xml | 0 .../src/main/res/values-te/strings.xml | 0 .../src/main/res/values-th/strings.xml | 0 .../src/main/res/values-tl/strings.xml | 0 .../src/main/res/values-tr/strings.xml | 0 .../src/main/res/values-uk/strings.xml | 0 .../src/main/res/values-ur/strings.xml | 0 .../src/main/res/values-uz/strings.xml | 0 .../src/main/res/values-vi/strings.xml | 0 .../src/main/res/values-zh-rCN/strings.xml | 0 .../src/main/res/values-zh-rHK/strings.xml | 0 .../src/main/res/values-zh-rTW/strings.xml | 0 .../src/main/res/values-zu/strings.xml | 0 .../src/main/res/values/attrs.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/values/styles.xml | 0 .../src/main/res/xml/automotive_app_desc.xml | 0 .../src/main/res/xml/file_provider_paths.xml | 0 429 files changed, 14074 insertions(+), 13919 deletions(-) create mode 100644 car_app_library/.gitignore delete mode 100644 car_app_library/build.gradle create mode 100644 car_app_library/build.gradle.kts create mode 100644 car_app_library/buildSrc/.gitignore create mode 100644 car_app_library/buildSrc/build.gradle.kts create mode 100644 car_app_library/buildSrc/settings.gradle.kts create mode 100644 car_app_library/buildSrc/src/main/kotlin/gradlePlugins/AndroidApplicationPlugin.kt create mode 100644 car_app_library/buildSrc/src/main/kotlin/gradlePlugins/AndroidLibraryPlugin.kt create mode 100644 car_app_library/buildSrc/src/main/kotlin/versions.kt create mode 100644 car_app_library/gradle/wrapper/gradle-wrapper.jar create mode 100644 car_app_library/gradle/wrapper/gradle-wrapper.properties create mode 100644 car_app_library/gradlew create mode 100644 car_app_library/gradlew.bat create mode 100644 car_app_library/helloworld/automotive/.gitignore delete mode 100644 car_app_library/helloworld/automotive/build.gradle create mode 100644 car_app_library/helloworld/automotive/build.gradle.kts delete mode 100644 car_app_library/helloworld/common/build.gradle delete mode 100644 car_app_library/helloworld/common/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldScreen.java delete mode 100644 car_app_library/helloworld/common/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldService.java delete mode 100644 car_app_library/helloworld/common/src/test/java/androidx/car/app/sample/helloworld/common/HelloWorldScreenTest.java delete mode 100644 car_app_library/helloworld/common/src/test/java/androidx/car/app/sample/helloworld/common/HelloWorldSessionTest.java create mode 100644 car_app_library/helloworld/mobile/.gitignore delete mode 100644 car_app_library/helloworld/mobile/build.gradle create mode 100644 car_app_library/helloworld/mobile/build.gradle.kts create mode 100644 car_app_library/helloworld/shared/.gitignore create mode 100644 car_app_library/helloworld/shared/build.gradle.kts rename car_app_library/helloworld/{common => shared}/src/main/AndroidManifest.xml (100%) create mode 100644 car_app_library/helloworld/shared/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldScreen.kt create mode 100644 car_app_library/helloworld/shared/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldService.kt rename car_app_library/helloworld/{common => shared}/src/main/res/drawable/ic_launcher.xml (100%) rename car_app_library/helloworld/{common => shared}/src/main/res/values/strings.xml (100%) rename car_app_library/helloworld/{common => shared}/src/main/res/xml/automotive_app_desc.xml (100%) create mode 100644 car_app_library/helloworld/shared/src/test/java/androidx/car/app/sample/helloworld/common/HelloWorldScreenTest.kt create mode 100644 car_app_library/helloworld/shared/src/test/java/androidx/car/app/sample/helloworld/common/HelloWorldSessionTest.kt rename car_app_library/helloworld/{common => shared}/src/test/resources/robolectric.properties (100%) create mode 100644 car_app_library/navigation/automotive/.gitignore delete mode 100644 car_app_library/navigation/automotive/build.gradle create mode 100644 car_app_library/navigation/automotive/build.gradle.kts delete mode 100644 car_app_library/navigation/common/build.gradle delete mode 100644 car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/app/MainActivity.java delete mode 100644 car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/FavoritesScreen.java delete mode 100644 car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/MicrophoneRecorder.java delete mode 100644 car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/NavigationCarAppService.java delete mode 100644 car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/NavigationScreen.java delete mode 100644 car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/NavigationSession.java delete mode 100644 car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/RequestPermissionScreen.java delete mode 100644 car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/RoutePreviewScreen.java delete mode 100644 car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/SearchResultsScreen.java delete mode 100644 car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/SearchScreen.java delete mode 100644 car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/SettingsScreen.java delete mode 100644 car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/SurfaceRenderer.java delete mode 100644 car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/model/DemoScripts.java delete mode 100644 car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/model/Instruction.java delete mode 100644 car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/model/Script.java delete mode 100644 car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java create mode 100644 car_app_library/navigation/mobile/.gitignore delete mode 100644 car_app_library/navigation/mobile/build.gradle create mode 100644 car_app_library/navigation/mobile/build.gradle.kts create mode 100644 car_app_library/navigation/shared/.gitignore create mode 100644 car_app_library/navigation/shared/build.gradle.kts rename car_app_library/navigation/{common => shared}/src/main/AndroidManifest.xml (100%) create mode 100644 car_app_library/navigation/shared/src/main/java/androidx/car/app/sample/navigation/common/app/MainActivity.kt create mode 100644 car_app_library/navigation/shared/src/main/java/androidx/car/app/sample/navigation/common/car/FavoritesScreen.kt create mode 100644 car_app_library/navigation/shared/src/main/java/androidx/car/app/sample/navigation/common/car/MicrophoneRecorder.kt create mode 100644 car_app_library/navigation/shared/src/main/java/androidx/car/app/sample/navigation/common/car/NavigationCarAppService.kt create mode 100644 car_app_library/navigation/shared/src/main/java/androidx/car/app/sample/navigation/common/car/NavigationScreen.kt create mode 100644 car_app_library/navigation/shared/src/main/java/androidx/car/app/sample/navigation/common/car/NavigationSession.kt create mode 100644 car_app_library/navigation/shared/src/main/java/androidx/car/app/sample/navigation/common/car/RequestPermissionScreen.kt create mode 100644 car_app_library/navigation/shared/src/main/java/androidx/car/app/sample/navigation/common/car/RoutePreviewScreen.kt create mode 100644 car_app_library/navigation/shared/src/main/java/androidx/car/app/sample/navigation/common/car/SearchResultsScreen.kt create mode 100644 car_app_library/navigation/shared/src/main/java/androidx/car/app/sample/navigation/common/car/SearchScreen.kt create mode 100644 car_app_library/navigation/shared/src/main/java/androidx/car/app/sample/navigation/common/car/SettingsScreen.kt create mode 100644 car_app_library/navigation/shared/src/main/java/androidx/car/app/sample/navigation/common/car/SurfaceRenderer.kt create mode 100644 car_app_library/navigation/shared/src/main/java/androidx/car/app/sample/navigation/common/model/DemoScripts.kt create mode 100644 car_app_library/navigation/shared/src/main/java/androidx/car/app/sample/navigation/common/model/Instruction.kt rename car_app_library/{settings.gradle => navigation/shared/src/main/java/androidx/car/app/sample/navigation/common/model/PlaceInfo.kt} (56%) create mode 100644 car_app_library/navigation/shared/src/main/java/androidx/car/app/sample/navigation/common/model/Script.kt create mode 100644 car_app_library/navigation/shared/src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.kt rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_add_stop.xml (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_favorite_white_24dp.xml (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_launcher.xml (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_mic.xml (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_pan_24.xml (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_recenter_24.xml (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_roundabout_ccw.png (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_roundabout_cw.png (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_search_black36dp.png (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_settings.png (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_turn_destination.png (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_turn_fork_left.png (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_turn_fork_right.png (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_turn_merge_symmetrical.png (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_turn_name_change.png (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_turn_normal_left.png (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_turn_normal_right.png (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_turn_sharp_left.png (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_turn_sharp_right.png (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_turn_slight_left.png (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_turn_slight_right.png (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_turn_u_turn_left.png (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_turn_u_turn_right.png (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_zoom_in_24.xml (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/ic_zoom_out_24.xml (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/junction_image.png (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/lanes.png (100%) rename car_app_library/navigation/{common => shared}/src/main/res/drawable/map.png (100%) rename car_app_library/navigation/{common => shared}/src/main/res/layout/activity_main.xml (100%) rename car_app_library/navigation/{common => shared}/src/main/res/raw-es/turn_right.m4a (100%) rename car_app_library/navigation/{common => shared}/src/main/res/raw-pt/turn_right.m4a (100%) rename car_app_library/navigation/{common => shared}/src/main/res/raw/turn_right.m4a (100%) rename car_app_library/navigation/{common => shared}/src/main/res/values/colors.xml (100%) rename car_app_library/navigation/{common => shared}/src/main/res/values/strings.xml (100%) rename car_app_library/navigation/{common => shared}/src/main/res/xml/automotive_app_desc.xml (100%) create mode 100644 car_app_library/places/automotive/.gitignore delete mode 100644 car_app_library/places/automotive/build.gradle create mode 100644 car_app_library/places/automotive/build.gradle.kts delete mode 100644 car_app_library/places/common/build.gradle delete mode 100644 car_app_library/places/common/src/main/java/androidx/car/app/sample/places/common/Constants.java delete mode 100644 car_app_library/places/common/src/main/java/androidx/car/app/sample/places/common/Executors.java delete mode 100644 car_app_library/places/common/src/main/java/androidx/car/app/sample/places/common/ImageUtil.java delete mode 100644 car_app_library/places/common/src/main/java/androidx/car/app/sample/places/common/PlaceCategoryListScreen.java delete mode 100644 car_app_library/places/common/src/main/java/androidx/car/app/sample/places/common/PlaceDetailsScreen.java delete mode 100644 car_app_library/places/common/src/main/java/androidx/car/app/sample/places/common/PlaceListScreen.java delete mode 100644 car_app_library/places/common/src/main/java/androidx/car/app/sample/places/common/PlacesCarAppService.java delete mode 100644 car_app_library/places/common/src/main/java/androidx/car/app/sample/places/common/RequestPermissionScreen.java delete mode 100644 car_app_library/places/common/src/main/java/androidx/car/app/sample/places/common/SearchScreen.java delete mode 100644 car_app_library/places/common/src/main/java/androidx/car/app/sample/places/common/UiExecutor.java delete mode 100644 car_app_library/places/common/src/main/java/androidx/car/app/sample/places/common/places/LocationUtil.java delete mode 100644 car_app_library/places/common/src/main/java/androidx/car/app/sample/places/common/places/PlaceCategory.java delete mode 100644 car_app_library/places/common/src/main/java/androidx/car/app/sample/places/common/places/PlaceDetails.java delete mode 100644 car_app_library/places/common/src/main/java/androidx/car/app/sample/places/common/places/PlaceFinder.java delete mode 100644 car_app_library/places/common/src/main/java/androidx/car/app/sample/places/common/places/PlaceInfo.java create mode 100644 car_app_library/places/mobile/.gitignore delete mode 100644 car_app_library/places/mobile/build.gradle create mode 100644 car_app_library/places/mobile/build.gradle.kts create mode 100644 car_app_library/places/shared/.gitignore create mode 100644 car_app_library/places/shared/build.gradle.kts rename car_app_library/places/{common => shared}/src/main/AndroidManifest.xml (100%) create mode 100644 car_app_library/places/shared/src/main/java/androidx/car/app/sample/places/common/Constants.kt create mode 100644 car_app_library/places/shared/src/main/java/androidx/car/app/sample/places/common/Executors.kt create mode 100644 car_app_library/places/shared/src/main/java/androidx/car/app/sample/places/common/ImageUtil.kt create mode 100644 car_app_library/places/shared/src/main/java/androidx/car/app/sample/places/common/PlaceCategoryListScreen.kt create mode 100644 car_app_library/places/shared/src/main/java/androidx/car/app/sample/places/common/PlaceDetailsScreen.kt create mode 100644 car_app_library/places/shared/src/main/java/androidx/car/app/sample/places/common/PlaceListScreen.kt create mode 100644 car_app_library/places/shared/src/main/java/androidx/car/app/sample/places/common/PlacesCarAppService.kt create mode 100644 car_app_library/places/shared/src/main/java/androidx/car/app/sample/places/common/RequestPermissionScreen.kt create mode 100644 car_app_library/places/shared/src/main/java/androidx/car/app/sample/places/common/SearchScreen.kt create mode 100644 car_app_library/places/shared/src/main/java/androidx/car/app/sample/places/common/UiExecutor.kt create mode 100644 car_app_library/places/shared/src/main/java/androidx/car/app/sample/places/common/places/LocationUtil.kt rename car_app_library/{navigation/common/src/main/java/androidx/car/app/sample/navigation/common/model/PlaceInfo.java => places/shared/src/main/java/androidx/car/app/sample/places/common/places/PlaceCategory.kt} (53%) create mode 100644 car_app_library/places/shared/src/main/java/androidx/car/app/sample/places/common/places/PlaceDetails.kt create mode 100644 car_app_library/places/shared/src/main/java/androidx/car/app/sample/places/common/places/PlaceFinder.kt create mode 100644 car_app_library/places/shared/src/main/java/androidx/car/app/sample/places/common/places/PlaceInfo.kt rename car_app_library/places/{common => shared}/src/main/res/drawable/ic_launcher.xml (100%) rename car_app_library/places/{common => shared}/src/main/res/values/places_api_key.xml (100%) rename car_app_library/places/{common => shared}/src/main/res/values/strings.xml (100%) rename car_app_library/places/{common => shared}/src/main/res/values/themes.xml (100%) rename car_app_library/places/{common => shared}/src/main/res/xml/automotive_app_desc.xml (100%) create mode 100644 car_app_library/settings.gradle.kts create mode 100644 car_app_library/showcase/automotive/.gitignore delete mode 100644 car_app_library/showcase/automotive/build.gradle create mode 100644 car_app_library/showcase/automotive/build.gradle.kts delete mode 100644 car_app_library/showcase/automotive/lint.xml create mode 100644 car_app_library/showcase/automotive/proguard-rules.pro create mode 100644 car_app_library/showcase/automotive/src/androidTest/java/androidx/car/app/sample/showcase/automotive/ExampleInstrumentedTest.kt delete mode 100644 car_app_library/showcase/automotive/src/main/java/androidx/car/app/sample/showcase/automotive/DebugActivity.java create mode 100644 car_app_library/showcase/automotive/src/main/java/androidx/car/app/sample/showcase/automotive/DebugActivity.kt create mode 100644 car_app_library/showcase/automotive/src/main/res/drawable/ic_launcher_background.xml create mode 100644 car_app_library/showcase/automotive/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 car_app_library/showcase/automotive/src/main/res/mipmap-anydpi/ic_launcher.xml create mode 100644 car_app_library/showcase/automotive/src/main/res/mipmap-anydpi/ic_launcher_round.xml create mode 100644 car_app_library/showcase/automotive/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 car_app_library/showcase/automotive/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 car_app_library/showcase/automotive/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 car_app_library/showcase/automotive/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 car_app_library/showcase/automotive/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 car_app_library/showcase/automotive/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 car_app_library/showcase/automotive/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 car_app_library/showcase/automotive/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 car_app_library/showcase/automotive/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 car_app_library/showcase/automotive/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 car_app_library/showcase/automotive/src/main/res/values/strings.xml create mode 100644 car_app_library/showcase/automotive/src/main/res/values/themes.xml create mode 100644 car_app_library/showcase/automotive/src/test/java/androidx/car/app/sample/showcase/automotive/ExampleUnitTest.kt delete mode 100644 car_app_library/showcase/common/build.gradle delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/SelectableListsDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/ShowcaseService.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/ShowcaseSession.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/StartScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/TaskRestrictionDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/common/PlaceDetailsScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/common/PlaceInfo.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/common/SamplePlaces.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/common/Utils.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/misc/CarHardwareDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/misc/CarHardwareInfoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/misc/ColorDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/misc/ContentLimitsDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/misc/FinishAppScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/misc/LoadingDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/misc/MiscDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/misc/NotificationDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/misc/PopToDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/misc/RequestPermissionScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/misc/ReservationCancelledScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/misc/ResultDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/MapTemplateWithListDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/MapTemplateWithPaneDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/NavigationDemosScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/NavigationMapOnlyScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/NavigationNotificationService.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/NavigationNotificationsDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/PlaceListNavigationTemplateDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/RoutePreviewDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/routing/ArrivedDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/routing/JunctionImageDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/routing/LoadingDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/routing/NavigatingDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/routing/NavigationTemplateDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/navigation/routing/RoutingDemoModels.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/renderer/CarHardwareRenderer.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/renderer/DefaultRenderer.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/renderer/SurfaceController.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/templates/GridTemplateDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/templates/ListTemplateDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/templates/LongMessageTemplateDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/templates/MessageTemplateDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/templates/MiscTemplateDemosScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/templates/PaneTemplateDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/templates/PlaceListTemplateBrowseDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/templates/PlaceListTemplateDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/templates/SearchTemplateDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/templates/SignInTemplateDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/textandicons/ContentProviderIconsDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/textandicons/DelayedFileProvider.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/textandicons/IconsDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/textandicons/RowDemoScreen.java delete mode 100644 car_app_library/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/textandicons/TextAndIconsDemosScreen.java create mode 100644 car_app_library/showcase/mobile/.gitignore delete mode 100644 car_app_library/showcase/mobile/build.gradle create mode 100644 car_app_library/showcase/mobile/build.gradle.kts create mode 100644 car_app_library/showcase/mobile/proguard-rules.pro create mode 100644 car_app_library/showcase/mobile/src/androidTest/java/androidx/car/app/sample/showcase/ExampleInstrumentedTest.kt create mode 100644 car_app_library/showcase/mobile/src/test/java/androidx/car/app/sample/showcase/ExampleUnitTest.kt create mode 100644 car_app_library/showcase/shared/.gitignore create mode 100644 car_app_library/showcase/shared/build.gradle.kts rename car_app_library/showcase/{common => shared}/src/main/AndroidManifest.xml (100%) create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/SelectableListsDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/ShowcaseService.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/ShowcaseSession.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/StartScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/TaskRestrictionDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/common/PlaceDetailsScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/common/PlaceInfo.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/common/SamplePlaces.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/common/Utils.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/misc/CarHardwareDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/misc/CarHardwareInfoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/misc/ColorDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/misc/ContentLimitsDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/misc/FinishAppScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/misc/LoadingDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/misc/MiscDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/misc/NotificationDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/misc/PopToDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/misc/RequestPermissionScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/misc/ReservationCancelledScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/misc/ResultDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/navigation/MapTemplateWithListDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/navigation/MapTemplateWithPaneDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/navigation/NavigationDemosScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/navigation/NavigationMapOnlyScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/navigation/NavigationNotificationService.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/navigation/NavigationNotificationsDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/navigation/PlaceListNavigationTemplateDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/navigation/RoutePreviewDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/navigation/routing/ArrivedDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/navigation/routing/JunctionImageDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/navigation/routing/LoadingDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/navigation/routing/NavigatingDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/navigation/routing/NavigationTemplateDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/navigation/routing/RoutingDemoModels.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/renderer/CarHardwareRenderer.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/renderer/DefaultRenderer.kt rename car_app_library/showcase/{common/src/main/java/androidx/car/app/sample/showcase/common/renderer/Renderer.java => shared/src/main/java/androidx/car/app/sample/showcase/common/renderer/Renderer.kt} (56%) create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/renderer/SurfaceController.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/templates/GridTemplateDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/templates/ListTemplateDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/templates/LongMessageTemplateDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/templates/MessageTemplateDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/templates/MiscTemplateDemosScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/templates/PaneTemplateDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/templates/PlaceListTemplateBrowseDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/templates/PlaceListTemplateDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/templates/SearchTemplateDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/templates/SignInTemplateDemoScreen.kt rename car_app_library/showcase/{common/src/main/java/androidx/car/app/sample/showcase/common/templates/SignInWithGoogleActivity.java => shared/src/main/java/androidx/car/app/sample/showcase/common/templates/SignInWithGoogleActivity.kt} (69%) create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/textandicons/ContentProviderIconsDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/textandicons/DelayedFileProvider.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/textandicons/IconsDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/textandicons/RowDemoScreen.kt create mode 100644 car_app_library/showcase/shared/src/main/java/androidx/car/app/sample/showcase/common/textandicons/TextAndIconsDemosScreen.kt rename car_app_library/showcase/{common => shared}/src/main/res/drawable-hdpi/banana.png (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable-ldpi/banana.png (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable-mdpi/banana.png (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable-xhdpi/banana.png (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable-xxhdpi/banana.png (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/arrow_right_turn.png (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/arrow_straight.png (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_520.png (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_baseline_add_alert_24.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_bug_report_24px.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_close_white_24dp.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_commute_24px.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_emoji_food_beverage_white_48dp.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_explore_white_24dp.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_face_24px.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_fastfood_white_48dp.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_fastfood_yellow_48dp.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_favorite_filled_white_24dp.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_favorite_white_24dp.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_googleg.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_hi.png (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_i5.png (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_launcher.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_local_gas_station_white_48dp.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_map_white_48dp.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_place_white_24dp.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_themed_icon_48dp.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_zoom_in_24.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/ic_zoom_out_24.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/info_gm_grey_24dp.png (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/junction_image.png (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/lanes.png (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/patio.png (100%) rename car_app_library/showcase/{common => shared}/src/main/res/drawable/test_image_square.png (100%) rename car_app_library/showcase/{common => shared}/src/main/res/layout/permission_request.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/layout/phone_activity.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-af/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-am/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-ar/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-as/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-az/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-b+sr+Latn/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-be/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-bg/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-bn/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-bs/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-ca/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-cs/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-da/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-de/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-el/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-en-rAU/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-en-rCA/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-en-rGB/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-en-rIN/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-en-rXC/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-es-rUS/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-es/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-et/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-eu/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-fa/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-fi/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-fr-rCA/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-fr/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-gl/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-gu/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-hi/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-hr/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-hu/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-hy/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-in/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-is/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-it/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-iw/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-ja/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-ka/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-kk/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-km/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-kn/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-ko/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-ky/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-lo/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-lt/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-lv/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-mk/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-ml/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-mn/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-mr/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-ms/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-my/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-nb/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-ne/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-nl/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-or/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-pa/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-pl/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-pt-rBR/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-pt-rPT/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-pt/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-ro/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-ru/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-si/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-sk/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-sl/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-sq/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-sr/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-sv/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-sw/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-ta/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-te/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-th/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-tl/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-tr/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-uk/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-ur/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-uz/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-vi/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-zh-rCN/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-zh-rHK/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-zh-rTW/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values-zu/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values/attrs.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values/strings.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/values/styles.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/xml/automotive_app_desc.xml (100%) rename car_app_library/showcase/{common => shared}/src/main/res/xml/file_provider_paths.xml (100%) diff --git a/car_app_library/.gitignore b/car_app_library/.gitignore new file mode 100644 index 0000000..676fe2b --- /dev/null +++ b/car_app_library/.gitignore @@ -0,0 +1,16 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties +/java_pid17944.hprof diff --git a/car_app_library/build.gradle b/car_app_library/build.gradle deleted file mode 100644 index 6a2b974..0000000 --- a/car_app_library/build.gradle +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -buildscript { - - repositories { - google() - jcenter() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - tasks.withType(JavaCompile) { - options.compilerArgs << "-Xlint:deprecation" - } - - repositories { - google() - jcenter() - mavenCentral() - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} - diff --git a/car_app_library/build.gradle.kts b/car_app_library/build.gradle.kts new file mode 100644 index 0000000..042283b --- /dev/null +++ b/car_app_library/build.gradle.kts @@ -0,0 +1,6 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +//plugins { +// alias(libs.plugins.android.application) apply false +// alias(libs.plugins.android.library) apply false +// alias(libs.plugins.jetbrains.kotlin.android) apply false +//} \ No newline at end of file diff --git a/car_app_library/buildSrc/.gitignore b/car_app_library/buildSrc/.gitignore new file mode 100644 index 0000000..66eaea9 --- /dev/null +++ b/car_app_library/buildSrc/.gitignore @@ -0,0 +1,2 @@ +.gradle +/build \ No newline at end of file diff --git a/car_app_library/buildSrc/build.gradle.kts b/car_app_library/buildSrc/build.gradle.kts new file mode 100644 index 0000000..d7c0465 --- /dev/null +++ b/car_app_library/buildSrc/build.gradle.kts @@ -0,0 +1,22 @@ +plugins { + `kotlin-dsl` + `kotlin-dsl-precompiled-script-plugins` +} + +dependencies { + implementation(libs.jetbrains.kotlin) + implementation( libs.android.build.gradle) +} + +gradlePlugin { + plugins { + create("android-library-module") { + id = "android-library-module" + implementationClass = "gradlePlugins.AndroidLibraryPlugin" + } + create("android-application-module"){ + id = "android-application-module" + implementationClass = "gradlePlugins.AndroidApplicationPlugin" + } + } +} \ No newline at end of file diff --git a/car_app_library/buildSrc/settings.gradle.kts b/car_app_library/buildSrc/settings.gradle.kts new file mode 100644 index 0000000..b694c23 --- /dev/null +++ b/car_app_library/buildSrc/settings.gradle.kts @@ -0,0 +1,37 @@ +pluginManagement { + + repositories { + gradlePluginPortal() + google() + mavenCentral() + mavenLocal() + } + buildscript { + repositories { + mavenCentral() +// maven { +// url = uri("https://storage.googleapis.com/r8-releases/raw") +// } + } +// dependencies { +// classpath("com.android.tools:r8:8.2.42") +// } + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } + versionCatalogs { + create("libs") { + version("agp", "8.5.0" ) + version("kotlin","1.9.0") + library("android-build-gradle", "com.android.tools.build", "gradle").versionRef("agp") + library("jetbrains-kotlin","org.jetbrains.kotlin","kotlin-gradle-plugin").versionRef("kotlin") + } + } +} + +rootProject.name = "buildSrc" diff --git a/car_app_library/buildSrc/src/main/kotlin/gradlePlugins/AndroidApplicationPlugin.kt b/car_app_library/buildSrc/src/main/kotlin/gradlePlugins/AndroidApplicationPlugin.kt new file mode 100644 index 0000000..7a32026 --- /dev/null +++ b/car_app_library/buildSrc/src/main/kotlin/gradlePlugins/AndroidApplicationPlugin.kt @@ -0,0 +1,64 @@ +package gradlePlugins + +import com.android.build.gradle.BaseExtension +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.kotlin.dsl.dependencies +import org.gradle.kotlin.dsl.withType + +class AndroidApplicationPlugin : Plugin { + + private val Project.android: BaseExtension + get() = extensions.findByName("android") as? BaseExtension + ?: error("Not an Android module: $name") + + override fun apply(project: Project) = + with(project) { + applyPlugins() + androidConfig() + dependenciesConfig() + } + + private fun Project.applyPlugins() { + plugins.run { + apply("com.android.application") + apply("org.jetbrains.kotlin.android") + } + } + + private fun Project.androidConfig() { + android.run { + compileSdkVersion( ver.build.compile_sdk) + defaultConfig { + minSdk = ver.build.min_sdk + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + targetSdk = ver.build.compile_sdk + versionCode = ver.build.versionCode + versionName = ver.build.versionName + } + buildTypes { + getByName("debug") { + isMinifyEnabled = false + } + getByName("release") { + isMinifyEnabled= false + consumerProguardFiles("consumer-rules.pro") + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + } + } + compileOptions { + sourceCompatibility = ver.build.java_compatibility + targetCompatibility = ver.build.java_compatibility + } + + tasks.withType().configureEach { + kotlinOptions.jvmTarget = ver.build.java_compatibility.toString() + } + } + } + private fun Project.dependenciesConfig() { + dependencies { +// "coreLibraryDesugaring"( "com.android.tools:desugar_jdk_libs:${ver.android.desugar}") + } + } +} \ No newline at end of file diff --git a/car_app_library/buildSrc/src/main/kotlin/gradlePlugins/AndroidLibraryPlugin.kt b/car_app_library/buildSrc/src/main/kotlin/gradlePlugins/AndroidLibraryPlugin.kt new file mode 100644 index 0000000..fc024b3 --- /dev/null +++ b/car_app_library/buildSrc/src/main/kotlin/gradlePlugins/AndroidLibraryPlugin.kt @@ -0,0 +1,66 @@ +package gradlePlugins + +import com.android.build.gradle.BaseExtension +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.kotlin.dsl.dependencies +import org.gradle.kotlin.dsl.withType + +class AndroidLibraryPlugin : Plugin { + + private val Project.android: BaseExtension + get() = extensions.findByName("android") as? BaseExtension + ?: error("Not an Android module: $name") + + override fun apply(project: Project) = + with(project) { + applyPlugins() + androidConfig() + dependenciesConfig() + } + + private fun Project.applyPlugins() { + plugins.run { + apply("com.android.library") +// apply("kotlin-multiplatform") + apply("org.jetbrains.kotlin.android") + } + } + + private fun Project.androidConfig() { + android.run { + compileSdkVersion( ver.build.compile_sdk) + defaultConfig { + minSdk = ver.build.min_sdk + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + buildTypes { + getByName("debug") { + isMinifyEnabled = false + } + getByName("release") { + isMinifyEnabled= false + consumerProguardFiles("consumer-rules.pro") + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + } + } + compileOptions { +// isCoreLibraryDesugaringEnabled = true + sourceCompatibility = ver.build.java_compatibility + targetCompatibility = ver.build.java_compatibility + } +// kotlinOptions { +// jvmTarget = "17" +// } + + tasks.withType().configureEach { + kotlinOptions.jvmTarget = ver.build.java_compatibility.toString() + } + } + } + private fun Project.dependenciesConfig() { + dependencies { +// "coreLibraryDesugaring"( "com.android.tools:desugar_jdk_libs:${ver.android.desugar}") + } + } +} \ No newline at end of file diff --git a/car_app_library/buildSrc/src/main/kotlin/versions.kt b/car_app_library/buildSrc/src/main/kotlin/versions.kt new file mode 100644 index 0000000..75bb753 --- /dev/null +++ b/car_app_library/buildSrc/src/main/kotlin/versions.kt @@ -0,0 +1,11 @@ +import org.gradle.api.JavaVersion + +object ver { + object build { + const val min_sdk = 29 + const val compile_sdk = 34 + val java_compatibility = JavaVersion.VERSION_17 + const val versionCode = 1 + val versionName = "1.0" + } +} \ No newline at end of file diff --git a/car_app_library/gradle.properties b/car_app_library/gradle.properties index 4204531..c425ad4 100644 --- a/car_app_library/gradle.properties +++ b/car_app_library/gradle.properties @@ -1,33 +1,31 @@ -# -# Copyright 2020 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Properties that are copied from main properties file -# We set playground properties in two steps: -# * This file is linked into github_gradle.properties under the project and limited to -# just copying properties from the androidx properties file without any change. -# Its integrity is validated as part of the buildOnServer task in AndroidX. -# (validatePlaygroundGradleProperties task) -# * Additional settings are in playground.properties which are loaded dynamically -# This separation is necessary to ensure gradle can read certain properties -# at configuration time. - +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. For more details, visit +# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true + # Disable features we do not use android.defaults.buildfeatures.aidl=false android.defaults.buildfeatures.buildconfig=false android.defaults.buildfeatures.renderscript=false android.defaults.buildfeatures.resvalues=false -android.defaults.buildfeatures.shaders=false +#android.defaults.buildfeatures.shaders=false +org.gradle.configuration-cache=true \ No newline at end of file diff --git a/car_app_library/gradle/wrapper/gradle-wrapper.jar b/car_app_library/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f GIT binary patch literal 59203 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

K7UpUK$>l@ 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 E2O(~oYXATM literal 0 HcmV?d00001 diff --git a/car_app_library/gradle/wrapper/gradle-wrapper.properties b/car_app_library/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..576c88d --- /dev/null +++ b/car_app_library/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,8 @@ +#Fri Jun 14 08:21:24 BST 2024 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/car_app_library/gradlew b/car_app_library/gradlew new file mode 100644 index 0000000..4f906e0 --- /dev/null +++ b/car_app_library/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/car_app_library/gradlew.bat b/car_app_library/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/car_app_library/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/car_app_library/helloworld/automotive/.gitignore b/car_app_library/helloworld/automotive/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/car_app_library/helloworld/automotive/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/car_app_library/helloworld/automotive/build.gradle b/car_app_library/helloworld/automotive/build.gradle deleted file mode 100644 index 7fe19aa..0000000 --- a/car_app_library/helloworld/automotive/build.gradle +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -apply plugin: 'com.android.application' - -android { - compileSdk 32 - - defaultConfig { - applicationId "androidx.car.app.sample.helloworld" - minSdkVersion 29 - targetSdkVersion 32 - versionCode 1 - versionName "1.0" - } - - buildTypes { - release { - // Enables code shrinking, obfuscation, and optimization. - minifyEnabled true - proguardFiles getDefaultProguardFile( - 'proguard-android-optimize.txt'), - 'proguard-rules.pro' - } - } - - compileOptions { - targetCompatibility = JavaVersion.VERSION_1_8 - sourceCompatibility = JavaVersion.VERSION_1_8 - } - namespace "androidx.car.app.sample.helloworld" -} - -dependencies { - implementation "androidx.car.app:app-automotive:1.2.0-rc01" - implementation project(":helloworld:common") -} diff --git a/car_app_library/helloworld/automotive/build.gradle.kts b/car_app_library/helloworld/automotive/build.gradle.kts new file mode 100644 index 0000000..ca283a8 --- /dev/null +++ b/car_app_library/helloworld/automotive/build.gradle.kts @@ -0,0 +1,21 @@ +plugins { + kotlin("android") + id("android-application-module") +} + +android { + namespace = "androidx.car.app.sample.helloworld" + defaultConfig { + applicationId = "androidx.car.app.sample.helloworld" + } +} + +dependencies { + implementation(libs.androidx.car.automotive) + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.appcompat) + implementation(project(":helloworld:shared")) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) +} \ No newline at end of file diff --git a/car_app_library/helloworld/common/build.gradle b/car_app_library/helloworld/common/build.gradle deleted file mode 100644 index e5cf456..0000000 --- a/car_app_library/helloworld/common/build.gradle +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -apply plugin: 'com.android.library' - -android { - compileSdk 32 - - defaultConfig { - minSdkVersion 23 - targetSdkVersion 32 - versionCode 1 - versionName "1.0" - } - - buildTypes { - release { - // Enables code shrinking, obfuscation, and optimization. - minifyEnabled true - proguardFiles getDefaultProguardFile( - 'proguard-android-optimize.txt'), - 'proguard-rules.pro' - } - } - - compileOptions { - targetCompatibility = JavaVersion.VERSION_1_8 - sourceCompatibility = JavaVersion.VERSION_1_8 - } - namespace "androidx.car.app.sample.helloworld.common" -} - -dependencies { - implementation "androidx.car.app:app:1.2.0-rc01" -} - - diff --git a/car_app_library/helloworld/common/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldScreen.java b/car_app_library/helloworld/common/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldScreen.java deleted file mode 100644 index 9ca8d94..0000000 --- a/car_app_library/helloworld/common/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldScreen.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package androidx.car.app.sample.helloworld.common; - -import androidx.annotation.NonNull; -import androidx.car.app.CarContext; -import androidx.car.app.Screen; -import androidx.car.app.model.Action; -import androidx.car.app.model.Pane; -import androidx.car.app.model.PaneTemplate; -import androidx.car.app.model.Row; -import androidx.car.app.model.Template; - -/** - * A screen that shows a simple "Hello World!" message. - * - *

See {@link HelloWorldService} for the app's entry point to the car host. - */ -public class HelloWorldScreen extends Screen { - public HelloWorldScreen(@NonNull CarContext carContext) { - super(carContext); - } - - @NonNull - @Override - public Template onGetTemplate() { - Row row = new Row.Builder().setTitle("Hello AndroidX!").build(); - return new PaneTemplate.Builder(new Pane.Builder().addRow(row).build()) - .setHeaderAction(Action.APP_ICON) - .build(); - } -} diff --git a/car_app_library/helloworld/common/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldService.java b/car_app_library/helloworld/common/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldService.java deleted file mode 100644 index d8de977..0000000 --- a/car_app_library/helloworld/common/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldService.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package androidx.car.app.sample.helloworld.common; - -import android.content.Intent; -import android.content.pm.ApplicationInfo; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.car.app.CarAppService; -import androidx.car.app.Screen; -import androidx.car.app.Session; -import androidx.car.app.SessionInfo; -import androidx.car.app.validation.HostValidator; - -/** - * Entry point for the hello world app. - * - *

{@link CarAppService} is the main interface between the app and the car host. For more - * details, see the Android for - * Cars Library developer guide. - */ -public final class HelloWorldService extends CarAppService { - - public HelloWorldService() { - // Exported services must have an empty public constructor. - } - - @Override - @NonNull - public Session onCreateSession(@NonNull SessionInfo sessionInfo) { - return new Session() { - @Override - @NonNull - public Screen onCreateScreen(@Nullable Intent intent) { - return new HelloWorldScreen(getCarContext()); - } - }; - } - - @NonNull - @Override - public HostValidator createHostValidator() { - if ((getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) { - return HostValidator.ALLOW_ALL_HOSTS_VALIDATOR; - } else { - return new HostValidator.Builder(getApplicationContext()) - .addAllowedHosts(androidx.car.app.R.array.hosts_allowlist_sample) - .build(); - } - } -} diff --git a/car_app_library/helloworld/common/src/test/java/androidx/car/app/sample/helloworld/common/HelloWorldScreenTest.java b/car_app_library/helloworld/common/src/test/java/androidx/car/app/sample/helloworld/common/HelloWorldScreenTest.java deleted file mode 100644 index 6134205..0000000 --- a/car_app_library/helloworld/common/src/test/java/androidx/car/app/sample/helloworld/common/HelloWorldScreenTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.car.app.sample.helloworld.common; - -import static com.google.common.truth.Truth.assertThat; - -import androidx.car.app.model.PaneTemplate; -import androidx.car.app.model.Row; -import androidx.car.app.testing.TestCarContext; -import androidx.test.core.app.ApplicationProvider; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.internal.DoNotInstrument; - -import java.util.List; - -/** - * A sample test on {@link HelloWorldScreen}. - * - *

Demonstrating the usage of {@link TestCarContext} and validating that the returned - * {@link androidx.car.app.model.Template} has the expected contents. - */ -@RunWith(RobolectricTestRunner.class) -@DoNotInstrument -public class HelloWorldScreenTest { - private final TestCarContext mTestCarContext = - TestCarContext.createCarContext(ApplicationProvider.getApplicationContext()); - - @Test - public void getTemplate_containsExpectedRow() { - HelloWorldScreen screen = new HelloWorldScreen(mTestCarContext); - PaneTemplate template = (PaneTemplate) screen.onGetTemplate(); - - List rows = template.getPane().getRows(); - assertThat(rows).hasSize(1); - assertThat(rows.get(0)).isEqualTo(new Row.Builder().setTitle("Hello AndroidX!").build()); - } -} diff --git a/car_app_library/helloworld/common/src/test/java/androidx/car/app/sample/helloworld/common/HelloWorldSessionTest.java b/car_app_library/helloworld/common/src/test/java/androidx/car/app/sample/helloworld/common/HelloWorldSessionTest.java deleted file mode 100644 index e1e2be1..0000000 --- a/car_app_library/helloworld/common/src/test/java/androidx/car/app/sample/helloworld/common/HelloWorldSessionTest.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.car.app.sample.helloworld.common; - -import static com.google.common.truth.Truth.assertThat; - -import android.content.ComponentName; -import android.content.Intent; - -import androidx.car.app.Screen; -import androidx.car.app.Session; -import androidx.car.app.SessionInfo; -import androidx.car.app.testing.SessionController; -import androidx.car.app.testing.TestCarContext; -import androidx.car.app.testing.TestScreenManager; -import androidx.lifecycle.Lifecycle; -import androidx.test.core.app.ApplicationProvider; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.Robolectric; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.internal.DoNotInstrument; - -/** - * A sample test on the session instance from {@link HelloWorldService}. - * - *

Demonstrating the usage of {@link SessionController} and validating that the session is - * pushing the expected screen when created. - */ -@RunWith(RobolectricTestRunner.class) -@DoNotInstrument -public class HelloWorldSessionTest { - private final TestCarContext mTestCarContext = - TestCarContext.createCarContext(ApplicationProvider.getApplicationContext()); - - @Test - public void onCreateScreen_returnsExpectedScreen() { - HelloWorldService service = Robolectric.setupService(HelloWorldService.class); - Session session = service.onCreateSession(SessionInfo.DEFAULT_SESSION_INFO); - SessionController controller = - new SessionController(session, mTestCarContext, - new Intent().setComponent( - new ComponentName(mTestCarContext, HelloWorldService.class))); - controller.moveToState(Lifecycle.State.CREATED); - - Screen screenCreated = - mTestCarContext.getCarService(TestScreenManager.class).getScreensPushed().get(0); - assertThat(screenCreated).isInstanceOf(HelloWorldScreen.class); - } - -} diff --git a/car_app_library/helloworld/mobile/.gitignore b/car_app_library/helloworld/mobile/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/car_app_library/helloworld/mobile/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/car_app_library/helloworld/mobile/build.gradle b/car_app_library/helloworld/mobile/build.gradle deleted file mode 100644 index f836662..0000000 --- a/car_app_library/helloworld/mobile/build.gradle +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -apply plugin: 'com.android.application' - -android { - compileSdk 32 - - defaultConfig { - applicationId "androidx.car.app.sample.helloworld" - minSdkVersion 23 - targetSdkVersion 32 - versionCode 1 - versionName "1.0" - } - - buildTypes { - release { - // Enables code shrinking, obfuscation, and optimization. - minifyEnabled true - proguardFiles getDefaultProguardFile( - 'proguard-android-optimize.txt'), - 'proguard-rules.pro' - } - } - - compileOptions { - targetCompatibility = JavaVersion.VERSION_1_8 - sourceCompatibility = JavaVersion.VERSION_1_8 - } - namespace "androidx.car.app.sample.helloworld" -} - -dependencies { - implementation "androidx.car.app:app-projected:1.2.0-rc01" - implementation project(":helloworld:common") -} - - diff --git a/car_app_library/helloworld/mobile/build.gradle.kts b/car_app_library/helloworld/mobile/build.gradle.kts new file mode 100644 index 0000000..87bf471 --- /dev/null +++ b/car_app_library/helloworld/mobile/build.gradle.kts @@ -0,0 +1,19 @@ +plugins { + kotlin("android") + id("android-application-module") +} + +android { + namespace = "androidx.car.app.sample.helloworld" + defaultConfig { + applicationId = "androidx.car.app.sample.helloworld" + } +} + +dependencies { + implementation(libs.androidx.car.projected) + implementation(project(":helloworld:shared")) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + } \ No newline at end of file diff --git a/car_app_library/helloworld/shared/.gitignore b/car_app_library/helloworld/shared/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/car_app_library/helloworld/shared/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/car_app_library/helloworld/shared/build.gradle.kts b/car_app_library/helloworld/shared/build.gradle.kts new file mode 100644 index 0000000..6c5ab3b --- /dev/null +++ b/car_app_library/helloworld/shared/build.gradle.kts @@ -0,0 +1,13 @@ +plugins { + kotlin("android") + id("android-library-module") +} + +android { + namespace = "androidx.car.app.sample.helloworld.common" +} + +dependencies { + implementation( libs.androidx.core) + implementation( libs.androidx.car.app) +} \ No newline at end of file diff --git a/car_app_library/helloworld/common/src/main/AndroidManifest.xml b/car_app_library/helloworld/shared/src/main/AndroidManifest.xml similarity index 100% rename from car_app_library/helloworld/common/src/main/AndroidManifest.xml rename to car_app_library/helloworld/shared/src/main/AndroidManifest.xml diff --git a/car_app_library/helloworld/shared/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldScreen.kt b/car_app_library/helloworld/shared/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldScreen.kt new file mode 100644 index 0000000..75fcc1b --- /dev/null +++ b/car_app_library/helloworld/shared/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldScreen.kt @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package androidx.car.app.sample.helloworld.common + +import androidx.car.app.CarContext +import androidx.car.app.Screen +import androidx.car.app.model.Action +import androidx.car.app.model.Pane +import androidx.car.app.model.PaneTemplate +import androidx.car.app.model.Row +import androidx.car.app.model.Template + +/** + * A screen that shows a simple "Hello World!" message. + * + * + * See [HelloWorldService] for the app's entry point to the car host. + */ +class HelloWorldScreen(carContext: CarContext) : Screen(carContext) { + override fun onGetTemplate(): Template { + val row = Row.Builder().setTitle("Hello AndroidX!").build() + return PaneTemplate.Builder(Pane.Builder().addRow(row).build()) + .setHeaderAction(Action.APP_ICON) + .build() + } +} diff --git a/car_app_library/helloworld/shared/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldService.kt b/car_app_library/helloworld/shared/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldService.kt new file mode 100644 index 0000000..ebd298d --- /dev/null +++ b/car_app_library/helloworld/shared/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldService.kt @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package androidx.car.app.sample.helloworld.common + +import android.content.Intent +import android.content.pm.ApplicationInfo +import androidx.car.app.CarAppService +import androidx.car.app.R +import androidx.car.app.Screen +import androidx.car.app.Session +import androidx.car.app.validation.HostValidator + +//import androidx.car.app.SessionInfo; +/** + * Entry point for the hello world app. + * + * + * [CarAppService] is the main interface between the app and the car host. For more + * details, see the [Android for + * Cars Library developer guide](https://developer.android.com/training/cars/navigation). + */ +class HelloWorldService : CarAppService() { + // @Override + // public Session onCreateSession(@NonNull SessionInfo sessionInfo) { + override fun onCreateSession(): Session { + return object : Session() { + override fun onCreateScreen(intent: Intent): Screen { + return HelloWorldScreen(carContext) + } + } + } + + override fun createHostValidator(): HostValidator { + return if ((applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE) != 0) { + HostValidator.ALLOW_ALL_HOSTS_VALIDATOR + } else { + HostValidator.Builder(applicationContext) + .addAllowedHosts(R.array.hosts_allowlist_sample) + .build() + } + } +} diff --git a/car_app_library/helloworld/common/src/main/res/drawable/ic_launcher.xml b/car_app_library/helloworld/shared/src/main/res/drawable/ic_launcher.xml similarity index 100% rename from car_app_library/helloworld/common/src/main/res/drawable/ic_launcher.xml rename to car_app_library/helloworld/shared/src/main/res/drawable/ic_launcher.xml diff --git a/car_app_library/helloworld/common/src/main/res/values/strings.xml b/car_app_library/helloworld/shared/src/main/res/values/strings.xml similarity index 100% rename from car_app_library/helloworld/common/src/main/res/values/strings.xml rename to car_app_library/helloworld/shared/src/main/res/values/strings.xml diff --git a/car_app_library/helloworld/common/src/main/res/xml/automotive_app_desc.xml b/car_app_library/helloworld/shared/src/main/res/xml/automotive_app_desc.xml similarity index 100% rename from car_app_library/helloworld/common/src/main/res/xml/automotive_app_desc.xml rename to car_app_library/helloworld/shared/src/main/res/xml/automotive_app_desc.xml diff --git a/car_app_library/helloworld/shared/src/test/java/androidx/car/app/sample/helloworld/common/HelloWorldScreenTest.kt b/car_app_library/helloworld/shared/src/test/java/androidx/car/app/sample/helloworld/common/HelloWorldScreenTest.kt new file mode 100644 index 0000000..e69de29 diff --git a/car_app_library/helloworld/shared/src/test/java/androidx/car/app/sample/helloworld/common/HelloWorldSessionTest.kt b/car_app_library/helloworld/shared/src/test/java/androidx/car/app/sample/helloworld/common/HelloWorldSessionTest.kt new file mode 100644 index 0000000..e69de29 diff --git a/car_app_library/helloworld/common/src/test/resources/robolectric.properties b/car_app_library/helloworld/shared/src/test/resources/robolectric.properties similarity index 100% rename from car_app_library/helloworld/common/src/test/resources/robolectric.properties rename to car_app_library/helloworld/shared/src/test/resources/robolectric.properties diff --git a/car_app_library/navigation/automotive/.gitignore b/car_app_library/navigation/automotive/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/car_app_library/navigation/automotive/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/car_app_library/navigation/automotive/build.gradle b/car_app_library/navigation/automotive/build.gradle deleted file mode 100644 index 4073af5..0000000 --- a/car_app_library/navigation/automotive/build.gradle +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -apply plugin: 'com.android.application' - -android { - compileSdk 33 - - defaultConfig { - applicationId "androidx.car.app.sample.navigation" - minSdkVersion 29 - targetSdkVersion 33 - // Increment this to generate signed builds for uploading to Playstore - // Make sure this is different from the navigation-mobile version - versionCode 113 - versionName "113" - } - - buildTypes { - release { - // Enables code shrinking, obfuscation, and optimization. - minifyEnabled true - proguardFiles getDefaultProguardFile( - 'proguard-android-optimize.txt'), - 'proguard-rules.pro' - } - } - - compileOptions { - targetCompatibility = JavaVersion.VERSION_1_8 - sourceCompatibility = JavaVersion.VERSION_1_8 - } - namespace "androidx.car.app.sample.navigation" -} - -dependencies { - implementation "androidx.car.app:app-automotive:1.3.0-beta01" - implementation project(":navigation:common") -} diff --git a/car_app_library/navigation/automotive/build.gradle.kts b/car_app_library/navigation/automotive/build.gradle.kts new file mode 100644 index 0000000..f5635d0 --- /dev/null +++ b/car_app_library/navigation/automotive/build.gradle.kts @@ -0,0 +1,21 @@ +plugins { + kotlin("android") + id("android-application-module") +} + +android { + namespace = "androidx.car.app.sample.navigation" + defaultConfig { + applicationId = "androidx.car.app.sample.navigation" + } +} + +dependencies { + implementation(libs.androidx.car.automotive) +// implementation(libs.androidx.core.ktx) +// implementation(libs.androidx.appcompat) + implementation(project(":navigation:shared")) +// testImplementation(libs.junit) +// androidTestImplementation(libs.androidx.junit) +// androidTestImplementation(libs.androidx.espresso.core) +} \ No newline at end of file diff --git a/car_app_library/navigation/common/build.gradle b/car_app_library/navigation/common/build.gradle deleted file mode 100644 index a757539..0000000 --- a/car_app_library/navigation/common/build.gradle +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -apply plugin: 'com.android.library' - -android { - compileSdk 33 - - defaultConfig { - minSdkVersion 23 - targetSdkVersion 33 - versionCode 1 - versionName "1.0" - } - compileOptions { - targetCompatibility = JavaVersion.VERSION_1_8 - sourceCompatibility = JavaVersion.VERSION_1_8 - } - namespace "androidx.car.app.sample.navigation.common" -} - -dependencies { - implementation "androidx.constraintlayout:constraintlayout:1.1.3" - implementation "androidx.core:core:1.5.0-alpha01" - - implementation "androidx.car.app:app:1.3.0-beta01" - implementation "androidx.annotation:annotation-experimental:1.0.0" -} diff --git a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/app/MainActivity.java b/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/app/MainActivity.java deleted file mode 100644 index 25ed4cd..0000000 --- a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/app/MainActivity.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.car.app.sample.navigation.common.app; - -import android.Manifest; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.content.ServiceConnection; -import android.os.Bundle; -import android.os.IBinder; -import android.util.Log; -import android.view.View; -import android.widget.Button; -import android.widget.Toast; - -import androidx.activity.ComponentActivity; -import androidx.annotation.Nullable; -import androidx.car.app.connection.CarConnection; -import androidx.car.app.sample.navigation.common.R; -import androidx.car.app.sample.navigation.common.nav.NavigationService; - -/** - * The main app activity. - * - *

See {@link androidx.car.app.sample.navigation.common.car.NavigationCarAppService} for the - * app's entry point to the cat host. - */ -public class MainActivity extends ComponentActivity { - static final String TAG = MainActivity.class.getSimpleName(); - - // A reference to the navigation service used to get location updates and routing. - NavigationService mService = null; - - // Tracks the bound state of the navigation service. - boolean mIsBound = false; - - // Monitors the state of the connection to the navigation service. - private final ServiceConnection mServiceConnection = - new ServiceConnection() { - - @Override - public void onServiceConnected(ComponentName name, IBinder service) { - Log.i(TAG, "In onServiceConnected() component:" + name); - NavigationService.LocalBinder binder = (NavigationService.LocalBinder) service; - mService = binder.getService(); - mIsBound = true; - } - - @Override - public void onServiceDisconnected(ComponentName name) { - Log.i(TAG, "In onServiceDisconnected() component:" + name); - mService = null; - mIsBound = false; - } - }; - - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - Log.i(TAG, "In onCreate()"); - - setContentView(R.layout.activity_main); - - // Hook up some manual navigation controls. - Button startNavButton = findViewById(R.id.start_nav); - startNavButton.setOnClickListener(this::startNavigation); - Button stopNavButton = findViewById(R.id.stop_nav); - stopNavButton.setOnClickListener(this::stopNavigation); - - new CarConnection(this).getType().observe(this, - this::onConnectionStateUpdate); - } - - @Override - protected void onStart() { - super.onStart(); - Log.i(TAG, "In onStart()"); - bindService( - new Intent(this, NavigationService.class), - mServiceConnection, - Context.BIND_AUTO_CREATE); - requestPermissions(new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, 1); - } - - @Override - protected void onStop() { - Log.i(TAG, "In onStop(). bound" + mIsBound); - if (mIsBound) { - // Unbind from the service. This signals to the service that this activity is no longer - // in the foreground, and the service can respond by promoting itself to a foreground - // service. - unbindService(mServiceConnection); - mIsBound = false; - mService = null; - } - super.onStop(); - } - - private void onConnectionStateUpdate(Integer connectionState) { - String message = connectionState > CarConnection.CONNECTION_TYPE_NOT_CONNECTED - ? "Connected to a car head unit" - : "Not Connected to a car head unit"; - Toast.makeText(this, message, Toast.LENGTH_LONG).show(); - } - - private void startNavigation(View view) { - if (mService != null) { - mService.startNavigation(); - } - } - - private void stopNavigation(View view) { - if (mService != null) { - mService.stopNavigation(); - } - } -} diff --git a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/FavoritesScreen.java b/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/FavoritesScreen.java deleted file mode 100644 index df03872..0000000 --- a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/FavoritesScreen.java +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.car.app.sample.navigation.common.car; - -import static android.text.Spanned.SPAN_INCLUSIVE_INCLUSIVE; - -import android.text.SpannableString; -import android.util.Log; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.car.app.CarContext; -import androidx.car.app.Screen; -import androidx.car.app.model.Action; -import androidx.car.app.model.ActionStrip; -import androidx.car.app.model.CarLocation; -import androidx.car.app.model.Distance; -import androidx.car.app.model.DistanceSpan; -import androidx.car.app.model.Header; -import androidx.car.app.model.ItemList; -import androidx.car.app.model.Metadata; -import androidx.car.app.model.Place; -import androidx.car.app.model.Row; -import androidx.car.app.model.Template; -import androidx.car.app.navigation.model.PlaceListNavigationTemplate; -import androidx.car.app.sample.navigation.common.R; -import androidx.car.app.sample.navigation.common.model.DemoScripts; -import androidx.car.app.sample.navigation.common.model.PlaceInfo; - -import java.util.ArrayList; -import java.util.List; - -/** Screen for showing a list of favorite places. */ -public final class FavoritesScreen extends Screen { - private static final String TAG = "NavigationDemo"; - - @Nullable - private List mFavorites; - @NonNull - private final Action mSettingsAction; - @NonNull - private final SurfaceRenderer mSurfaceRenderer; - - public FavoritesScreen( - @NonNull CarContext carContext, - @NonNull Action settingsAction, - @NonNull SurfaceRenderer surfaceRenderer) { - super(carContext); - mSettingsAction = settingsAction; - mSurfaceRenderer = surfaceRenderer; - } - - @NonNull - @Override - public Template onGetTemplate() { - Log.i(TAG, "In FavoritesScreen.onGetTemplate()"); - mSurfaceRenderer.updateMarkerVisibility( - /* showMarkers=*/ false, /* numMarkers=*/ 0, /* activeMarker=*/ -1); - ItemList.Builder listBuilder = new ItemList.Builder(); - - for (PlaceInfo place : getFavorites()) { - SpannableString address = new SpannableString(" \u00b7 " + place.getDisplayAddress()); - DistanceSpan distanceSpan = - DistanceSpan.create( - Distance.create(/* displayDistance= */ 1, Distance.UNIT_KILOMETERS_P1)); - address.setSpan(distanceSpan, 0, 1, SPAN_INCLUSIVE_INCLUSIVE); - listBuilder.addItem( - new Row.Builder() - .setTitle(place.getName()) - .addText(address) - .setOnClickListener(() -> onClickFavorite()) - .setMetadata( - new Metadata.Builder() - .setPlace( - new Place.Builder(CarLocation.create(1, 1)) - .build()) - .build()) - .build()); - } - - Header header = new Header.Builder() - .setStartHeaderAction(Action.BACK) - .setTitle(getCarContext().getString(R.string.app_name)) - .build(); - - return new PlaceListNavigationTemplate.Builder() - .setItemList(listBuilder.build()) - .setActionStrip(new ActionStrip.Builder().addAction(mSettingsAction).build()) - .setHeader(header) - .build(); - } - - private void onClickFavorite() { - getScreenManager() - .pushForResult( - new RoutePreviewScreen(getCarContext(), mSettingsAction, mSurfaceRenderer), - this::onRoutePreviewResult); - } - - private void onRoutePreviewResult(@Nullable Object previewResult) { - int previewIndex = previewResult == null ? -1 : (int) previewResult; - if (previewIndex < 0) { - return; - } - // Start the same demo instructions. More will be added in the future. - setResult(DemoScripts.getNavigateHome(getCarContext())); - finish(); - } - - @NonNull - private List getFavorites() { - // Lazy initialize mFavorites. - if (mFavorites != null) { - return mFavorites; - } - ArrayList favorites = new ArrayList<>(); - PlaceInfo home = - new PlaceInfo( - getCarContext().getString(R.string.home_destination_label), - "9 10th Street."); - favorites.add(home); - PlaceInfo work = - new PlaceInfo( - getCarContext().getString(R.string.work_destination_label), - "2 3rd Street."); - favorites.add(work); - mFavorites = favorites; - return mFavorites; - } -} diff --git a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/MicrophoneRecorder.java b/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/MicrophoneRecorder.java deleted file mode 100644 index 8734b4f..0000000 --- a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/MicrophoneRecorder.java +++ /dev/null @@ -1,256 +0,0 @@ -/* - * Copyright 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.car.app.sample.navigation.common.car; - -import static android.Manifest.permission.RECORD_AUDIO; -import static android.media.AudioAttributes.CONTENT_TYPE_MUSIC; -import static android.media.AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE; -import static android.media.AudioFormat.CHANNEL_OUT_MONO; -import static android.media.AudioFormat.ENCODING_DEFAULT; -import static android.media.AudioManager.AUDIOFOCUS_REQUEST_GRANTED; -import static android.os.Build.VERSION.SDK_INT; - -import static androidx.car.app.media.CarAudioRecord.AUDIO_CONTENT_BUFFER_SIZE; -import static androidx.car.app.media.CarAudioRecord.AUDIO_CONTENT_SAMPLING_RATE; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.content.pm.PackageManager; -import android.media.AudioAttributes; -import android.media.AudioFocusRequest; -import android.media.AudioFormat; -import android.media.AudioManager; -import android.media.AudioTrack; -import android.os.Build.VERSION_CODES; - -import androidx.annotation.NonNull; -import androidx.annotation.RequiresPermission; -import androidx.car.app.CarContext; -import androidx.car.app.CarToast; -import androidx.car.app.media.CarAudioRecord; - -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -/** Manages recording the microphone and accessing the stored data from the microphone. */ -public class MicrophoneRecorder { - private static final String FILE_NAME = "recording.wav"; - - private final CarContext mCarContext; - - public MicrophoneRecorder(@NonNull CarContext carContext) { - mCarContext = carContext; - } - - /** - * Starts recording the car microphone, then plays it back. - */ - public void record() { - if (mCarContext.checkSelfPermission(RECORD_AUDIO) - != PackageManager.PERMISSION_GRANTED) { - CarToast.makeText(mCarContext, "Grant mic permission on phone", - CarToast.LENGTH_LONG).show(); - List permissions = Collections.singletonList(RECORD_AUDIO); - mCarContext.requestPermissions(permissions, (grantedPermissions, - rejectedPermissions) -> { - if (grantedPermissions.contains(RECORD_AUDIO)) { - record(); - } - }); - return; - } - CarAudioRecord record = CarAudioRecord.create(mCarContext); - - Thread recordingThread = - new Thread( - () -> doRecord(record), - "AudioRecorder Thread"); - recordingThread.start(); - } - - @SuppressLint("ClassVerificationFailure") // runtime check for < API 26 - @RequiresPermission(RECORD_AUDIO) - private void play(AudioFocusRequest audioFocusRequest) { - if (SDK_INT < VERSION_CODES.O) { - return; - } - - InputStream inputStream; - try { - inputStream = mCarContext.openFileInput(FILE_NAME); - } catch (FileNotFoundException e) { - e.printStackTrace(); - return; - } - - AudioTrack audioTrack = new AudioTrack.Builder() - .setAudioAttributes(new AudioAttributes.Builder() - .setUsage(USAGE_ASSISTANCE_NAVIGATION_GUIDANCE) - .setContentType(CONTENT_TYPE_MUSIC) - .build()) - .setAudioFormat(new AudioFormat.Builder() - .setEncoding(ENCODING_DEFAULT) - .setSampleRate(AUDIO_CONTENT_SAMPLING_RATE) - .setChannelMask(CHANNEL_OUT_MONO) - .build()) - .setBufferSizeInBytes(AUDIO_CONTENT_BUFFER_SIZE) - .build(); - audioTrack.play(); - try { - while (inputStream.available() > 0) { - byte[] audioData = new byte[AUDIO_CONTENT_BUFFER_SIZE]; - int size = inputStream.read(audioData, 0, audioData.length); - - if (size < 0) { - // End of file - return; - } - audioTrack.write(audioData, 0, size); - } - } catch (IOException e) { - throw new IllegalStateException(e); - } - audioTrack.stop(); - // Abandon the FocusRequest so that user's media can be resumed - mCarContext.getSystemService(AudioManager.class).abandonAudioFocusRequest( - audioFocusRequest); - } - - @SuppressLint("ClassVerificationFailure") // runtime check for < API 26 - @RequiresPermission(RECORD_AUDIO) - private void doRecord(CarAudioRecord record) { - if (SDK_INT < VERSION_CODES.O) { - return; - } - - // Take audio focus so that user's media is not recorded - AudioAttributes audioAttributes = - new AudioAttributes.Builder() - .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH) - .setUsage(USAGE_ASSISTANCE_NAVIGATION_GUIDANCE) - .build(); - - AudioFocusRequest audioFocusRequest = - new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE) - .setAudioAttributes(audioAttributes) - .setOnAudioFocusChangeListener(state -> { - if (state == AudioManager.AUDIOFOCUS_LOSS) { - // Stop recording if audio focus is lost - record.stopRecording(); - } - }) - .build(); - - if (mCarContext.getSystemService(AudioManager.class).requestAudioFocus(audioFocusRequest) - != AUDIOFOCUS_REQUEST_GRANTED) { - return; - } - - record.startRecording(); - - List bytes = new ArrayList<>(); - boolean isRecording = true; - while (isRecording) { - // gets the voice output from microphone to byte format - byte[] bData = new byte[AUDIO_CONTENT_BUFFER_SIZE]; - int len = record.read(bData, 0, AUDIO_CONTENT_BUFFER_SIZE); - - if (len > 0) { - for (int i = 0; i < len; i++) { - bytes.add(bData[i]); - } - } else { - isRecording = false; - } - } - - try { - OutputStream outputStream = mCarContext.openFileOutput(FILE_NAME, Context.MODE_PRIVATE); - addHeader(outputStream, bytes.size()); - for (Byte b : bytes) { - outputStream.write(b); - } - - outputStream.flush(); - outputStream.close(); - } catch (IOException e) { - throw new IllegalStateException(e); - } - record.stopRecording(); - play(audioFocusRequest); - } - - private void addHeader(OutputStream outputStream, int totalAudioLen) throws IOException { - int totalDataLen = totalAudioLen + 36; - byte[] header = new byte[44]; - int dataElementSize = 8; - long longSampleRate = AUDIO_CONTENT_SAMPLING_RATE; - - // See http://soundfile.sapp.org/doc/WaveFormat/ - header[0] = 'R'; // RIFF/WAVE header - header[1] = 'I'; - header[2] = 'F'; - header[3] = 'F'; - header[4] = (byte) (totalAudioLen & 0xff); - header[5] = (byte) ((totalDataLen >> 8) & 0xff); - header[6] = (byte) ((totalDataLen >> 16) & 0xff); - header[7] = (byte) ((totalDataLen >> 24) & 0xff); - header[8] = 'W'; - header[9] = 'A'; - header[10] = 'V'; - header[11] = 'E'; - header[12] = 'f'; // 'fmt ' chunk - header[13] = 'm'; - header[14] = 't'; - header[15] = ' '; - header[16] = 16; // 4 bytes: size of 'fmt ' chunk - header[17] = 0; - header[18] = 0; - header[19] = 0; - header[20] = 1; // format = 1 PCM - header[21] = 0; - header[22] = 1; // Num channels (mono) - header[23] = 0; - header[24] = (byte) (longSampleRate & 0xff); // sample rate - header[25] = (byte) ((longSampleRate >> 8) & 0xff); - header[26] = (byte) ((longSampleRate >> 16) & 0xff); - header[27] = (byte) ((longSampleRate >> 24) & 0xff); - header[28] = (byte) (longSampleRate & 0xff); // byte rate - header[29] = (byte) ((longSampleRate >> 8) & 0xff); - header[30] = (byte) ((longSampleRate >> 16) & 0xff); - header[31] = (byte) ((longSampleRate >> 24) & 0xff); - header[32] = 1; // block align - header[33] = 0; - header[34] = (byte) (dataElementSize & 0xff); // bits per sample - header[35] = (byte) ((dataElementSize >> 8) & 0xff); - header[36] = 'd'; - header[37] = 'a'; - header[38] = 't'; - header[39] = 'a'; - header[40] = (byte) (totalAudioLen & 0xff); - header[41] = (byte) ((totalAudioLen >> 8) & 0xff); - header[42] = (byte) ((totalAudioLen >> 16) & 0xff); - header[43] = (byte) ((totalAudioLen >> 24) & 0xff); - - outputStream.write(header, 0, 44); - } -} diff --git a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/NavigationCarAppService.java b/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/NavigationCarAppService.java deleted file mode 100644 index 84dcbfe..0000000 --- a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/NavigationCarAppService.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.car.app.sample.navigation.common.car; - -import android.app.Notification; -import android.app.NotificationChannel; -import android.app.NotificationManager; -import android.content.pm.ApplicationInfo; -import android.net.Uri; -import android.os.Build; - -import androidx.annotation.NonNull; -import androidx.car.app.CarAppService; -import androidx.car.app.Session; -import androidx.car.app.SessionInfo; -import androidx.car.app.sample.navigation.common.R; -import androidx.car.app.validation.HostValidator; -import androidx.core.app.NotificationCompat; -import androidx.lifecycle.DefaultLifecycleObserver; -import androidx.lifecycle.LifecycleOwner; - -/** - * Entry point for the templated app. - * - *

{@link CarAppService} is the main interface between the app and the car host. For more - * details, see the Android for - * Cars Library developer guide. - */ -public final class NavigationCarAppService extends CarAppService { - /** Navigation session channel id. */ - public static final String CHANNEL_ID = "NavigationSessionChannel"; - - /** The identifier for the notification displayed for the foreground service. */ - private static final int NOTIFICATION_ID = 97654321; - - /** Create a deep link URL from the given deep link action. */ - @NonNull - public static Uri createDeepLinkUri(@NonNull String deepLinkAction) { - return Uri.fromParts( - NavigationSession.URI_SCHEME, NavigationSession.URI_HOST, deepLinkAction); - } - - @SuppressWarnings("deprecation") - @Override - @NonNull - public Session onCreateSession(@NonNull SessionInfo sessionInfo) { - createNotificationChannel(); - - // Turn the car app service into a foreground service in order to make sure we can use all - // granted "while-in-use" permissions (e.g. location) in the app's process. - // The "while-in-use" location permission is granted as long as there is a foreground - // service running in a process in which location access takes place. Here, we set this - // service, and not NavigationService (which runs only during navigation), as a - // foreground service because we need location access even when not navigating. If - // location access is needed only during navigation, we can set NavigationService as a - // foreground service instead. - // See https://developer.android.com/reference/com/google/android/libraries/car/app - // /CarAppService#accessing-location for more details. - startForeground(NOTIFICATION_ID, getNotification()); - NavigationSession session = new NavigationSession(sessionInfo); - session.getLifecycle() - .addObserver( - new DefaultLifecycleObserver() { - @Override - public void onDestroy(@NonNull LifecycleOwner owner) { - stopForeground(true); - } - }); - - return session; - } - - @NonNull - @Override - public HostValidator createHostValidator() { - if ((getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) { - return HostValidator.ALLOW_ALL_HOSTS_VALIDATOR; - } else { - return new HostValidator.Builder(getApplicationContext()) - .addAllowedHosts(androidx.car.app.R.array.hosts_allowlist_sample) - .build(); - } - } - - private void createNotificationChannel() { - NotificationManager notificationManager = getSystemService(NotificationManager.class); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - CharSequence name = "Car App Service"; - NotificationChannel serviceChannel = - new NotificationChannel(CHANNEL_ID, name, NotificationManager.IMPORTANCE_HIGH); - notificationManager.createNotificationChannel(serviceChannel); - } - } - - /** Returns the {@link NotificationCompat} used as part of the foreground service. */ - private Notification getNotification() { - NotificationCompat.Builder builder = - new NotificationCompat.Builder(this, CHANNEL_ID) - .setContentTitle("Navigation App") - .setContentText("App is running") - .setSmallIcon(R.drawable.ic_launcher); - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - builder.setChannelId(CHANNEL_ID); - builder.setPriority(NotificationManager.IMPORTANCE_HIGH); - } - return builder.build(); - } -} diff --git a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/NavigationScreen.java b/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/NavigationScreen.java deleted file mode 100644 index 3d72083..0000000 --- a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/NavigationScreen.java +++ /dev/null @@ -1,343 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.car.app.sample.navigation.common.car; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.car.app.CarContext; -import androidx.car.app.CarToast; -import androidx.car.app.Screen; -import androidx.car.app.model.Action; -import androidx.car.app.model.ActionStrip; -import androidx.car.app.model.CarColor; -import androidx.car.app.model.CarIcon; -import androidx.car.app.model.Distance; -import androidx.car.app.model.Template; -import androidx.car.app.navigation.model.Destination; -import androidx.car.app.navigation.model.Lane; -import androidx.car.app.navigation.model.MessageInfo; -import androidx.car.app.navigation.model.NavigationTemplate; -import androidx.car.app.navigation.model.RoutingInfo; -import androidx.car.app.navigation.model.Step; -import androidx.car.app.navigation.model.TravelEstimate; -import androidx.car.app.sample.navigation.common.R; -import androidx.car.app.sample.navigation.common.model.Instruction; -import androidx.core.graphics.drawable.IconCompat; - -import java.util.ArrayList; -import java.util.List; - -/** Simple demo of how to present a trip on the routing screen. */ -public final class NavigationScreen extends Screen { - /** Invalid zoom focal point value, used for the zoom buttons. */ - private static final float INVALID_FOCAL_POINT_VAL = -1f; - - /** Zoom-in scale factor, used for the zoom-in button. */ - private static final float ZOOM_IN_BUTTON_SCALE_FACTOR = 1.1f; - - /** Zoom-out scale factor, used for the zoom-out button. */ - private static final float ZOOM_OUT_BUTTON_SCALE_FACTOR = 0.9f; - - /** A listener for navigation start and stop signals. */ - public interface Listener { - /** Executes the given instructions. */ - void executeScript(@NonNull List instructions); - - /** Stops navigation. */ - void stopNavigation(); - } - - @NonNull - private final Listener mListener; - @NonNull - private final Action mSettingsAction; - @NonNull - private final SurfaceRenderer mSurfaceRenderer; - @NonNull - private final MicrophoneRecorder mMicrophoneRecorder; - - private boolean mIsNavigating; - private boolean mIsRerouting; - private boolean mHasArrived; - - @Nullable - private List mDestinations; - - @Nullable - private List mSteps; - - @Nullable - private Distance mStepRemainingDistance; - - @Nullable - private TravelEstimate mDestinationTravelEstimate; - private boolean mShouldShowNextStep; - private boolean mShouldShowLanes; - - @Nullable - CarIcon mJunctionImage; - - private boolean mIsInPanMode; - - public NavigationScreen( - @NonNull CarContext carContext, - @NonNull Action settingsAction, - @NonNull Listener listener, - @NonNull SurfaceRenderer surfaceRenderer) { - super(carContext); - mListener = listener; - mSettingsAction = settingsAction; - mSurfaceRenderer = surfaceRenderer; - mMicrophoneRecorder = new MicrophoneRecorder(carContext); - } - - /** Updates the navigation screen with the next instruction. */ - public void updateTrip( - boolean isNavigating, - boolean isRerouting, - boolean hasArrived, - @Nullable List destinations, - @Nullable List steps, - @Nullable TravelEstimate nextDestinationTravelEstimate, - @Nullable Distance nextStepRemainingDistance, - boolean shouldShowNextStep, - boolean shouldShowLanes, - @Nullable CarIcon junctionImage) { - mIsNavigating = isNavigating; - mIsRerouting = isRerouting; - mHasArrived = hasArrived; - mDestinations = destinations; - mSteps = steps; - mStepRemainingDistance = nextStepRemainingDistance; - mDestinationTravelEstimate = nextDestinationTravelEstimate; - mShouldShowNextStep = shouldShowNextStep; - mShouldShowLanes = shouldShowLanes; - mJunctionImage = junctionImage; - invalidate(); - } - - @NonNull - @Override - public Template onGetTemplate() { - mSurfaceRenderer.updateMarkerVisibility( - /* showMarkers=*/ false, /* numMarkers=*/ 0, /* activeMarker=*/ -1); - - NavigationTemplate.Builder builder = new NavigationTemplate.Builder(); - builder.setBackgroundColor(CarColor.SECONDARY); - - // Set the action strip. - ActionStrip.Builder actionStripBuilder = new ActionStrip.Builder(); - if (mIsNavigating) { - actionStripBuilder.addAction( - new Action.Builder() - .setIcon( - new CarIcon.Builder( - IconCompat.createWithResource( - getCarContext(), - R.drawable.ic_add_stop)) - .build()) - .setOnClickListener(this::openFavorites) - .build()); - } - - actionStripBuilder.addAction(mSettingsAction); - actionStripBuilder.addAction( - new Action.Builder() - .setTitle("Voice") - .setIcon(new CarIcon.Builder( - IconCompat.createWithResource(getCarContext(), - R.drawable.ic_mic)).build()).setOnClickListener( - mMicrophoneRecorder::record) - .build()); - if (mIsNavigating) { - actionStripBuilder.addAction( - new Action.Builder() - .setTitle("Stop") - .setOnClickListener(this::stopNavigation) - .build()); - } else { - actionStripBuilder.addAction( - new Action.Builder() - .setTitle("Search") - .setIcon( - new CarIcon.Builder( - IconCompat.createWithResource( - getCarContext(), - R.drawable.ic_search_black36dp)) - .build()) - .setOnClickListener(this::openSearch) - .build()); - actionStripBuilder.addAction( - new Action.Builder() - .setTitle("Favorites") - .setIcon( - new CarIcon.Builder( - IconCompat.createWithResource( - getCarContext(), - R.drawable.ic_favorite_white_24dp)) - .build()) - .setOnClickListener(this::openFavorites) - .build()); - } - builder.setActionStrip(actionStripBuilder.build()); - - // Set the map action strip with the pan and zoom buttons. - CarIcon.Builder panIconBuilder = new CarIcon.Builder( - IconCompat.createWithResource( - getCarContext(), - R.drawable.ic_pan_24)); - if (mIsInPanMode) { - panIconBuilder.setTint(CarColor.BLUE); - } - - builder.setMapActionStrip(new ActionStrip.Builder() - .addAction(new Action.Builder(Action.PAN) - .setIcon(panIconBuilder.build()) - .build()) - .addAction( - new Action.Builder() - .setIcon( - new CarIcon.Builder( - IconCompat.createWithResource( - getCarContext(), - R.drawable.ic_recenter_24)) - .build()) - .setOnClickListener( - () -> mSurfaceRenderer.handleRecenter()) - .build()) - .addAction( - new Action.Builder() - .setIcon( - new CarIcon.Builder( - IconCompat.createWithResource( - getCarContext(), - R.drawable.ic_zoom_out_24)) - .build()) - .setOnClickListener( - () -> mSurfaceRenderer.handleScale(INVALID_FOCAL_POINT_VAL, - INVALID_FOCAL_POINT_VAL, - ZOOM_OUT_BUTTON_SCALE_FACTOR)) - .build()) - .addAction( - new Action.Builder() - .setIcon( - new CarIcon.Builder( - IconCompat.createWithResource( - getCarContext(), - R.drawable.ic_zoom_in_24)) - .build()) - .setOnClickListener( - () -> mSurfaceRenderer.handleScale(INVALID_FOCAL_POINT_VAL, - INVALID_FOCAL_POINT_VAL, - ZOOM_IN_BUTTON_SCALE_FACTOR)) - .build()) - .build()); - - // When the user enters the pan mode, remind the user that they can exit the pan mode by - // pressing the select button again. - builder.setPanModeListener(isInPanMode -> { - if (isInPanMode) { - CarToast.makeText(getCarContext(), - "Press Select to exit the pan mode", - CarToast.LENGTH_LONG).show(); - } - mIsInPanMode = isInPanMode; - invalidate(); - }); - - if (mIsNavigating) { - if (mDestinationTravelEstimate != null) { - builder.setDestinationTravelEstimate(mDestinationTravelEstimate); - } - - if (isRerouting()) { - builder.setNavigationInfo(new RoutingInfo.Builder().setLoading(true).build()); - } else if (mHasArrived) { - - MessageInfo messageInfo = new MessageInfo.Builder( - getCarContext().getString(R.string.navigation_arrived)).build(); - builder.setNavigationInfo(messageInfo); - } else { - RoutingInfo.Builder info = new RoutingInfo.Builder(); - Step tmp = mSteps.get(0); - Step.Builder currentStep = - new Step.Builder(tmp.getCue().toCharSequence()) - .setManeuver(tmp.getManeuver()) - .setRoad(tmp.getRoad().toCharSequence()); - if (mShouldShowLanes) { - for (Lane lane : tmp.getLanes()) { - currentStep.addLane(lane); - } - currentStep.setLanesImage(tmp.getLanesImage()); - } - info.setCurrentStep(currentStep.build(), mStepRemainingDistance); - if (mShouldShowNextStep && mSteps.size() > 1) { - info.setNextStep(mSteps.get(1)); - } - if (mJunctionImage != null) { - info.setJunctionImage(mJunctionImage); - } - builder.setNavigationInfo(info.build()); - } - } - - return builder.build(); - } - - private boolean isRerouting() { - return mIsRerouting || mDestinations == null; - } - - private void stopNavigation() { - mListener.stopNavigation(); - } - - private void openFavorites() { - getScreenManager() - .pushForResult( - new FavoritesScreen(getCarContext(), mSettingsAction, mSurfaceRenderer), - (obj) -> { - if (obj == null || mIsNavigating) { - return; - } - // Need to copy over each element to satisfy Java type safety. - List results = (List) obj; - List instructions = new ArrayList(); - for (Object result : results) { - instructions.add((Instruction) result); - } - mListener.executeScript(instructions); - }); - } - - private void openSearch() { - getScreenManager() - .pushForResult( - new SearchScreen(getCarContext(), mSettingsAction, mSurfaceRenderer), - (obj) -> { - if (obj != null) { - // Need to copy over each element to satisfy Java type safety. - List results = (List) obj; - List instructions = new ArrayList(); - for (Object result : results) { - instructions.add((Instruction) result); - } - mListener.executeScript(instructions); - } - }); - } -} diff --git a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/NavigationSession.java b/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/NavigationSession.java deleted file mode 100644 index 4fe2428..0000000 --- a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/NavigationSession.java +++ /dev/null @@ -1,331 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.car.app.sample.navigation.common.car; - -import android.Manifest; -import android.annotation.SuppressLint; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.content.ServiceConnection; -import android.content.pm.PackageManager; -import android.content.res.Configuration; -import android.location.Location; -import android.location.LocationManager; -import android.net.Uri; -import android.os.IBinder; -import android.util.Log; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.car.app.CarContext; -import androidx.car.app.CarToast; -import androidx.car.app.Screen; -import androidx.car.app.ScreenManager; -import androidx.car.app.Session; -import androidx.car.app.SessionInfo; -import androidx.car.app.model.Action; -import androidx.car.app.model.CarIcon; -import androidx.car.app.model.Distance; -import androidx.car.app.navigation.model.Destination; -import androidx.car.app.navigation.model.Step; -import androidx.car.app.navigation.model.TravelEstimate; -import androidx.car.app.sample.navigation.common.R; -import androidx.car.app.sample.navigation.common.model.Instruction; -import androidx.car.app.sample.navigation.common.nav.NavigationService; -import androidx.core.graphics.drawable.IconCompat; -import androidx.core.location.LocationListenerCompat; -import androidx.lifecycle.DefaultLifecycleObserver; -import androidx.lifecycle.Lifecycle; -import androidx.lifecycle.LifecycleObserver; -import androidx.lifecycle.LifecycleOwner; - -import java.util.ArrayList; -import java.util.List; - -/** Session class for the Navigation sample app. */ -class NavigationSession extends Session implements NavigationScreen.Listener { - static final String TAG = NavigationSession.class.getSimpleName(); - - static final String URI_SCHEME = "samples"; - static final String URI_HOST = "navigation"; - - @Nullable - NavigationScreen mNavigationScreen; - - @Nullable - SurfaceRenderer mNavigationCarSurface; - - // A reference to the navigation service used to get location updates and routing. - @Nullable - NavigationService mService; - - @NonNull - Action mSettingsAction; - - final NavigationService.Listener mServiceListener = - new NavigationService.Listener() { - @Override - public void navigationStateChanged( - boolean isNavigating, - boolean isRerouting, - boolean hasArrived, - @Nullable List destinations, - @Nullable List steps, - @Nullable TravelEstimate nextDestinationTravelEstimate, - @Nullable Distance nextStepRemainingDistance, - boolean shouldShowNextStep, - boolean shouldShowLanes, - @Nullable CarIcon junctionImage) { - mNavigationScreen.updateTrip( - isNavigating, - isRerouting, - hasArrived, - destinations, - steps, - nextDestinationTravelEstimate, - nextStepRemainingDistance, - shouldShowNextStep, - shouldShowLanes, - junctionImage); - } - }; - - // A listener to periodically update the surface with the location coordinates - LocationListenerCompat mLocationListener = - location -> mNavigationCarSurface.updateLocationString(getLocationString(location)); - - // Monitors the state of the connection to the Navigation service. - final ServiceConnection mServiceConnection = - new ServiceConnection() { - @Override - public void onServiceConnected(ComponentName name, IBinder service) { - Log.i(TAG, "In onServiceConnected() component:" + name); - NavigationService.LocalBinder binder = (NavigationService.LocalBinder) service; - mService = binder.getService(); - mService.setCarContext(getCarContext(), mServiceListener); - } - - @Override - public void onServiceDisconnected(ComponentName name) { - Log.i(TAG, "In onServiceDisconnected() component:" + name); - // Unhook map models here - mService.clearCarContext(); - mService = null; - } - }; - - private final LifecycleObserver mLifeCycleObserver = - new DefaultLifecycleObserver() { - - @Override - public void onCreate(@NonNull LifecycleOwner lifecycleOwner) { - Log.i(TAG, "In onCreate()"); - } - - @Override - public void onStart(@NonNull LifecycleOwner lifecycleOwner) { - Log.i(TAG, "In onStart()"); - getCarContext() - .bindService( - new Intent(getCarContext(), NavigationService.class), - mServiceConnection, - Context.BIND_AUTO_CREATE); - } - - @Override - public void onResume(@NonNull LifecycleOwner lifecycleOwner) { - Log.i(TAG, "In onResume()"); - } - - @Override - public void onPause(@NonNull LifecycleOwner lifecycleOwner) { - Log.i(TAG, "In onPause()"); - } - - @Override - public void onStop(@NonNull LifecycleOwner lifecycleOwner) { - Log.i(TAG, "In onStop()"); - getCarContext().unbindService(mServiceConnection); - mService = null; - } - - @Override - public void onDestroy(@NonNull LifecycleOwner lifecycleOwner) { - Log.i(TAG, "In onDestroy()"); - - LocationManager locationManager = - (LocationManager) - getCarContext().getSystemService(Context.LOCATION_SERVICE); - locationManager.removeUpdates(mLocationListener); - } - }; - - NavigationSession(@NonNull SessionInfo sessionInfo) { - if (sessionInfo.getDisplayType() == SessionInfo.DISPLAY_TYPE_MAIN) { - Lifecycle lifecycle = getLifecycle(); - lifecycle.addObserver(mLifeCycleObserver); - } - } - - @Override - @NonNull - public Screen onCreateScreen(@NonNull Intent intent) { - Log.i(TAG, "In onCreateScreen()"); - - mSettingsAction = - new Action.Builder() - .setIcon( - new CarIcon.Builder( - IconCompat.createWithResource( - getCarContext(), R.drawable.ic_settings)) - .build()) - .setOnClickListener( - () -> { - getCarContext() - .getCarService(ScreenManager.class) - .push(new SettingsScreen(getCarContext())); - }) - .build(); - - mNavigationCarSurface = new SurfaceRenderer(getCarContext(), getLifecycle()); - mNavigationScreen = - new NavigationScreen(getCarContext(), mSettingsAction, this, mNavigationCarSurface); - - String action = intent.getAction(); - if (action != null && CarContext.ACTION_NAVIGATE.equals(action)) { - CarToast.makeText( - getCarContext(), - "Navigation intent: " + intent.getDataString(), - CarToast.LENGTH_LONG) - .show(); - } - - if (getCarContext().checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) - == PackageManager.PERMISSION_GRANTED) { - requestLocationUpdates(); - } else { - // If we do not have the location permission, preseed the navigation screen first, and - // push - // the request permission screen. When the user grants the location permission, the - // request - // permission screen will be popped and the navigation screen will be displayed. - getCarContext().getCarService(ScreenManager.class).push(mNavigationScreen); - return new RequestPermissionScreen(getCarContext(), this::requestLocationUpdates); - } - - return mNavigationScreen; - } - - @Override - public void onNewIntent(@NonNull Intent intent) { - Log.i(TAG, "In onNewIntent() " + intent); - ScreenManager screenManager = getCarContext().getCarService(ScreenManager.class); - if (CarContext.ACTION_NAVIGATE.equals(intent.getAction())) { - Uri uri = Uri.parse("http://" + intent.getDataString()); - screenManager.popToRoot(); - screenManager.pushForResult( - new SearchResultsScreen( - getCarContext(), - mSettingsAction, - mNavigationCarSurface, - uri.getQueryParameter("q")), - (obj) -> { - if (obj != null) { - // Need to copy over each element to satisfy Java type safety. - List results = (List) obj; - List instructions = new ArrayList(); - for (Object result : results) { - instructions.add((Instruction) result); - } - executeScript(instructions); - } - }); - - return; - } - - // Process the intent from DeepLinkNotificationReceiver. Bring the routing screen back to - // the - // top if any other screens were pushed onto it. - Uri uri = intent.getData(); - if (uri != null - && URI_SCHEME.equals(uri.getScheme()) - && URI_HOST.equals(uri.getSchemeSpecificPart())) { - - Screen top = screenManager.getTop(); - switch (uri.getFragment()) { - case NavigationService.DEEP_LINK_ACTION: - if (!(top instanceof NavigationScreen)) { - screenManager.popToRoot(); - } - break; - default: - // No-op - } - } - } - - @Override - public void onCarConfigurationChanged(@NonNull Configuration newConfiguration) { - mNavigationCarSurface.onCarConfigurationChanged(); - } - - @Override - public void executeScript(@NonNull List instructions) { - if (mService != null) { - mService.executeInstructions(instructions); - } - } - - @Override - public void stopNavigation() { - if (mService != null) { - mService.stopNavigation(); - } - } - - /** - * Requests location updates for the navigation surface. - * - * @throws java.lang.SecurityException if the app does not have the location permission. - */ - @SuppressLint("MissingPermission") - void requestLocationUpdates() { - LocationManager locationManager = - (LocationManager) getCarContext().getSystemService(Context.LOCATION_SERVICE); - Location location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER); - mNavigationCarSurface.updateLocationString(getLocationString(location)); - locationManager.requestLocationUpdates( - LocationManager.GPS_PROVIDER, - /* minTimeMs= */ 1000, - /* minDistanceM= */ 1, - mLocationListener); - } - - static String getLocationString(@Nullable Location location) { - if (location == null) { - return "unknown"; - } - return "time: " - + location.getTime() - + " lat: " - + location.getLatitude() - + " lng: " - + location.getLongitude(); - } -} diff --git a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/RequestPermissionScreen.java b/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/RequestPermissionScreen.java deleted file mode 100644 index d1400a6..0000000 --- a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/RequestPermissionScreen.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.car.app.sample.navigation.common.car; - -import static android.Manifest.permission.ACCESS_FINE_LOCATION; - -import androidx.annotation.NonNull; -import androidx.car.app.CarContext; -import androidx.car.app.CarToast; -import androidx.car.app.Screen; -import androidx.car.app.model.Action; -import androidx.car.app.model.CarColor; -import androidx.car.app.model.MessageTemplate; -import androidx.car.app.model.OnClickListener; -import androidx.car.app.model.ParkedOnlyOnClickListener; -import androidx.car.app.model.Template; - -import java.util.ArrayList; -import java.util.List; - -/** Screen for asking the user to grant location permission. */ -public class RequestPermissionScreen extends Screen { - - /** Callback called when the location permission is granted. */ - public interface LocationPermissionCheckCallback { - /** Callback called when the location permission is granted. */ - void onPermissionGranted(); - } - - LocationPermissionCheckCallback mLocationPermissionCheckCallback; - - public RequestPermissionScreen( - @NonNull CarContext carContext, @NonNull LocationPermissionCheckCallback callback) { - super(carContext); - mLocationPermissionCheckCallback = callback; - } - - @NonNull - @Override - public Template onGetTemplate() { - List permissions = new ArrayList<>(); - permissions.add(ACCESS_FINE_LOCATION); - - String message = "This app needs access to location in order to navigate"; - - OnClickListener listener = ParkedOnlyOnClickListener.create(() -> - getCarContext().requestPermissions( - permissions, - (approved, rejected) -> { - CarToast.makeText( - getCarContext(), - String.format("Approved: %s Rejected: %s", approved, rejected), - CarToast.LENGTH_LONG).show(); - if (!approved.isEmpty()) { - mLocationPermissionCheckCallback.onPermissionGranted(); - finish(); - } - })); - - Action action = new Action.Builder() - .setTitle("Grant Access") - .setBackgroundColor(CarColor.GREEN) - .setOnClickListener(listener) - .build(); - - return new MessageTemplate.Builder(message).addAction(action).setHeaderAction( - Action.APP_ICON).build(); - } -} diff --git a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/RoutePreviewScreen.java b/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/RoutePreviewScreen.java deleted file mode 100644 index 2b3bdec..0000000 --- a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/RoutePreviewScreen.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.car.app.sample.navigation.common.car; - -import android.text.SpannableString; -import android.util.Log; - -import androidx.annotation.NonNull; -import androidx.car.app.CarContext; -import androidx.car.app.Screen; -import androidx.car.app.model.Action; -import androidx.car.app.model.ActionStrip; -import androidx.car.app.model.DurationSpan; -import androidx.car.app.model.Header; -import androidx.car.app.model.ItemList; -import androidx.car.app.model.Row; -import androidx.car.app.model.Template; -import androidx.car.app.navigation.model.RoutePreviewNavigationTemplate; -import androidx.car.app.sample.navigation.common.R; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.TimeUnit; - -/** The route preview screen for the app. */ -public final class RoutePreviewScreen extends Screen { - private static final String TAG = "NavigationDemo"; - - @NonNull - private final Action mSettingsAction; - @NonNull - private final SurfaceRenderer mSurfaceRenderer; - @NonNull - private final List mRouteRows; - - int mLastSelectedIndex = -1; - - public RoutePreviewScreen( - @NonNull CarContext carContext, - @NonNull Action settingsAction, - @NonNull SurfaceRenderer surfaceRenderer) { - super(carContext); - mSettingsAction = settingsAction; - mSurfaceRenderer = surfaceRenderer; - - mRouteRows = new ArrayList<>(); - SpannableString firstRoute = new SpannableString(" \u00b7 Shortest route"); - firstRoute.setSpan(DurationSpan.create(TimeUnit.HOURS.toSeconds(26)), 0, 1, 0); - SpannableString secondRoute = new SpannableString(" \u00b7 Less busy"); - secondRoute.setSpan(DurationSpan.create(TimeUnit.HOURS.toSeconds(24)), 0, 1, 0); - SpannableString thirdRoute = new SpannableString(" \u00b7 HOV friendly"); - thirdRoute.setSpan(DurationSpan.create(TimeUnit.MINUTES.toSeconds(867)), 0, 1, 0); - - mRouteRows.add(new Row.Builder().setTitle(firstRoute).addText("Via NE 8th Street").build()); - mRouteRows.add(new Row.Builder().setTitle(secondRoute).addText("Via NE 1st Ave").build()); - mRouteRows.add(new Row.Builder().setTitle(thirdRoute).addText("Via NE 4th Street").build()); - } - - @NonNull - @Override - public Template onGetTemplate() { - Log.i(TAG, "In RoutePreviewScreen.onGetTemplate()"); - onRouteSelected(0); - - ItemList.Builder listBuilder = new ItemList.Builder(); - listBuilder - .setOnSelectedListener(this::onRouteSelected) - .setOnItemsVisibilityChangedListener(this::onRoutesVisible); - for (Row row : mRouteRows) { - listBuilder.addItem(row); - } - - Header header = new Header.Builder() - .setStartHeaderAction(Action.BACK) - .setTitle(getCarContext().getString(R.string.route_preview)) - .build(); - - return new RoutePreviewNavigationTemplate.Builder() - .setItemList(listBuilder.build()) - .setActionStrip(new ActionStrip.Builder().addAction(mSettingsAction).build()) - .setHeader(header) - .setNavigateAction( - new Action.Builder() - .setTitle("Continue to route") - .setOnClickListener(this::onNavigate) - .build()) - .build(); - } - - private void onRouteSelected(int index) { - mLastSelectedIndex = index; - mSurfaceRenderer.updateMarkerVisibility( - /* showMarkers=*/ true, - /* numMarkers=*/ mRouteRows.size(), - /* activeMarker=*/ mLastSelectedIndex); - } - - private void onRoutesVisible(int startIndex, int endIndex) { - if (Log.isLoggable(TAG, Log.INFO)) { - Log.i(TAG, "In RoutePreviewScreen.onRoutesVisible start:" + startIndex + " end:" - + endIndex); - } - } - - private void onNavigate() { - setResult(mLastSelectedIndex); - finish(); - } -} diff --git a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/SearchResultsScreen.java b/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/SearchResultsScreen.java deleted file mode 100644 index 8693519..0000000 --- a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/SearchResultsScreen.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.car.app.sample.navigation.common.car; - -import static android.text.Spanned.SPAN_INCLUSIVE_INCLUSIVE; - -import android.text.SpannableString; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.car.app.CarContext; -import androidx.car.app.Screen; -import androidx.car.app.model.Action; -import androidx.car.app.model.ActionStrip; -import androidx.car.app.model.CarLocation; -import androidx.car.app.model.Distance; -import androidx.car.app.model.DistanceSpan; -import androidx.car.app.model.Header; -import androidx.car.app.model.ItemList; -import androidx.car.app.model.Metadata; -import androidx.car.app.model.Place; -import androidx.car.app.model.Row; -import androidx.car.app.model.Template; -import androidx.car.app.navigation.model.PlaceListNavigationTemplate; -import androidx.car.app.sample.navigation.common.model.DemoScripts; -import androidx.car.app.sample.navigation.common.model.PlaceInfo; - -/** Screen for showing a list of places from a search. */ -public final class SearchResultsScreen extends Screen { - @NonNull - private final Action mSettingsAction; - @NonNull - private final SurfaceRenderer mSurfaceRenderer; - @NonNull - private final String mSearchText; - - public SearchResultsScreen( - @NonNull CarContext carContext, - @NonNull Action settingsAction, - @NonNull SurfaceRenderer surfaceRenderer, - @NonNull String searchText) { - super(carContext); - mSettingsAction = settingsAction; - mSurfaceRenderer = surfaceRenderer; - mSearchText = searchText; - } - - @NonNull - @Override - public Template onGetTemplate() { - mSurfaceRenderer.updateMarkerVisibility( - /* showMarkers=*/ false, /* numMarkers=*/ 0, /* activeMarker=*/ -1); - ItemList.Builder listBuilder = new ItemList.Builder(); - - int numItems = ((int) (Math.random() * 6.0)) + 1; - - for (int i = 0; i < numItems; i++) { - PlaceInfo place = - new PlaceInfo( - String.format("Result %d", i + 1), - String.format("%d Main Street.", (i + 1) * 10)); - - SpannableString address = new SpannableString(" \u00b7 " + place.getDisplayAddress()); - DistanceSpan distanceSpan = - DistanceSpan.create( - Distance.create( - /* displayDistance= */ i + 1, Distance.UNIT_KILOMETERS_P1)); - address.setSpan(distanceSpan, 0, 1, SPAN_INCLUSIVE_INCLUSIVE); - listBuilder.addItem( - new Row.Builder() - .setTitle(place.getName()) - .addText(address) - .setOnClickListener(() -> onClickItem()) - .setMetadata( - new Metadata.Builder() - .setPlace( - new Place.Builder(CarLocation.create(1, 1)) - .build()) - .build()) - .build()); - } - - Header header = new Header.Builder() - .setStartHeaderAction(Action.BACK) - .setTitle("Search: " + mSearchText) - .build(); - - return new PlaceListNavigationTemplate.Builder() - .setItemList(listBuilder.build()) - .setHeader(header) - .setActionStrip(new ActionStrip.Builder().addAction(mSettingsAction).build()) - .build(); - } - - private void onClickItem() { - getScreenManager() - .pushForResult( - new RoutePreviewScreen(getCarContext(), mSettingsAction, mSurfaceRenderer), - this::onRoutePreviewResult); - } - - private void onRoutePreviewResult(@Nullable Object previewResult) { - int previewIndex = previewResult == null ? -1 : (int) previewResult; - if (previewIndex < 0) { - return; - } - // Start the same demo instructions. More will be added in the future. - setResult(DemoScripts.getNavigateHome(getCarContext())); - finish(); - } -} diff --git a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/SearchScreen.java b/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/SearchScreen.java deleted file mode 100644 index 72a8f01..0000000 --- a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/SearchScreen.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.car.app.sample.navigation.common.car; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.car.app.CarContext; -import androidx.car.app.Screen; -import androidx.car.app.model.Action; -import androidx.car.app.model.ItemList; -import androidx.car.app.model.Row; -import androidx.car.app.model.SearchTemplate; -import androidx.car.app.model.SearchTemplate.SearchCallback; -import androidx.car.app.model.Template; -import androidx.car.app.sample.navigation.common.model.DemoScripts; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** Screen for showing entering a search and showing initial results. */ -public final class SearchScreen extends Screen { - - @NonNull - private final Action mSettingsAction; - - @NonNull - private final SurfaceRenderer mSurfaceRenderer; - - private ItemList mItemList = withNoResults(new ItemList.Builder()).build(); - final List mTitles = new ArrayList<>(); - - @Nullable - private String mSearchText; - private final List mFakeTitles = - new ArrayList<>(Arrays.asList("Starbucks", "Shell", "Costco", "Aldi", "Safeway")); - - public SearchScreen( - @NonNull CarContext carContext, - @NonNull Action settingsAction, - @NonNull SurfaceRenderer surfaceRenderer) { - super(carContext); - mSettingsAction = settingsAction; - mSurfaceRenderer = surfaceRenderer; - } - - @NonNull - @Override - public Template onGetTemplate() { - return new SearchTemplate.Builder( - new SearchCallback() { - @Override - public void onSearchTextChanged(@NonNull String searchText) { - doSearch(searchText); - } - - @Override - public void onSearchSubmitted(@NonNull String searchTerm) { - // When the user presses the search key use the top item in the list - // as the - // result and simulate as if the user had pressed that. - if (mTitles.size() > 0) { - onClickSearch(mTitles.get(0)); - } - } - }) - .setHeaderAction(Action.BACK) - .setShowKeyboardByDefault(false) - .setItemList(mItemList) - .setInitialSearchText(mSearchText == null ? "" : mSearchText) - .build(); - } - - void doSearch(String searchText) { - mSearchText = searchText; - mTitles.clear(); - ItemList.Builder builder = new ItemList.Builder(); - if (searchText.isEmpty()) { - withNoResults(builder); - } else { - // Create some fake data entries. - for (String title : mFakeTitles) { - mTitles.add(title); - builder.addItem( - new Row.Builder() - .setTitle(title) - .setOnClickListener(() -> onClickSearch(title)) - .build()); - } - } - mItemList = builder.build(); - invalidate(); - return; - } - - void onClickSearch(@NonNull String searchText) { - getScreenManager() - .pushForResult( - new RoutePreviewScreen(getCarContext(), mSettingsAction, mSurfaceRenderer), - this::onRouteSelected); - } - - private static ItemList.Builder withNoResults(ItemList.Builder builder) { - return builder.setNoItemsMessage("No Results"); - } - - private void onRouteSelected(@Nullable Object previewResult) { - int previewIndex = previewResult == null ? -1 : (int) previewResult; - if (previewIndex < 0) { - return; - } - // Start the same demo instructions. More will be added in the future. - setResult(DemoScripts.getNavigateHome(getCarContext())); - finish(); - } -} diff --git a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/SettingsScreen.java b/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/SettingsScreen.java deleted file mode 100644 index c673eab..0000000 --- a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/SettingsScreen.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.car.app.sample.navigation.common.car; - -import android.content.Context; -import android.content.SharedPreferences; - -import androidx.annotation.NonNull; -import androidx.car.app.CarContext; -import androidx.car.app.Screen; -import androidx.car.app.model.Action; -import androidx.car.app.model.ItemList; -import androidx.car.app.model.ListTemplate; -import androidx.car.app.model.Row; -import androidx.car.app.model.SectionedItemList; -import androidx.car.app.model.Template; -import androidx.car.app.model.Toggle; -import androidx.car.app.sample.navigation.common.R; - -/** Settings screen demo. */ -public final class SettingsScreen extends Screen { - - @NonNull - final SharedPreferences mSharedPref; - - SettingsScreen(@NonNull CarContext carContext) { - super(carContext); - mSharedPref = carContext.getSharedPreferences("SETTINGS", Context.MODE_PRIVATE); - } - - @NonNull - @Override - public Template onGetTemplate() { - ListTemplate.Builder templateBuilder = new ListTemplate.Builder(); - - // Create 2 sections with three settings each. - ItemList.Builder sectionABuilder = new ItemList.Builder(); - sectionABuilder.addItem(buildRow(R.string.settings_one_label, R.string.settings_one_pref)); - sectionABuilder.addItem(buildRow(R.string.settings_two_label, R.string.settings_two_pref)); - sectionABuilder.addItem( - buildRow(R.string.settings_three_label, R.string.settings_three_pref)); - - templateBuilder.addSectionedList( - SectionedItemList.create( - sectionABuilder.build(), - getCarContext().getString(R.string.settings_section_a_label))); - - ItemList.Builder sectionBBuilder = new ItemList.Builder(); - sectionBBuilder.addItem( - buildRow(R.string.settings_four_label, R.string.settings_four_pref)); - sectionBBuilder.addItem( - buildRow(R.string.settings_five_label, R.string.settings_five_pref)); - sectionBBuilder.addItem(buildRow(R.string.settings_six_label, R.string.settings_six_pref)); - - templateBuilder.addSectionedList( - SectionedItemList.create( - sectionBBuilder.build(), - getCarContext().getString(R.string.settings_section_b_label))); - return templateBuilder - .setHeaderAction(Action.BACK) - .setTitle(getCarContext().getString(R.string.settings_title)) - .build(); - } - - @NonNull - private Row buildRow(int labelResourcee, int prefKeyResource) { - return new Row.Builder() - .setTitle(getCarContext().getString(labelResourcee)) - .setToggle( - new Toggle.Builder( - (value) -> { - writeSharedPref(prefKeyResource, value); - }) - .setChecked(readSharedPref(prefKeyResource, false)) - .build()) - .build(); - } - - private boolean readSharedPref(int keyResource, boolean defaultValue) { - return mSharedPref.getBoolean(getCarContext().getString(keyResource), defaultValue); - } - - private void writeSharedPref(int keyResource, boolean value) { - SharedPreferences.Editor editor = mSharedPref.edit(); - editor.putBoolean(getCarContext().getString(keyResource), value); - editor.commit(); - } -} diff --git a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/SurfaceRenderer.java b/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/SurfaceRenderer.java deleted file mode 100644 index 22cb497..0000000 --- a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/SurfaceRenderer.java +++ /dev/null @@ -1,406 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.car.app.sample.navigation.common.car; - -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Matrix; -import android.graphics.Paint; -import android.graphics.Paint.Align; -import android.graphics.Paint.Style; -import android.graphics.Rect; -import android.graphics.RectF; -import android.os.Handler; -import android.os.Looper; -import android.os.Message; -import android.util.Log; -import android.view.Surface; - -import androidx.annotation.MainThread; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.car.app.AppManager; -import androidx.car.app.CarContext; -import androidx.car.app.SurfaceCallback; -import androidx.car.app.SurfaceContainer; -import androidx.car.app.sample.navigation.common.R; -import androidx.lifecycle.DefaultLifecycleObserver; -import androidx.lifecycle.Lifecycle; -import androidx.lifecycle.LifecycleOwner; - -/** A very simple implementation of a renderer for the app's background surface. */ -public final class SurfaceRenderer implements DefaultLifecycleObserver { - private static final String TAG = "SurfaceRenderer"; - - /** The maximum scale factor of the background map. */ - private static final float MAX_SCALE_FACTOR = 5f; - - /** The minimum scale factor of the background map. */ - private static final float MIN_SCALE_FACTOR = 0.5f; - - /** The scale factor to apply when initializing the background map. */ - private static final float MAP_ENLARGE_FACTOR = 5f; - - /** Looper msg to trigger a frame rendering */ - private static final int MSG_RENDER_FRAME = 1; - - @Nullable - Surface mSurface; - @Nullable - Rect mVisibleArea; - @Nullable - Rect mStableArea; - - private final CarContext mCarContext; - private final Paint mLeftInsetPaint = new Paint(); - private final Paint mRightInsetPaint = new Paint(); - private final Paint mCenterPaint = new Paint(); - private final Paint mMarkerPaint = new Paint(); - - private boolean mShowMarkers; - private int mNumMarkers; - private int mActiveMarker; - private String mLocationString = "unknown"; - - /** The bitmap that contains the background map image. */ - private final Bitmap mBackgroundMap; - - /** - * The transformation matrix for the background map image, to reflect the result of the user's - * pan and zoom actions. - */ - final Matrix mBackgroundMapMatrix = new Matrix(); - - /** The cumulative scale factor for the background map image. */ - float mCumulativeScaleFactor = 1f; - - /** - * The current horizontal center point of the background map, used to prevent the map from - * disappearing from pan actions. - */ - float mBackgroundMapCenterX = 0f; - - /** - * The current vertical center point of the background map, used to prevent the map from - * disappearing from pan actions. - */ - float mBackgroundMapCenterY = 0f; - - /** - * The original clip bounds of the background map, used to prevent the map from disappearing - * from pan actions. - */ - Rect mBackgroundMapClipBounds = new Rect(); - - public final SurfaceCallback mSurfaceCallback = - new SurfaceCallback() { - @Override - public void onSurfaceAvailable(@NonNull SurfaceContainer surfaceContainer) { - synchronized (SurfaceRenderer.this) { - Log.i(TAG, "Surface available " + surfaceContainer); - if (mSurface != null) { - mSurface.release(); - } - mSurface = surfaceContainer.getSurface(); - renderFrame(); - } - } - - @Override - public void onVisibleAreaChanged(@NonNull Rect visibleArea) { - synchronized (SurfaceRenderer.this) { - Log.i(TAG, "Visible area changed " + mSurface + ". stableArea: " - + mStableArea + " visibleArea:" + visibleArea); - mVisibleArea = visibleArea; - renderFrame(); - } - } - - @Override - public void onStableAreaChanged(@NonNull Rect stableArea) { - synchronized (SurfaceRenderer.this) { - Log.i(TAG, "Stable area changed " + mSurface + ". stableArea: " - + mStableArea + " visibleArea:" + mVisibleArea); - mStableArea = stableArea; - renderFrame(); - } - } - - @Override - public void onSurfaceDestroyed(@NonNull SurfaceContainer surfaceContainer) { - synchronized (SurfaceRenderer.this) { - Log.i(TAG, "Surface destroyed"); - if (mSurface != null) { - mSurface.release(); - mSurface = null; - } - } - } - - @Override - public void onScroll(float distanceX, float distanceY) { - synchronized (SurfaceRenderer.this) { - float newBackgroundCenterX = mBackgroundMapCenterX - distanceX; - float newBackgroundCenterY = mBackgroundMapCenterY - distanceY; - - // If the map stays within the clip bounds, pan the map. - if (mBackgroundMapClipBounds.contains((int) newBackgroundCenterX, - (int) newBackgroundCenterY)) { - mBackgroundMapCenterX = newBackgroundCenterX; - mBackgroundMapCenterY = newBackgroundCenterY; - mBackgroundMapMatrix.postTranslate(-distanceX, -distanceY); - renderFrame(); - } - } - } - - @Override - public void onScale(float focusX, float focusY, float scaleFactor) { - handleScale(focusX, focusY, scaleFactor); - } - }; - - private Handler mHandler = new Handler(Looper.getMainLooper()) { - @Override - public void handleMessage(Message msg) { - switch (msg.what) { - case MSG_RENDER_FRAME: - doRenderFrame(); - } - } - }; - - public SurfaceRenderer(@NonNull CarContext carContext, @NonNull Lifecycle lifecycle) { - mCarContext = carContext; - - mLeftInsetPaint.setColor(Color.RED); - mLeftInsetPaint.setAntiAlias(true); - mLeftInsetPaint.setStyle(Style.STROKE); - - mRightInsetPaint.setColor(Color.RED); - mRightInsetPaint.setAntiAlias(true); - mRightInsetPaint.setStyle(Style.STROKE); - mRightInsetPaint.setTextAlign(Align.RIGHT); - - mCenterPaint.setColor(Color.BLUE); - mCenterPaint.setAntiAlias(true); - mCenterPaint.setStyle(Style.STROKE); - - mMarkerPaint.setColor(Color.GREEN); - mMarkerPaint.setAntiAlias(true); - mMarkerPaint.setStyle(Style.STROKE); - mMarkerPaint.setStrokeWidth(3); - - mBackgroundMap = BitmapFactory.decodeResource(carContext.getResources(), - R.drawable.map); - lifecycle.addObserver(this); - } - - @Override - public void onCreate(@NonNull LifecycleOwner owner) { - Log.i(TAG, "SurfaceRenderer created"); - mCarContext.getCarService(AppManager.class).setSurfaceCallback(mSurfaceCallback); - } - - /** Callback called when the car configuration changes. */ - public void onCarConfigurationChanged() { - renderFrame(); - } - - /** Handles the map zoom-in and zoom-out events. */ - public void handleScale(float focusX, float focusY, float scaleFactor) { - synchronized (this) { - float x = focusX; - float y = focusY; - - Rect visibleArea = mVisibleArea; - if (visibleArea != null) { - // If a focal point value is negative, use the center point of the visible area. - if (x < 0) { - x = visibleArea.centerX(); - } - if (y < 0) { - y = visibleArea.centerY(); - } - } - - // If the map stays between the maximum and minimum scale factors, scale the map. - float newCumulativeScaleFactor = mCumulativeScaleFactor * scaleFactor; - if (newCumulativeScaleFactor > MIN_SCALE_FACTOR - && newCumulativeScaleFactor < MAX_SCALE_FACTOR) { - mCumulativeScaleFactor = newCumulativeScaleFactor; - mBackgroundMapMatrix.postScale(scaleFactor, scaleFactor, x, y); - renderFrame(); - } - } - } - - /** Handles the map re-centering events. */ - public void handleRecenter() { - // Resetting the map matrix will trigger the initialization logic in renderFrame(). - mBackgroundMapMatrix.reset(); - renderFrame(); - } - - /** Updates the markers drawn on the surface. */ - public void updateMarkerVisibility(boolean showMarkers, int numMarkers, int activeMarker) { - mShowMarkers = showMarkers; - mNumMarkers = numMarkers; - mActiveMarker = activeMarker; - renderFrame(); - } - - /** Updates the location coordinate string drawn on the surface. */ - public void updateLocationString(@NonNull String locationString) { - mLocationString = locationString; - renderFrame(); - } - - void renderFrame() { - mHandler.sendEmptyMessage(MSG_RENDER_FRAME); - } - - @MainThread - void doRenderFrame() { - if (mSurface == null || !mSurface.isValid()) { - // Surface is not available, or has been destroyed, skip this frame. - return; - } - Canvas canvas = mSurface.lockCanvas(null); - - // Clear the background. - canvas.drawColor(mCarContext.isDarkMode() ? Color.DKGRAY : Color.LTGRAY); - - // Initialize the background map. - if (mBackgroundMapMatrix.isIdentity()) { - // Enlarge the original image. - RectF backgroundRect = new RectF(0, 0, mBackgroundMap.getWidth(), - mBackgroundMap.getHeight()); - RectF scaledBackgroundRect = new RectF(0, 0, - backgroundRect.width() * MAP_ENLARGE_FACTOR, - backgroundRect.height() * MAP_ENLARGE_FACTOR); - - // Initialize the cumulative scale factor and map center points. - mCumulativeScaleFactor = 1f; - mBackgroundMapCenterX = scaledBackgroundRect.centerX(); - mBackgroundMapCenterY = scaledBackgroundRect.centerY(); - - // Move to the center of the enlarged map. - mBackgroundMapMatrix.setRectToRect(backgroundRect, scaledBackgroundRect, - Matrix.ScaleToFit.FILL); - mBackgroundMapMatrix.postTranslate( - -mBackgroundMapCenterX + canvas.getClipBounds().centerX(), - -mBackgroundMapCenterY + canvas.getClipBounds().centerY()); - scaledBackgroundRect.round(mBackgroundMapClipBounds); - } - canvas.drawBitmap(mBackgroundMap, mBackgroundMapMatrix, null); - - - final int horizontalTextMargin = 10; - final int verticalTextMarginFromTop = 20; - final int verticalTextMarginFromBottom = 10; - - // Draw a rectangle showing the inset. - Rect visibleArea = mVisibleArea; - if (visibleArea != null) { - if (visibleArea.isEmpty()) { - // No inset set. The entire area is considered safe to draw. - visibleArea.set(0, 0, canvas.getWidth() - 1, canvas.getHeight() - 1); - } - - canvas.drawRect(visibleArea, mLeftInsetPaint); - canvas.drawLine( - visibleArea.left, - visibleArea.top, - visibleArea.right, - visibleArea.bottom, - mLeftInsetPaint); - canvas.drawLine( - visibleArea.right, - visibleArea.top, - visibleArea.left, - visibleArea.bottom, - mLeftInsetPaint); - canvas.drawText( - "(" + visibleArea.left + " , " + visibleArea.top + ")", - visibleArea.left + horizontalTextMargin, - visibleArea.top + verticalTextMarginFromTop, - mLeftInsetPaint); - canvas.drawText( - "(" + visibleArea.right + " , " + visibleArea.bottom + ")", - visibleArea.right - horizontalTextMargin, - visibleArea.bottom - verticalTextMarginFromBottom, - mRightInsetPaint); - - // Draw location on the top right corner of the screen. - canvas.drawText( - "(" + mLocationString + ")", - visibleArea.right - horizontalTextMargin, - visibleArea.top + verticalTextMarginFromTop, - mRightInsetPaint); - } else { - Log.d(TAG, "Visible area not available."); - } - - if (mStableArea != null) { - // Draw a cross-hairs at the stable center. - final int lengthPx = 15; - int centerX = mStableArea.centerX(); - int centerY = mStableArea.centerY(); - canvas.drawLine(centerX - lengthPx, centerY, centerX + lengthPx, centerY, mCenterPaint); - canvas.drawLine(centerX, centerY - lengthPx, centerX, centerY + lengthPx, mCenterPaint); - canvas.drawText( - "(" + centerX + ", " + centerY + ")", - centerX + horizontalTextMargin, - centerY, - mCenterPaint); - } else { - Log.d(TAG, "Stable area not available."); - } - - if (mShowMarkers) { - // Show a set number of markers centered around the midpoint of the stable area. If no - // stable area, then use visible area or canvas dimensions. If an active marker is set - // draw - // a line from the center to that marker. - Rect markerArea = - mStableArea != null - ? mStableArea - : (mVisibleArea != null - ? mVisibleArea - : new Rect(0, 0, canvas.getWidth() - 1, canvas.getHeight())); - int centerX = markerArea.centerX(); - int centerY = markerArea.centerY(); - double radius = Math.min(centerX / 2, centerY / 2); - - double circleAngle = 2.0d * Math.PI; - double markerpiece = circleAngle / mNumMarkers; - for (int i = 0; i < mNumMarkers; i++) { - int markerX = centerX + (int) (radius * Math.cos(markerpiece * i)); - int markerY = centerY + (int) (radius * Math.sin(markerpiece * i)); - canvas.drawCircle(markerX, markerY, 5, mMarkerPaint); - if (i == mActiveMarker) { - canvas.drawLine(centerX, centerY, markerX, markerY, mMarkerPaint); - } - } - } - - mSurface.unlockCanvasAndPost(canvas); - } -} diff --git a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/model/DemoScripts.java b/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/model/DemoScripts.java deleted file mode 100644 index 3bf0aa8..0000000 --- a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/model/DemoScripts.java +++ /dev/null @@ -1,578 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.car.app.sample.navigation.common.model; - -import static androidx.car.app.navigation.model.LaneDirection.SHAPE_NORMAL_RIGHT; -import static androidx.car.app.navigation.model.LaneDirection.SHAPE_STRAIGHT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_DEPART; -import static androidx.car.app.navigation.model.Maneuver.TYPE_DESTINATION; -import static androidx.car.app.navigation.model.Maneuver.TYPE_DESTINATION_LEFT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_DESTINATION_RIGHT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_DESTINATION_STRAIGHT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_FERRY_BOAT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_FERRY_TRAIN; -import static androidx.car.app.navigation.model.Maneuver.TYPE_FORK_LEFT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_FORK_RIGHT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_KEEP_LEFT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_KEEP_RIGHT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_MERGE_LEFT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_MERGE_RIGHT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_MERGE_SIDE_UNSPECIFIED; -import static androidx.car.app.navigation.model.Maneuver.TYPE_NAME_CHANGE; -import static androidx.car.app.navigation.model.Maneuver.TYPE_OFF_RAMP_NORMAL_LEFT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_OFF_RAMP_NORMAL_RIGHT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_OFF_RAMP_SLIGHT_LEFT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_OFF_RAMP_SLIGHT_RIGHT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_ON_RAMP_NORMAL_LEFT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_ON_RAMP_NORMAL_RIGHT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_ON_RAMP_SHARP_LEFT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_ON_RAMP_SHARP_RIGHT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_ON_RAMP_SLIGHT_LEFT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_ON_RAMP_SLIGHT_RIGHT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_ON_RAMP_U_TURN_LEFT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_ON_RAMP_U_TURN_RIGHT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_ROUNDABOUT_ENTER_AND_EXIT_CCW; -import static androidx.car.app.navigation.model.Maneuver.TYPE_ROUNDABOUT_ENTER_AND_EXIT_CCW_WITH_ANGLE; -import static androidx.car.app.navigation.model.Maneuver.TYPE_ROUNDABOUT_ENTER_AND_EXIT_CW; -import static androidx.car.app.navigation.model.Maneuver.TYPE_ROUNDABOUT_ENTER_AND_EXIT_CW_WITH_ANGLE; -import static androidx.car.app.navigation.model.Maneuver.TYPE_ROUNDABOUT_ENTER_CCW; -import static androidx.car.app.navigation.model.Maneuver.TYPE_ROUNDABOUT_ENTER_CW; -import static androidx.car.app.navigation.model.Maneuver.TYPE_ROUNDABOUT_EXIT_CCW; -import static androidx.car.app.navigation.model.Maneuver.TYPE_ROUNDABOUT_EXIT_CW; -import static androidx.car.app.navigation.model.Maneuver.TYPE_STRAIGHT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_TURN_NORMAL_LEFT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_TURN_NORMAL_RIGHT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_TURN_SHARP_LEFT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_TURN_SHARP_RIGHT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_TURN_SLIGHT_LEFT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_TURN_SLIGHT_RIGHT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_UNKNOWN; -import static androidx.car.app.navigation.model.Maneuver.TYPE_U_TURN_LEFT; -import static androidx.car.app.navigation.model.Maneuver.TYPE_U_TURN_RIGHT; - -import static java.util.concurrent.TimeUnit.MILLISECONDS; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.car.app.CarContext; -import androidx.car.app.model.CarColor; -import androidx.car.app.model.CarIcon; -import androidx.car.app.model.DateTimeWithZone; -import androidx.car.app.model.Distance; -import androidx.car.app.navigation.model.Destination; -import androidx.car.app.navigation.model.Lane; -import androidx.car.app.navigation.model.LaneDirection; -import androidx.car.app.navigation.model.Maneuver; -import androidx.car.app.navigation.model.Step; -import androidx.car.app.navigation.model.TravelEstimate; -import androidx.car.app.sample.navigation.common.R; -import androidx.core.graphics.drawable.IconCompat; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.List; -import java.util.TimeZone; -import java.util.concurrent.TimeUnit; - -/** - * Example scripts to "control" navigation within the app. - * - *

The script takes the form of a list of instructions which can be passed to different parts of - * the app. This is the central location where scripts are stored. - * - *

The scripts start with a setup phase where all destinations and steps are added to the - * instruction list. Then navigation updates are added for each step to simulate driving. - * - *

>The setup phases consists of: - * - *

    - *
  • Start Navigation - *
  • Add the destination information. - *
  • Add 4 intermediate steps to the destination. - *
- * - *

The navigation phase consists of - * - *

    - *
  • Add positions along the route getting closer to the step. - *
  • Once the step is reached, pop the step. If more steps remain go back to adding more - * positions. - *
  • When no more steps remain set the arrived state. - *
  • End Navigation - *
- * - *

There are several helper functions including {@link #generateTripUpdateSequence} which - * interpolates a straight path and generates all the updates for a step. - */ -public class DemoScripts { - - private static final long INSTRUCTION_NO_ELAPSED_TIME = 0; - private static final int SPEED_METERS_PER_SEC = 5; - private static final int DISTANCE_METERS = 450; - - /** Create instructions for home. */ - @NonNull - public static List getNavigateHome(@NonNull CarContext carContext) { - ArrayList instructions = new ArrayList<>(); - - DateTimeWithZone arrivalTimeAtDestination = getCurrentDateTimeZoneWithOffset(30); - - CarIcon lanesImage = - new CarIcon.Builder(IconCompat.createWithResource(carContext, R.drawable.lanes)) - .build(); - CarIcon junctionImage = - new CarIcon.Builder( - IconCompat.createWithResource( - carContext, - R.drawable.junction_image)) - .build(); - - Lane straightNormal = - new Lane.Builder() - .addDirection(LaneDirection.create(SHAPE_STRAIGHT, false)) - .build(); - Lane rightHighlighted = - new Lane.Builder() - .addDirection(LaneDirection.create(SHAPE_NORMAL_RIGHT, true)) - .build(); - - int step1IconResourceId = - getTurnIconResourceId(Maneuver.TYPE_ROUNDABOUT_ENTER_AND_EXIT_CCW_WITH_ANGLE); - Step step1 = - new Step.Builder("State Street") - .setManeuver( - getManeuverWithExitNumberAndAngle( - carContext, - Maneuver.TYPE_ROUNDABOUT_ENTER_AND_EXIT_CCW_WITH_ANGLE, - step1IconResourceId, - 2, - 270)) - .setRoad("State Street") - .addLane(straightNormal) - .addLane(straightNormal) - .addLane(straightNormal) - .addLane(straightNormal) - .addLane(rightHighlighted) - .setLanesImage(lanesImage) - .build(); - int step2IconResourceId = getTurnIconResourceId(Maneuver.TYPE_TURN_NORMAL_LEFT); - Step step2 = - new Step.Builder("Kirkland Way") - .setManeuver( - getManeuver( - carContext, - Maneuver.TYPE_TURN_NORMAL_LEFT, - step2IconResourceId)) - .setRoad("Kirkland Way") - .addLane(straightNormal) - .addLane(straightNormal) - .addLane(straightNormal) - .addLane(straightNormal) - .addLane(rightHighlighted) - .setLanesImage(lanesImage) - .build(); - int step3IconResourceId = getTurnIconResourceId(Maneuver.TYPE_TURN_NORMAL_RIGHT); - Step step3 = - new Step.Builder("6th Street.") - .setManeuver( - getManeuver( - carContext, - Maneuver.TYPE_TURN_NORMAL_RIGHT, - step3IconResourceId)) - .setRoad("6th Street.") - .addLane(straightNormal) - .addLane(straightNormal) - .addLane(straightNormal) - .addLane(straightNormal) - .addLane(rightHighlighted) - .setLanesImage(lanesImage) - .build(); - int step4IconResourceId = getTurnIconResourceId(Maneuver.TYPE_DESTINATION_RIGHT); - Step step4 = - new Step.Builder("Google Kirkland.") - .setManeuver( - getManeuver( - carContext, TYPE_DESTINATION_RIGHT, step4IconResourceId)) - .setRoad("Google Kirkland.") - .build(); - - // Start the navigation and add destination and steps. - instructions.add( - Instruction.builder(Instruction.Type.START_NAVIGATION, INSTRUCTION_NO_ELAPSED_TIME) - .build()); - - Destination destination = - new Destination.Builder().setName("Work").setAddress("747 6th St.").build(); - instructions.add( - Instruction.builder( - Instruction.Type.ADD_DESTINATION_NAVIGATION, - INSTRUCTION_NO_ELAPSED_TIME) - .setDestination(destination) - .build()); - - instructions.add( - Instruction.builder(Instruction.Type.SET_REROUTING, TimeUnit.SECONDS.toMillis(5)) - .setDestinationTravelEstimate( - new TravelEstimate.Builder( - Distance.create(350, Distance.UNIT_METERS), - arrivalTimeAtDestination) - .setRemainingTimeSeconds( - /* remainingTimeSeconds= */ DISTANCE_METERS - / SPEED_METERS_PER_SEC) - .build()) - .setNotification( - true, - carContext.getString(R.string.navigation_rerouting), - null, - R.drawable.ic_launcher) - .build()); - - instructions.add( - Instruction.builder( - Instruction.Type.ADD_STEP_NAVIGATION, INSTRUCTION_NO_ELAPSED_TIME) - .setStep(step1) - .build()); - instructions.add( - Instruction.builder( - Instruction.Type.ADD_STEP_NAVIGATION, INSTRUCTION_NO_ELAPSED_TIME) - .setStep(step2) - .build()); - instructions.add( - Instruction.builder( - Instruction.Type.ADD_STEP_NAVIGATION, INSTRUCTION_NO_ELAPSED_TIME) - .setStep(step3) - .build()); - instructions.add( - Instruction.builder( - Instruction.Type.ADD_STEP_NAVIGATION, INSTRUCTION_NO_ELAPSED_TIME) - .setStep(step4) - .build()); - - // Add trip positions for each step. - int updateDistanceRemaining = DISTANCE_METERS; - instructions.addAll( - generateTripUpdateSequence( - /* count= */ 4, - /* startDestinationDistanceRemaining= */ updateDistanceRemaining, - /* startStepDistanceRemaining= */ 100, - arrivalTimeAtDestination, - "3rd Street", - junctionImage, - /* showLanes= */ true, - "onto State Street", - SPEED_METERS_PER_SEC, - step1IconResourceId)); - instructions.add( - Instruction.builder( - Instruction.Type.POP_STEP_NAVIGATION, INSTRUCTION_NO_ELAPSED_TIME) - .build()); - updateDistanceRemaining -= 100; - - instructions.addAll( - generateTripUpdateSequence( - /* count= */ 6, - /* startDestinationDistanceRemaining= */ updateDistanceRemaining, - /* startStepDistanceRemaining= */ 150, - arrivalTimeAtDestination, - "State Street", - junctionImage, - /* showLanes= */ true, - "onto Kirkland Way", - SPEED_METERS_PER_SEC, - step2IconResourceId)); - instructions.add( - Instruction.builder( - Instruction.Type.POP_STEP_NAVIGATION, INSTRUCTION_NO_ELAPSED_TIME) - .build()); - updateDistanceRemaining -= 150; - - instructions.addAll( - generateTripUpdateSequence( - /* count= */ 4, - /* startDestinationDistanceRemaining= */ updateDistanceRemaining, - /* startStepDistanceRemaining= */ 100, - arrivalTimeAtDestination, - "Kirkland Way", - junctionImage, - /* showLanes= */ true, - "onto 6th Street", - SPEED_METERS_PER_SEC, - step3IconResourceId)); - instructions.add( - Instruction.builder( - Instruction.Type.POP_STEP_NAVIGATION, INSTRUCTION_NO_ELAPSED_TIME) - .build()); - updateDistanceRemaining -= 100; - - instructions.addAll( - generateTripUpdateSequence( - /* count= */ 4, - /* startDestinationDistanceRemaining= */ updateDistanceRemaining, - /* startStepDistanceRemaining= */ 100, - arrivalTimeAtDestination, - "6th Street", - /* junctionImage= */ null, - /* showLanes= */ false, - "to Google Kirkland on right", - SPEED_METERS_PER_SEC, - step4IconResourceId)); - - // Set arrived state and then stop navigation. - instructions.add( - Instruction.builder(Instruction.Type.SET_ARRIVED, TimeUnit.SECONDS.toMillis(5)) - .build()); - - instructions.add( - Instruction.builder(Instruction.Type.POP_DESTINATION_NAVIGATION, - INSTRUCTION_NO_ELAPSED_TIME) - .build()); - instructions.add( - Instruction.builder(Instruction.Type.END_NAVIGATION, INSTRUCTION_NO_ELAPSED_TIME) - .build()); - return instructions; - } - - private static DateTimeWithZone getCurrentDateTimeZoneWithOffset(int offsetSeconds) { - GregorianCalendar startTime = new GregorianCalendar(); - GregorianCalendar destinationETA = (GregorianCalendar) startTime.clone(); - destinationETA.add(Calendar.SECOND, offsetSeconds); - return getDateTimeZone(destinationETA); - } - - /** Convenience function to create the date formmat. */ - private static DateTimeWithZone getDateTimeZone(GregorianCalendar calendar) { - Date date = calendar.getTime(); - TimeZone timeZone = calendar.getTimeZone(); - - long timeSinceEpochMillis = date.getTime(); - long timeZoneOffsetSeconds = - MILLISECONDS.toSeconds(timeZone.getOffset(timeSinceEpochMillis)); - String zoneShortName = "PST"; - - return DateTimeWithZone.create( - timeSinceEpochMillis, (int) timeZoneOffsetSeconds, zoneShortName); - } - - /** - * Generates all the updates for a particular step interpolating along a straight line. - * - * @param count number of instructions to generate until the next - * step - * @param startDestinationDistanceRemaining the distance until the final destination at the - * start of the sequence - * @param startStepDistanceRemaining the distance until the next step at the start of the - * sequence - * @param arrivalTimeAtDestination the arrival time at the destination - * @param currentRoad the name of the road currently being travelled - * @param junctionImage photo realistic image of upcoming turn - * @param showLanes indicates if the lane info should be shown for - * this maneuver - * @param speed meters/second being traveled - * @return sequence of instructions until the next step - */ - private static List generateTripUpdateSequence( - int count, - int startDestinationDistanceRemaining, - int startStepDistanceRemaining, - DateTimeWithZone arrivalTimeAtDestination, - String currentRoad, - @Nullable CarIcon junctionImage, - boolean showLanes, - String nextInstruction, - int speed, - int notificationIcon) { - List sequence = new ArrayList<>(count); - int destinationDistanceRemaining = startDestinationDistanceRemaining; - int stepDistanceRemaining = startStepDistanceRemaining; - int distanceIncrement = startStepDistanceRemaining / count; - boolean notify = true; - - for (int i = 0; i < count; i++) { - Distance remainingDistance = - Distance.create(stepDistanceRemaining, Distance.UNIT_METERS); - TravelEstimate destinationTravelEstimate = - new TravelEstimate.Builder( - Distance.create( - destinationDistanceRemaining, Distance.UNIT_METERS), - arrivalTimeAtDestination) - .setRemainingTimeSeconds(destinationDistanceRemaining / speed) - .setRemainingTimeColor(CarColor.YELLOW) - .setRemainingDistanceColor(CarColor.GREEN) - .build(); - TravelEstimate stepTravelEstimate = - new TravelEstimate.Builder( - remainingDistance, - getCurrentDateTimeZoneWithOffset(distanceIncrement)) - .setRemainingTimeSeconds(/* remainingTimeSeconds= */ distanceIncrement) - .build(); - String notificationTitle = String.format("%dm", stepDistanceRemaining); - Instruction.Builder instruction = - Instruction.builder( - Instruction.Type.SET_TRIP_POSITION_NAVIGATION, - TimeUnit.SECONDS.toMillis(distanceIncrement / speed)) - .setStepRemainingDistance(remainingDistance) - .setStepTravelEstimate(stepTravelEstimate) - .setDestinationTravelEstimate(destinationTravelEstimate) - .setRoad(currentRoad) - .setNotification( - notify, notificationTitle, nextInstruction, notificationIcon); - // Don't show lanes in the first and last part of the maneuver. In the middle part of - // the - // maneuver use the passed parameter to determine if lanes should be shown. - if (i == 0) { - instruction.setShouldShowLanes(false).setShouldShowNextStep(true); - } else if (i == 1) { - instruction.setShouldShowLanes(showLanes).setShouldShowNextStep(true); - } else if (i == 2) { - instruction.setShouldShowLanes(showLanes).setShouldShowNextStep(false); - } else { - instruction - .setShouldShowLanes(false) - .setShouldShowNextStep(false) - .setJunctionImage(junctionImage); - } - sequence.add(instruction.build()); - - destinationDistanceRemaining -= distanceIncrement; - stepDistanceRemaining -= distanceIncrement; - notify = false; - } - return sequence; - } - - /** Returns a maneuver with image selected from resources. */ - private static Maneuver getManeuver( - @NonNull CarContext carContext, int type, int iconResourceId) { - return new Maneuver.Builder(type).setIcon(getCarIcon(carContext, iconResourceId)).build(); - } - - /** - * Returns a maneuver that includes an exit number and angle with image selected from resources. - */ - private static Maneuver getManeuverWithExitNumberAndAngle( - @NonNull CarContext carContext, - int type, - int iconResourceId, - int exitNumber, - int exitAngle) { - return new Maneuver.Builder(type) - .setIcon(getCarIcon(carContext, iconResourceId)) - .setRoundaboutExitNumber(exitNumber) - .setRoundaboutExitAngle(exitAngle) - .build(); - } - - /** Generates a {@link CarIcon} representing the turn. */ - private static CarIcon getCarIcon(@NonNull CarContext carContext, int resourceId) { - return new CarIcon.Builder(IconCompat.createWithResource(carContext, resourceId)).build(); - } - - private static int getTurnIconResourceId(int type) { - int resourceId = R.drawable.ic_launcher; - switch (type) { - case TYPE_TURN_NORMAL_LEFT: - resourceId = R.drawable.ic_turn_normal_left; - break; - case TYPE_TURN_NORMAL_RIGHT: - resourceId = R.drawable.ic_turn_normal_right; - break; - case TYPE_UNKNOWN: - case TYPE_DEPART: - case TYPE_STRAIGHT: - resourceId = R.drawable.ic_turn_name_change; - break; - case TYPE_DESTINATION: - case TYPE_DESTINATION_STRAIGHT: - case TYPE_DESTINATION_RIGHT: - case TYPE_DESTINATION_LEFT: - resourceId = R.drawable.ic_turn_destination; - break; - case TYPE_NAME_CHANGE: - resourceId = R.drawable.ic_turn_name_change; - break; - case TYPE_KEEP_LEFT: - case TYPE_TURN_SLIGHT_LEFT: - resourceId = R.drawable.ic_turn_slight_left; - break; - case TYPE_KEEP_RIGHT: - case TYPE_TURN_SLIGHT_RIGHT: - resourceId = R.drawable.ic_turn_slight_right; - break; - case TYPE_TURN_SHARP_LEFT: - resourceId = R.drawable.ic_turn_sharp_left; - break; - case TYPE_TURN_SHARP_RIGHT: - resourceId = R.drawable.ic_turn_sharp_right; - break; - case TYPE_U_TURN_LEFT: - resourceId = R.drawable.ic_turn_u_turn_left; - break; - case TYPE_U_TURN_RIGHT: - resourceId = R.drawable.ic_turn_u_turn_right; - break; - case TYPE_ON_RAMP_SLIGHT_LEFT: - case TYPE_ON_RAMP_NORMAL_LEFT: - case TYPE_ON_RAMP_SHARP_LEFT: - case TYPE_ON_RAMP_U_TURN_LEFT: - case TYPE_OFF_RAMP_SLIGHT_LEFT: - case TYPE_OFF_RAMP_NORMAL_LEFT: - case TYPE_FORK_LEFT: - resourceId = R.drawable.ic_turn_fork_left; - break; - case TYPE_ON_RAMP_SLIGHT_RIGHT: - case TYPE_ON_RAMP_NORMAL_RIGHT: - case TYPE_ON_RAMP_SHARP_RIGHT: - case TYPE_ON_RAMP_U_TURN_RIGHT: - case TYPE_OFF_RAMP_SLIGHT_RIGHT: - case TYPE_OFF_RAMP_NORMAL_RIGHT: - case TYPE_FORK_RIGHT: - resourceId = R.drawable.ic_turn_fork_right; - break; - case TYPE_MERGE_LEFT: - case TYPE_MERGE_RIGHT: - case TYPE_MERGE_SIDE_UNSPECIFIED: - resourceId = R.drawable.ic_turn_merge_symmetrical; - break; - case TYPE_ROUNDABOUT_ENTER_CW: - case TYPE_ROUNDABOUT_ENTER_CCW: - case TYPE_ROUNDABOUT_EXIT_CW: - case TYPE_ROUNDABOUT_EXIT_CCW: - resourceId = R.drawable.ic_turn_name_change; - break; - case TYPE_ROUNDABOUT_ENTER_AND_EXIT_CW: - case TYPE_ROUNDABOUT_ENTER_AND_EXIT_CW_WITH_ANGLE: - resourceId = R.drawable.ic_roundabout_cw; - break; - case TYPE_ROUNDABOUT_ENTER_AND_EXIT_CCW: - case TYPE_ROUNDABOUT_ENTER_AND_EXIT_CCW_WITH_ANGLE: - resourceId = R.drawable.ic_roundabout_ccw; - break; - case TYPE_FERRY_BOAT: - case TYPE_FERRY_TRAIN: - resourceId = R.drawable.ic_turn_name_change; - break; - default: - throw new IllegalStateException("Unexpected maneuver type: " + type); - } - return resourceId; - } - - private DemoScripts() { - } -} diff --git a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/model/Instruction.java b/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/model/Instruction.java deleted file mode 100644 index ebcdc26..0000000 --- a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/model/Instruction.java +++ /dev/null @@ -1,285 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.car.app.sample.navigation.common.model; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.car.app.model.CarIcon; -import androidx.car.app.model.Distance; -import androidx.car.app.navigation.model.Destination; -import androidx.car.app.navigation.model.Step; -import androidx.car.app.navigation.model.TravelEstimate; - -/** - * Container for scripting navigation instructions. - * - *

Each {@link Instruction} represents a change (delta) in the state of navigation corresponding - * to a change in state that could occur during a real navigation session. In general a script - * follows the following rough outline similar to a driving sessions: - * - *

    - *
  • Start Navigation - *
  • Add one or more destinations (as would be selected by a driver) - *
  • Add one or more steps (as would be provided by a routing algorithm) - *
  • Add updated positions until the next step is reached. - *
  • pop a step and send positions until the next step is reached. - *
  • Repeat until all steps are popped. - *
  • End Navigation. - *
- * - *

In addition to a {@link Type}, each instruction specifies the duration until the next - * instruction should be executed. A duration of zero allows multiple instructions to be stacked up - * as if they were a single instruction. All other parameters are optional and related directly to - * which instruction is specified. - */ -public class Instruction { - - public enum Type { - START_NAVIGATION, - END_NAVIGATION, - ADD_DESTINATION_NAVIGATION, - POP_DESTINATION_NAVIGATION, - ADD_STEP_NAVIGATION, - POP_STEP_NAVIGATION, - SET_REROUTING, - SET_ARRIVED, - SET_TRIP_POSITION_NAVIGATION, - } - - ; - - private final Type mType; - private final long mDurationMillis; - - // Only support a single destination at the moment. - @Nullable - private final Destination mDestination; - - // Only support setting a single step. - @Nullable - private final Step mStep; - @Nullable - private final Distance mStepRemainingDistance; - @Nullable - private final TravelEstimate mStepTravelEstimate; - @Nullable - private final TravelEstimate mDestinationTravelEstimate; - @Nullable - private final String mRoad; - private final boolean mShouldShowNextStep; - private final boolean mShouldShowLanes; - @Nullable - private final CarIcon mJunctionImage; - - @Nullable - private final String mNotificationTitle; - @Nullable - private final String mNotificationContent; - private final int mNotificationIcon; - private final boolean mShouldNotify; - - /** Constructs a new builder of {@link Instruction}. */ - @NonNull - public static Builder builder(@NonNull Type type, long lengthMs) { - return new Builder(type, lengthMs); - } - - public long getDurationMillis() { - return mDurationMillis; - } - - @NonNull - public Type getType() { - return mType; - } - - @Nullable - public Destination getDestination() { - return mDestination; - } - - @Nullable - public Step getStep() { - return mStep; - } - - @Nullable - public Distance getStepRemainingDistance() { - return mStepRemainingDistance; - } - - @Nullable - public TravelEstimate getStepTravelEstimate() { - return mStepTravelEstimate; - } - - @Nullable - public TravelEstimate getDestinationTravelEstimate() { - return mDestinationTravelEstimate; - } - - @Nullable - public String getRoad() { - return mRoad; - } - - public boolean getShouldShowNextStep() { - return mShouldShowNextStep; - } - - public boolean getShouldShowLanes() { - return mShouldShowLanes; - } - - @Nullable - public CarIcon getJunctionImage() { - return mJunctionImage; - } - - @Nullable - public String getNotificationTitle() { - return mNotificationTitle; - } - - @Nullable - public String getNotificationContent() { - return mNotificationContent; - } - - public int getNotificationIcon() { - return mNotificationIcon; - } - - public boolean getShouldNotify() { - return mShouldNotify; - } - - Instruction(Builder builder) { - mType = builder.mType; - mDurationMillis = builder.mDurationMillis; - mDestination = builder.mDestination; - mStep = builder.mStep; - mStepRemainingDistance = builder.mStepRemainingDistance; - mStepTravelEstimate = builder.mStepTravelEstimate; - mDestinationTravelEstimate = builder.mDestinationTravelEstimate; - mRoad = builder.mRoad; - mShouldShowNextStep = builder.mShouldShowNextStep; - mShouldShowLanes = builder.mShouldShowLanes; - mJunctionImage = builder.mJunctionImage; - mNotificationTitle = builder.mNotificationTitle; - mNotificationContent = builder.mNotificationContent; - mNotificationIcon = builder.mNotificationIcon; - mShouldNotify = builder.mShouldNotify; - } - - /** Builder for creating an {@link Instruction}. */ - public static final class Builder { - Type mType; - long mDurationMillis; - @Nullable - Destination mDestination; - @Nullable - Step mStep; - @Nullable - Distance mStepRemainingDistance; - @Nullable - TravelEstimate mStepTravelEstimate; - @Nullable - TravelEstimate mDestinationTravelEstimate; - @Nullable - String mRoad; - boolean mShouldShowNextStep; - boolean mShouldShowLanes; - @Nullable - CarIcon mJunctionImage; - - @Nullable - String mNotificationTitle; - @Nullable - String mNotificationContent; - int mNotificationIcon; - boolean mShouldNotify; - - public Builder(@NonNull Type type, long durationMillis) { - mType = type; - mDurationMillis = durationMillis; - } - - Builder setDestination(@Nullable Destination destination) { - mDestination = destination; - return this; - } - - Builder setStep(@Nullable Step step) { - mStep = step; - return this; - } - - Builder setStepRemainingDistance(@Nullable Distance stepRemainingDistance) { - mStepRemainingDistance = stepRemainingDistance; - return this; - } - - Builder setStepTravelEstimate(@Nullable TravelEstimate stepTravelEstimate) { - mStepTravelEstimate = stepTravelEstimate; - return this; - } - - Builder setDestinationTravelEstimate(@Nullable TravelEstimate destinationTravelEstimate) { - mDestinationTravelEstimate = destinationTravelEstimate; - return this; - } - - Builder setRoad(@Nullable String road) { - mRoad = road; - return this; - } - - Builder setShouldShowNextStep(boolean shouldShowNextStep) { - mShouldShowNextStep = shouldShowNextStep; - return this; - } - - Builder setShouldShowLanes(boolean shouldShowLanes) { - mShouldShowLanes = shouldShowLanes; - return this; - } - - Builder setJunctionImage(@Nullable CarIcon junctionImage) { - mJunctionImage = junctionImage; - return this; - } - - Builder setNotification( - boolean shouldNotify, - @Nullable String notificationTitle, - @Nullable String notificationContent, - int notificationIcon) { - mNotificationTitle = notificationTitle; - mNotificationContent = notificationContent; - mShouldNotify = shouldNotify; - mNotificationIcon = notificationIcon; - return this; - } - - /** Constructs the {@link Instruction} defined by this builder. */ - @NonNull - public Instruction build() { - return new Instruction(this); - } - } -} diff --git a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/model/Script.java b/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/model/Script.java deleted file mode 100644 index d7f8650..0000000 --- a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/model/Script.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.car.app.sample.navigation.common.model; - -import android.os.Handler; -import android.os.Looper; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import java.util.List; - -/** Represents an instruction sequence and parameters for a executing a script. */ -public class Script { - - private final Handler mHandler = new Handler(Looper.getMainLooper()); - private final List mInstructions; - private final Processor mProcessor; - private int mCurrentInstruction; - - /** An interface for a block of code that processes an instruction. */ - public interface Processor { - /** A block of code that processes an instruction. */ - void process(@NonNull Instruction instruction, @Nullable Instruction nextInstruction); - } - - /** Executes the given list of instructions. */ - @NonNull - public static Script execute(@NonNull List instructions, - @NonNull Processor processor) { - return new Script(instructions, processor); - } - - /** Stops executing the instructions. */ - public void stop() { - mHandler.removeCallbacksAndMessages(null); - mCurrentInstruction = mInstructions.size(); - } - - private Script(@NonNull List instructions, @NonNull Processor processor) { - mInstructions = instructions; - mProcessor = processor; - mCurrentInstruction = 0; - // Execute the first instruction right away to start navigation and avoid flicker. - nextInstruction(); - } - - private void nextInstruction() { - if (mCurrentInstruction >= mInstructions.size()) { - // Script is finished. - return; - } - Instruction instruction = mInstructions.get(mCurrentInstruction); - Instruction nextInstruction = null; - int nextPosition = mCurrentInstruction + 1; - if (nextPosition < mInstructions.size()) { - nextInstruction = mInstructions.get(nextPosition); - } - mProcessor.process(instruction, nextInstruction); - mCurrentInstruction++; - mHandler.postDelayed(this::nextInstruction, instruction.getDurationMillis()); - } -} diff --git a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java b/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java deleted file mode 100644 index 209122c..0000000 --- a/car_app_library/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/nav/NavigationService.java +++ /dev/null @@ -1,584 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.car.app.sample.navigation.common.nav; - -import static android.media.AudioManager.AUDIOFOCUS_REQUEST_GRANTED; - -import android.app.Notification; -import android.app.NotificationChannel; -import android.app.NotificationManager; -import android.app.PendingIntent; -import android.app.Service; -import android.content.ComponentName; -import android.content.Intent; -import android.content.res.AssetFileDescriptor; -import android.graphics.BitmapFactory; -import android.media.AudioAttributes; -import android.media.AudioFocusRequest; -import android.media.AudioManager; -import android.media.MediaPlayer; -import android.os.Binder; -import android.os.Build; -import android.os.IBinder; -import android.text.TextUtils; -import android.util.Log; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.RawRes; -import androidx.car.app.CarContext; -import androidx.car.app.CarToast; -import androidx.car.app.model.CarIcon; -import androidx.car.app.model.Distance; -import androidx.car.app.navigation.NavigationManager; -import androidx.car.app.navigation.NavigationManagerCallback; -import androidx.car.app.navigation.model.Destination; -import androidx.car.app.navigation.model.Step; -import androidx.car.app.navigation.model.TravelEstimate; -import androidx.car.app.navigation.model.Trip; -import androidx.car.app.notification.CarAppExtender; -import androidx.car.app.notification.CarPendingIntent; -import androidx.car.app.sample.navigation.common.R; -import androidx.car.app.sample.navigation.common.app.MainActivity; -import androidx.car.app.sample.navigation.common.car.NavigationCarAppService; -import androidx.car.app.sample.navigation.common.model.Instruction; -import androidx.car.app.sample.navigation.common.model.Script; -import androidx.core.app.NotificationCompat; -import androidx.core.app.NotificationManagerCompat; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -/** Foreground service to provide navigation directions. */ -public class NavigationService extends Service { - private static final String TAG = "NavigationService"; - - public static final String DEEP_LINK_ACTION = "androidx.car.app.samples.navigation.car" - + ".NavigationDeepLinkAction"; - public static final String CHANNEL_ID = "NavigationServiceChannel"; - - /** The identifier for the navigation notification displayed for the foreground service. */ - private static final int NAV_NOTIFICATION_ID = 87654321; - - /** The identifier for the non-navigation notifications, such as a traffic accident warning. */ - private static final int NOTIFICATION_ID = 77654321; - - // Constants for location broadcast - private static final String PACKAGE_NAME = - "androidx.car.app.sample.navigation.common.nav.navigationservice"; - - private static final String EXTRA_STARTED_FROM_NOTIFICATION = - PACKAGE_NAME + ".started_from_notification"; - public static final String CANCEL_ACTION = "CANCEL"; - - private NotificationManager mNotificationManager; - private final IBinder mBinder = new LocalBinder(); - - @Nullable - private CarContext mCarContext; - - @Nullable - private Listener mListener; - - @Nullable - private NavigationManager mNavigationManager; - private boolean mIsNavigating; - private int mStepsSent; - - private List mDestinations = new ArrayList<>(); - private List mSteps = new ArrayList<>(); - - @Nullable - private Script mScript; - - /** A listener for the navigation state changes. */ - public interface Listener { - /** Callback called when the navigation state changes. */ - void navigationStateChanged( - boolean isNavigating, - boolean isRerouting, - boolean hasArrived, - @Nullable List destinations, - @Nullable List steps, - @Nullable TravelEstimate nextDestinationTravelEstimate, - @Nullable Distance nextStepRemainingDistance, - boolean shouldShowNextStep, - boolean shouldShowLanes, - @Nullable CarIcon junctionImage); - } - - /** - * Class used for the client Binder. Since this service runs in the same process as its clients, - * we don't need to deal with IPC. - */ - public class LocalBinder extends Binder { - @NonNull - public NavigationService getService() { - return NavigationService.this; - } - } - - @Override - public void onCreate() { - Log.i(TAG, "In onCreate()"); - createNotificationChannel(); - } - - @Override - public int onStartCommand(@NonNull Intent intent, int flags, int startId) { - Log.i(TAG, "In onStartCommand()"); - if (CANCEL_ACTION.equals(intent.getAction())) { - stopNavigation(); - } - return START_NOT_STICKY; - } - - @Nullable - @Override - public IBinder onBind(@NonNull Intent intent) { - return mBinder; - } - - @Override - public boolean onUnbind(@NonNull Intent intent) { - return true; // Ensures onRebind() is called when a client re-binds. - } - - /** Sets the {@link CarContext} to use while the service is connected. */ - public void setCarContext(@NonNull CarContext carContext, @NonNull Listener listener) { - mCarContext = carContext; - mNavigationManager = mCarContext.getCarService(NavigationManager.class); - mNavigationManager.setNavigationManagerCallback( - new NavigationManagerCallback() { - @Override - public void onStopNavigation() { - NavigationService.this.stopNavigation(); - } - - @Override - public void onAutoDriveEnabled() { - Log.d(TAG, "onAutoDriveEnabled called"); - CarToast.makeText(carContext, "Auto drive enabled", CarToast.LENGTH_LONG) - .show(); - } - }); - mListener = listener; - - // Uncomment if navigating - // mNavigationManager.navigationStarted(); - } - - /** Clears the currently used {@link CarContext}. */ - public void clearCarContext() { - mCarContext = null; - mNavigationManager = null; - } - - /** Executes the given list of navigation instructions. */ - public void executeInstructions(@NonNull List instructions) { - mScript = - Script.execute( - instructions, - (instruction, nextInstruction) -> { - switch (instruction.getType()) { - case START_NAVIGATION: - startNavigation(); - break; - case END_NAVIGATION: - endNavigationFromScript(); - break; - case ADD_DESTINATION_NAVIGATION: - Destination destination = instruction.getDestination(); - mDestinations.add(destination); - break; - case POP_DESTINATION_NAVIGATION: - mDestinations.remove(0); - break; - case ADD_STEP_NAVIGATION: - Step step = instruction.getStep(); - mSteps.add(step); - break; - case POP_STEP_NAVIGATION: - mSteps.remove(0); - break; - case SET_TRIP_POSITION_NAVIGATION: - if (mIsNavigating) { - TravelEstimate destinationTravelEstimate = - instruction.getDestinationTravelEstimate(); - TravelEstimate stepTravelEstimate = - instruction.getStepTravelEstimate(); - Trip.Builder tripBuilder = new Trip.Builder(); - tripBuilder - .addStep(mSteps.get(0), stepTravelEstimate) - .addDestination( - mDestinations.get(0), - destinationTravelEstimate) - .setLoading(false); - - if (instruction.getShouldShowNextStep() - && nextInstruction != null && mSteps.size() > 1) { - Step nextStep = mSteps.get(1); - TravelEstimate nextStepTravelEstimate = - nextInstruction.getStepTravelEstimate(); - if (nextStepTravelEstimate != null) { - tripBuilder.addStep(nextStep, - nextStepTravelEstimate); - } - } - - String road = instruction.getRoad(); - if (road != null) { - tripBuilder.setCurrentRoad(road); - } - mNavigationManager.updateTrip(tripBuilder.build()); - - if (++mStepsSent % 10 == 0) { - // For demo purposes only play audio of next turn every - // 10 steps. - playNavigationDirection(R.raw.turn_right); - mNotificationManager.notify( - NOTIFICATION_ID, - getTrafficAccidentWarningNotification()); - } - - update( - /* isNavigating= */ true, - /* isRerouting= */ false, - /* hasArrived= */ false, - mDestinations, - mSteps, - destinationTravelEstimate, - instruction.getStepRemainingDistance(), - instruction.getShouldNotify(), - instruction.getNotificationTitle(), - instruction.getNotificationContent(), - instruction.getNotificationIcon(), - instruction.getShouldShowNextStep(), - instruction.getShouldShowLanes(), - instruction.getJunctionImage()); - } - break; - case SET_REROUTING: - if (mIsNavigating) { - TravelEstimate destinationTravelEstimate = - instruction.getDestinationTravelEstimate(); - Trip.Builder tripBuilder = new Trip.Builder(); - tripBuilder - .addDestination( - mDestinations.get(0), - destinationTravelEstimate) - .setLoading(true); - mNavigationManager.updateTrip(tripBuilder.build()); - update( - /* isNavigating= */ true, - /* isRerouting= */ true, - /* hasArrived= */ false, - null, - null, - null, - null, - instruction.getShouldNotify(), - instruction.getNotificationTitle(), - instruction.getNotificationContent(), - instruction.getNotificationIcon(), - instruction.getShouldShowNextStep(), - instruction.getShouldShowLanes(), - instruction.getJunctionImage()); - } - break; - case SET_ARRIVED: - if (mIsNavigating) { - update( - /* isNavigating= */ true, - /* isRerouting= */ false, - /* hasArrived= */ true, - mDestinations, - null, - null, - null, - instruction.getShouldNotify(), - instruction.getNotificationTitle(), - instruction.getNotificationContent(), - instruction.getNotificationIcon(), - instruction.getShouldShowNextStep(), - instruction.getShouldShowLanes(), - instruction.getJunctionImage()); - } - break; - } - }); - } - - void update( - boolean isNavigating, - boolean isRerouting, - boolean hasArrived, - List destinations, - List steps, - TravelEstimate nextDestinationTravelEstimate, - Distance nextStepRemainingDistance, - boolean shouldNotify, - @Nullable String notificationTitle, - @Nullable String notificationContent, - int notificationIcon, - boolean shouldShowNextStep, - boolean shouldShowLanes, - @Nullable CarIcon junctionImage) { - if (mListener != null) { - mListener.navigationStateChanged( - isNavigating, - isRerouting, - hasArrived, - destinations, - steps, - nextDestinationTravelEstimate, - nextStepRemainingDistance, - shouldShowNextStep, - shouldShowLanes, - junctionImage); - } - - if (mNotificationManager != null && !TextUtils.isEmpty(notificationTitle)) { - mNotificationManager.notify( - NAV_NOTIFICATION_ID, - getNotification( - shouldNotify, - true, - notificationTitle, - notificationContent, - notificationIcon)); - } - } - - public boolean getIsNavigating() { - return mIsNavigating; - } - - /** Starts navigation. */ - public void startNavigation() { - Log.i(TAG, "Starting Navigation"); - startService(new Intent(getApplicationContext(), NavigationService.class)); - - Log.i(TAG, "Starting foreground service"); - startForeground( - NAV_NOTIFICATION_ID, - getNotification( - true, - false, - getString(R.string.navigation_active), - null, - R.drawable.ic_launcher)); - - if (mNavigationManager != null) { - mNavigationManager.navigationStarted(); - mIsNavigating = true; - mListener.navigationStateChanged( - mIsNavigating, - /* isRerouting= */ true, - /* hasArrived= */ false, - /* destinations= */ null, - /* steps= */ null, - /* nextDestinationTravelEstimate= */ null, - /* nextStepRemainingDistance= */ null, - /* shouldShowNextStep= */ false, - /* shouldShowLanes= */ false, - /* junctionImage= */ null); - } - } - - /** Stops navigation. */ - @SuppressWarnings("deprecation") - public void stopNavigation() { - Log.i(TAG, "Stopping Navigation"); - if (mScript != null) { - mScript.stop(); - mDestinations.clear(); - mSteps.clear(); - mScript = null; - } - - if (mNavigationManager != null) { - mNavigationManager.navigationEnded(); - mIsNavigating = false; - mListener.navigationStateChanged( - mIsNavigating, - /* isRerouting= */ false, - /* hasArrived= */ false, - /* destinations= */ null, - /* steps= */ null, - /* nextDestinationTravelEstimate= */ null, - /* nextStepRemainingDistance= */ null, - /* shouldShowNextStep= */ false, - /* shouldShowLanes= */ false, - /* junctionImage= */ null); - } - stopForeground(true); - stopSelf(); - } - - private void playNavigationDirection(@RawRes int resourceId) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { - return; - } - CarContext carContext = mCarContext; - if (carContext == null) { - return; - } - - MediaPlayer mediaPlayer = new MediaPlayer(); - - // Use USAGE_ASSISTANCE_NAVIGATION_GUIDANCE as the usage type for any navigation related - // audio, so that the audio will be played in the car speaker. - AudioAttributes audioAttributes = - new AudioAttributes.Builder() - .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH) - .setUsage(AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE) - .build(); - - mediaPlayer.setAudioAttributes(audioAttributes); - - // Request audio focus with AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK so that it will duck ongoing - // media. - // Ducking will behave differently depending on what is playing, if it is music it will - // lower - // the volume, if it is speech, it will pause it. - AudioFocusRequest request = - new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK) - .setAudioAttributes(audioAttributes) - .build(); - - AudioManager audioManager = carContext.getSystemService(AudioManager.class); - - mediaPlayer.setOnCompletionListener( - player -> { - try { - // When the audio finishes playing: stop and release the media player. - player.stop(); - player.release(); - } finally { - // Release the audio focus so that any previously playing audio can - // continue. - audioManager.abandonAudioFocusRequest(request); - } - }); - - // Requesting the audio focus. - if (audioManager.requestAudioFocus(request) != AUDIOFOCUS_REQUEST_GRANTED) { - // If audio focus is not granted ignore it. - return; - } - - try { - // Load our raw resource file, in the case where you synthesize the audio for the given - // direction, just use that audio file. - AssetFileDescriptor afd = carContext.getResources().openRawResourceFd(resourceId); - mediaPlayer.setDataSource( - afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength()); - afd.close(); - - mediaPlayer.prepare(); - } catch (IOException e) { - Log.e(TAG, "Failure loading audio resource", e); - // Release the audio focus so that any previously playing audio can continue. - audioManager.abandonAudioFocusRequest(request); - } - - // Start the audio playback. - mediaPlayer.start(); - } - - private void endNavigationFromScript() { - stopNavigation(); - } - - private void createNotificationChannel() { - mNotificationManager = getSystemService(NotificationManager.class); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - CharSequence name = getString(R.string.app_name); - NotificationChannel serviceChannel = - new NotificationChannel(CHANNEL_ID, name, NotificationManager.IMPORTANCE_HIGH); - mNotificationManager.createNotificationChannel(serviceChannel); - } - } - - /** Returns the {@link NotificationCompat} used as part of the foreground service. */ - private Notification getNotification( - boolean shouldNotify, - boolean showInCar, - CharSequence navigatingDisplayTitle, - CharSequence navigatingDisplayContent, - int notificationIcon) { - NotificationCompat.Builder builder = - new NotificationCompat.Builder(this, CHANNEL_ID) - .setContentIntent(createMainActivityPendingIntent()) - .setContentTitle(navigatingDisplayTitle) - .setContentText(navigatingDisplayContent) - .setOngoing(true) - .setCategory(NotificationCompat.CATEGORY_NAVIGATION) - .setOnlyAlertOnce(!shouldNotify) - - // Set the notification's background color on the car screen. - .setColor( - getResources().getColor(R.color.nav_notification_background_color, - null)) - .setColorized(true) - .setSmallIcon(R.drawable.ic_launcher) - .setLargeIcon( - BitmapFactory.decodeResource(getResources(), notificationIcon)) - .setTicker(navigatingDisplayTitle) - .setWhen(System.currentTimeMillis()); - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - builder.setChannelId(CHANNEL_ID); - builder.setPriority(NotificationManager.IMPORTANCE_HIGH); - } - if (showInCar) { - Intent intent = new Intent(Intent.ACTION_VIEW) - .setComponent(new ComponentName(this, NavigationCarAppService.class)) - .setData(NavigationCarAppService.createDeepLinkUri(Intent.ACTION_VIEW)); - builder.extend( - new CarAppExtender.Builder() - .setImportance(NotificationManagerCompat.IMPORTANCE_HIGH) - .setContentIntent( - CarPendingIntent.getCarApp(this, intent.hashCode(), - intent, - 0)) - .build()); - } - return builder.build(); - } - - private Notification getTrafficAccidentWarningNotification() { - return new NotificationCompat.Builder(this, CHANNEL_ID) - .setContentTitle("Traffic accident ahead") - .setContentText("Drive slowly") - .setSmallIcon(R.drawable.ic_settings) - .setLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.ic_settings)) - .extend( - new CarAppExtender.Builder() - .setImportance(NotificationManagerCompat.IMPORTANCE_HIGH) - .build()) - .build(); - } - - private PendingIntent createMainActivityPendingIntent() { - Intent intent = new Intent(this, MainActivity.class); - intent.putExtra(EXTRA_STARTED_FROM_NOTIFICATION, true); - return PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE); - } -} diff --git a/car_app_library/navigation/mobile/.gitignore b/car_app_library/navigation/mobile/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/car_app_library/navigation/mobile/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/car_app_library/navigation/mobile/build.gradle b/car_app_library/navigation/mobile/build.gradle deleted file mode 100644 index 6a5c6d7..0000000 --- a/car_app_library/navigation/mobile/build.gradle +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -apply plugin: 'com.android.application' - -android { - compileSdk 33 - - defaultConfig { - applicationId "androidx.car.app.sample.navigation" - minSdkVersion 23 - targetSdkVersion 33 - // Increment this to generate signed builds for uploading to Playstore - // Make sure this is different from the navigation-automotive version - versionCode 114 - versionName "114" - } - - buildTypes { - release { - // Enables code shrinking, obfuscation, and optimization. - minifyEnabled true - proguardFiles getDefaultProguardFile( - 'proguard-android-optimize.txt'), - 'proguard-rules.pro' - } - } - - compileOptions { - targetCompatibility = JavaVersion.VERSION_1_8 - sourceCompatibility = JavaVersion.VERSION_1_8 - } - namespace "androidx.car.app.sample.navigation" -} - -dependencies { - implementation "androidx.car.app:app-projected:1.3.0-beta01" - implementation project(":navigation:common") -} diff --git a/car_app_library/navigation/mobile/build.gradle.kts b/car_app_library/navigation/mobile/build.gradle.kts new file mode 100644 index 0000000..522d7e9 --- /dev/null +++ b/car_app_library/navigation/mobile/build.gradle.kts @@ -0,0 +1,19 @@ +plugins { + kotlin("android") + id("android-application-module") +} + +android { + namespace = "androidx.car.app.sample.navigation" + defaultConfig { + applicationId = "androidx.car.app.sample.navigation" + } +} + +dependencies { + implementation(libs.androidx.car.projected) + implementation(project(":navigation:shared")) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + } \ No newline at end of file diff --git a/car_app_library/navigation/shared/.gitignore b/car_app_library/navigation/shared/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/car_app_library/navigation/shared/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/car_app_library/navigation/shared/build.gradle.kts b/car_app_library/navigation/shared/build.gradle.kts new file mode 100644 index 0000000..260e077 --- /dev/null +++ b/car_app_library/navigation/shared/build.gradle.kts @@ -0,0 +1,16 @@ +plugins { +// kotlin("android") + id("android-library-module") +} + +android { + namespace = "androidx.car.app.sample.navigation.common" +} + +dependencies { + implementation( libs.androidx.core) + implementation( libs.androidx.car.app) + + implementation( libs.androidx.constraintlayout) +// implementation "androidx.annotation:annotation-experimental:1.0.0" +} \ No newline at end of file diff --git a/car_app_library/navigation/common/src/main/AndroidManifest.xml b/car_app_library/navigation/shared/src/main/AndroidManifest.xml similarity index 100% rename from car_app_library/navigation/common/src/main/AndroidManifest.xml rename to car_app_library/navigation/shared/src/main/AndroidManifest.xml diff --git a/car_app_library/navigation/shared/src/main/java/androidx/car/app/sample/navigation/common/app/MainActivity.kt b/car_app_library/navigation/shared/src/main/java/androidx/car/app/sample/navigation/common/app/MainActivity.kt new file mode 100644 index 0000000..36c200f --- /dev/null +++ b/car_app_library/navigation/shared/src/main/java/androidx/car/app/sample/navigation/common/app/MainActivity.kt @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package androidx.car.app.sample.navigation.common.app + +import android.Manifest +import android.content.ComponentName +import android.content.Intent +import android.content.ServiceConnection +import android.os.Bundle +import android.os.IBinder +import android.util.Log +import android.view.View +import android.widget.Button +import android.widget.Toast +import androidx.activity.ComponentActivity +import androidx.car.app.connection.CarConnection +import androidx.car.app.sample.navigation.common.R +import androidx.car.app.sample.navigation.common.nav.NavigationService +import androidx.car.app.sample.navigation.common.nav.NavigationService.LocalBinder + +/** + * The main app activity. + * + * + * See [androidx.car.app.sample.navigation.common.car.NavigationCarAppService] for the + * app's entry point to the cat host. + */ +class MainActivity : ComponentActivity() { + // A reference to the navigation service used to get location updates and routing. + var mService: NavigationService? = null + + // Tracks the bound state of the navigation service. + var mIsBound: Boolean = false + + // Monitors the state of the connection to the navigation service. + private val mServiceConnection: ServiceConnection = object : ServiceConnection { + override fun onServiceConnected(name: ComponentName, service: IBinder) { + Log.i(TAG, "In onServiceConnected() component:$name") + val binder = service as LocalBinder + mService = binder.service + mIsBound = true + } + + override fun onServiceDisconnected(name: ComponentName) { + Log.i(TAG, "In onServiceDisconnected() component:$name") + mService = null + mIsBound = false + } + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + Log.i(TAG, "In onCreate()") + + setContentView(R.layout.activity_main) + + // Hook up some manual navigation controls. + val startNavButton = findViewById