diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 974784a5a..d2cfec9f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,7 +45,7 @@ jobs: - name: Build and check run: | cd ApiDemos - for dir in ./*/ ; do ( cd "$dir" && ./gradlew buildGmsDebugPreBundle ); done + for dir in ./*/ ; do ( cd "$dir" && ./gradlew buildDebugPreBundle ); done build-WearOS: runs-on: ubuntu-latest diff --git a/ApiDemos/java/README.md b/ApiDemos/java/README.md index 36163cdc8..c25738bae 100644 --- a/ApiDemos/java/README.md +++ b/ApiDemos/java/README.md @@ -7,7 +7,7 @@ in the Java programming language. They demonstrate most of the features available in the API. -The Maps SDK for Android samples can be found under the `gms` gradle product +The Maps SDK for Android samples can be found under the `main` gradle product flavor, while the Maps SDK V3 BETA samples can be found under the `v3` gradle product flavor. The active product flavor can be modified through Android Studio’s “Build Variants” toolbar options. diff --git a/ApiDemos/java/app/build.gradle.kts b/ApiDemos/java/app/build.gradle.kts index e9647eb8e..a87f7eca2 100644 --- a/ApiDemos/java/app/build.gradle.kts +++ b/ApiDemos/java/app/build.gradle.kts @@ -23,13 +23,6 @@ plugins { android { compileSdk = 34 - productFlavors { - create("gms") { - dimension = "version" - applicationIdSuffix = ".gms" - versionNameSuffix = "-gms" - } - } defaultConfig { applicationId = "com.example.mapdemo" @@ -67,8 +60,6 @@ dependencies { implementation(libs.recyclerview) implementation(libs.volley) implementation(platform(libs.kotlinBom)) - - // GMS implementation(libs.playServicesMaps) // Tests diff --git a/ApiDemos/java/app/src/gms/AndroidManifest.xml b/ApiDemos/java/app/src/gms/AndroidManifest.xml deleted file mode 100644 index e572f5858..000000000 --- a/ApiDemos/java/app/src/gms/AndroidManifest.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ApiDemos/java/app/src/gms/res/layout/basic_demo.xml b/ApiDemos/java/app/src/gms/res/layout/basic_demo.xml deleted file mode 100644 index b7e49ba63..000000000 --- a/ApiDemos/java/app/src/gms/res/layout/basic_demo.xml +++ /dev/null @@ -1,20 +0,0 @@ - - diff --git a/ApiDemos/java/app/src/gms/res/layout/feature.xml b/ApiDemos/java/app/src/gms/res/layout/feature.xml deleted file mode 100644 index af5fd7dba..000000000 --- a/ApiDemos/java/app/src/gms/res/layout/feature.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - diff --git a/ApiDemos/java/app/src/gms/res/layout/legal_info.xml b/ApiDemos/java/app/src/gms/res/layout/legal_info.xml deleted file mode 100755 index ce7288dcc..000000000 --- a/ApiDemos/java/app/src/gms/res/layout/legal_info.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/ApiDemos/java/app/src/gms/res/layout/map_in_pager_demo.xml b/ApiDemos/java/app/src/gms/res/layout/map_in_pager_demo.xml deleted file mode 100755 index c0d39b594..000000000 --- a/ApiDemos/java/app/src/gms/res/layout/map_in_pager_demo.xml +++ /dev/null @@ -1,19 +0,0 @@ - - diff --git a/ApiDemos/java/app/src/gms/res/layout/marker_close_info_window_on_retap_demo.xml b/ApiDemos/java/app/src/gms/res/layout/marker_close_info_window_on_retap_demo.xml deleted file mode 100644 index 82d6dc297..000000000 --- a/ApiDemos/java/app/src/gms/res/layout/marker_close_info_window_on_retap_demo.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/ApiDemos/java/app/src/gms/res/layout/my_location_demo.xml b/ApiDemos/java/app/src/gms/res/layout/my_location_demo.xml deleted file mode 100755 index 2452e22d2..000000000 --- a/ApiDemos/java/app/src/gms/res/layout/my_location_demo.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - diff --git a/ApiDemos/java/app/src/gms/res/layout/raw_mapview_demo.xml b/ApiDemos/java/app/src/gms/res/layout/raw_mapview_demo.xml deleted file mode 100644 index 95b881d44..000000000 --- a/ApiDemos/java/app/src/gms/res/layout/raw_mapview_demo.xml +++ /dev/null @@ -1,19 +0,0 @@ - - diff --git a/ApiDemos/java/app/src/gms/res/layout/save_state_demo.xml b/ApiDemos/java/app/src/gms/res/layout/save_state_demo.xml deleted file mode 100755 index 6b9783c2f..000000000 --- a/ApiDemos/java/app/src/gms/res/layout/save_state_demo.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - diff --git a/ApiDemos/java/app/src/gms/res/layout/street_view_panorama_basic_demo.xml b/ApiDemos/java/app/src/gms/res/layout/street_view_panorama_basic_demo.xml deleted file mode 100755 index 6ea71e61c..000000000 --- a/ApiDemos/java/app/src/gms/res/layout/street_view_panorama_basic_demo.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - diff --git a/ApiDemos/java/app/src/gms/res/layout/street_view_panorama_view_demo.xml b/ApiDemos/java/app/src/gms/res/layout/street_view_panorama_view_demo.xml deleted file mode 100755 index 0e4baade9..000000000 --- a/ApiDemos/java/app/src/gms/res/layout/street_view_panorama_view_demo.xml +++ /dev/null @@ -1,19 +0,0 @@ - - diff --git a/ApiDemos/java/app/src/gms/res/layout/tags_demo.xml b/ApiDemos/java/app/src/gms/res/layout/tags_demo.xml deleted file mode 100644 index 30ee1f747..000000000 --- a/ApiDemos/java/app/src/gms/res/layout/tags_demo.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/ApiDemos/java/app/src/gms/res/layout/text_fragment.xml b/ApiDemos/java/app/src/gms/res/layout/text_fragment.xml deleted file mode 100755 index 5fcc62a2d..000000000 --- a/ApiDemos/java/app/src/gms/res/layout/text_fragment.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/ApiDemos/java/app/src/gms/res/layout/tile_coordinate_demo.xml b/ApiDemos/java/app/src/gms/res/layout/tile_coordinate_demo.xml deleted file mode 100755 index ef4bff9c3..000000000 --- a/ApiDemos/java/app/src/gms/res/layout/tile_coordinate_demo.xml +++ /dev/null @@ -1,20 +0,0 @@ - - diff --git a/ApiDemos/java/app/src/main/AndroidManifest.xml b/ApiDemos/java/app/src/main/AndroidManifest.xml index 92fb8dc4f..ebf649902 100644 --- a/ApiDemos/java/app/src/main/AndroidManifest.xml +++ b/ApiDemos/java/app/src/main/AndroidManifest.xml @@ -49,6 +49,137 @@ limitations under the License. android:name="com.google.android.geo.API_KEY" android:value="${MAPS_API_KEY}" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/AdvancedMarkersDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/AdvancedMarkersDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/AdvancedMarkersDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/AdvancedMarkersDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/BackgroundColorCustomizationDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/BackgroundColorCustomizationDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/BackgroundColorCustomizationDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/BackgroundColorCustomizationDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/BackgroundColorCustomizationProgrammaticDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/BackgroundColorCustomizationProgrammaticDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/BackgroundColorCustomizationProgrammaticDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/BackgroundColorCustomizationProgrammaticDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/BasicMapDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/BasicMapDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/BasicMapDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/BasicMapDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/CameraClampingDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/CameraClampingDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/CameraClampingDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/CameraClampingDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/CameraDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/CameraDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/CameraDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/CameraDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/CircleDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/CircleDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/CircleDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/CircleDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/CloudBasedMapStylingDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/CloudBasedMapStylingDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/CloudBasedMapStylingDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/CloudBasedMapStylingDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/DemoDetails.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/DemoDetails.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/DemoDetails.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/DemoDetails.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/DemoDetailsList.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/DemoDetailsList.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/DemoDetailsList.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/DemoDetailsList.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/EventsDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/EventsDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/EventsDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/EventsDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/FeatureView.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/FeatureView.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/FeatureView.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/FeatureView.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/GroundOverlayDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/GroundOverlayDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/GroundOverlayDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/GroundOverlayDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/IndoorDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/IndoorDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/IndoorDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/IndoorDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/LayersDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/LayersDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/LayersDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/LayersDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/LiteDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/LiteDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/LiteDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/LiteDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/LiteListDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/LiteListDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/LiteListDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/LiteListDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/LocationSourceDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/LocationSourceDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/LocationSourceDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/LocationSourceDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/MainActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/MainActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/MainActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/MainActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/MapColorSchemeActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/MapColorSchemeActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/MapColorSchemeActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/MapColorSchemeActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/MapInPagerDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/MapInPagerDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/MapInPagerDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/MapInPagerDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/MarkerCloseInfoWindowOnRetapDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/MarkerCloseInfoWindowOnRetapDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/MarkerCloseInfoWindowOnRetapDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/MarkerCloseInfoWindowOnRetapDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/MarkerDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/MarkerDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/MarkerDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/MarkerDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/MultiMapDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/MultiMapDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/MultiMapDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/MultiMapDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/MyLocationDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/MyLocationDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/MyLocationDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/MyLocationDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/OnMapAndViewReadyListener.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/OnMapAndViewReadyListener.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/OnMapAndViewReadyListener.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/OnMapAndViewReadyListener.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/OptionsDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/OptionsDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/OptionsDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/OptionsDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/PermissionUtils.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/PermissionUtils.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/PermissionUtils.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/PermissionUtils.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/PolygonDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/PolygonDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/PolygonDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/PolygonDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/PolylineDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/PolylineDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/PolylineDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/PolylineDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/ProgrammaticDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/ProgrammaticDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/ProgrammaticDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/ProgrammaticDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/RawMapViewDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/RawMapViewDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/RawMapViewDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/RawMapViewDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/RetainMapDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/RetainMapDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/RetainMapDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/RetainMapDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/SaveStateDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/SaveStateDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/SaveStateDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/SaveStateDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/SnapshotDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/SnapshotDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/SnapshotDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/SnapshotDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/SplitStreetViewPanoramaAndMapDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/SplitStreetViewPanoramaAndMapDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/SplitStreetViewPanoramaAndMapDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/SplitStreetViewPanoramaAndMapDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/StreetViewPanoramaBasicDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/StreetViewPanoramaBasicDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/StreetViewPanoramaBasicDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/StreetViewPanoramaBasicDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/StreetViewPanoramaEventsDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/StreetViewPanoramaEventsDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/StreetViewPanoramaEventsDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/StreetViewPanoramaEventsDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/StreetViewPanoramaNavigationDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/StreetViewPanoramaNavigationDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/StreetViewPanoramaNavigationDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/StreetViewPanoramaNavigationDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/StreetViewPanoramaOptionsDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/StreetViewPanoramaOptionsDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/StreetViewPanoramaOptionsDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/StreetViewPanoramaOptionsDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/StreetViewPanoramaViewDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/StreetViewPanoramaViewDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/StreetViewPanoramaViewDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/StreetViewPanoramaViewDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/StyledMapDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/StyledMapDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/StyledMapDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/StyledMapDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/TagsDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/TagsDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/TagsDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/TagsDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/TileCoordinateDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/TileCoordinateDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/TileCoordinateDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/TileCoordinateDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/TileOverlayDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/TileOverlayDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/TileOverlayDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/TileOverlayDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/UiSettingsDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/UiSettingsDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/UiSettingsDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/UiSettingsDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/VisibleRegionDemoActivity.java b/ApiDemos/java/app/src/main/java/com/example/mapdemo/VisibleRegionDemoActivity.java similarity index 100% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/VisibleRegionDemoActivity.java rename to ApiDemos/java/app/src/main/java/com/example/mapdemo/VisibleRegionDemoActivity.java diff --git a/ApiDemos/java/app/src/gms/res/layout-land/snapshot_demo.xml b/ApiDemos/java/app/src/main/res/layout-land/snapshot_demo.xml similarity index 100% rename from ApiDemos/java/app/src/gms/res/layout-land/snapshot_demo.xml rename to ApiDemos/java/app/src/main/res/layout-land/snapshot_demo.xml diff --git a/ApiDemos/java/app/src/gms/res/layout/background_color_customization_demo.xml b/ApiDemos/java/app/src/main/res/layout/background_color_customization_demo.xml similarity index 100% rename from ApiDemos/java/app/src/gms/res/layout/background_color_customization_demo.xml rename to ApiDemos/java/app/src/main/res/layout/background_color_customization_demo.xml diff --git a/ApiDemos/java/app/src/gms/res/layout/background_color_customization_programmatic_demo.xml b/ApiDemos/java/app/src/main/res/layout/background_color_customization_programmatic_demo.xml similarity index 100% rename from ApiDemos/java/app/src/gms/res/layout/background_color_customization_programmatic_demo.xml rename to ApiDemos/java/app/src/main/res/layout/background_color_customization_programmatic_demo.xml diff --git a/ApiDemos/java/app/src/main/res/layout/basic_demo.xml b/ApiDemos/java/app/src/main/res/layout/basic_demo.xml new file mode 100644 index 000000000..cdbc814ae --- /dev/null +++ b/ApiDemos/java/app/src/main/res/layout/basic_demo.xml @@ -0,0 +1,22 @@ + + + + diff --git a/ApiDemos/java/app/src/gms/res/layout/camera_clamping_demo.xml b/ApiDemos/java/app/src/main/res/layout/camera_clamping_demo.xml similarity index 83% rename from ApiDemos/java/app/src/gms/res/layout/camera_clamping_demo.xml rename to ApiDemos/java/app/src/main/res/layout/camera_clamping_demo.xml index f86e42410..346a4287c 100644 --- a/ApiDemos/java/app/src/gms/res/layout/camera_clamping_demo.xml +++ b/ApiDemos/java/app/src/main/res/layout/camera_clamping_demo.xml @@ -1,18 +1,18 @@ + + + + + + + diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/ground_overlay_demo.xml b/ApiDemos/java/app/src/main/res/layout/ground_overlay_demo.xml similarity index 74% rename from ApiDemos/kotlin/app/src/gms/res/layout/ground_overlay_demo.xml rename to ApiDemos/java/app/src/main/res/layout/ground_overlay_demo.xml index 30d78fadc..51aa15599 100644 --- a/ApiDemos/kotlin/app/src/gms/res/layout/ground_overlay_demo.xml +++ b/ApiDemos/java/app/src/main/res/layout/ground_overlay_demo.xml @@ -1,17 +1,18 @@ - + + + + + diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/lite_demo.xml b/ApiDemos/java/app/src/main/res/layout/lite_demo.xml old mode 100644 new mode 100755 similarity index 77% rename from ApiDemos/kotlin/app/src/gms/res/layout/lite_demo.xml rename to ApiDemos/java/app/src/main/res/layout/lite_demo.xml index 1abb43638..e2327ca7e --- a/ApiDemos/kotlin/app/src/gms/res/layout/lite_demo.xml +++ b/ApiDemos/java/app/src/main/res/layout/lite_demo.xml @@ -1,17 +1,18 @@ - + + diff --git a/ApiDemos/java/app/src/main/res/layout/marker_close_info_window_on_retap_demo.xml b/ApiDemos/java/app/src/main/res/layout/marker_close_info_window_on_retap_demo.xml new file mode 100644 index 000000000..b1e9f5e40 --- /dev/null +++ b/ApiDemos/java/app/src/main/res/layout/marker_close_info_window_on_retap_demo.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/ApiDemos/java/app/src/gms/res/layout/marker_demo.xml b/ApiDemos/java/app/src/main/res/layout/marker_demo.xml similarity index 83% rename from ApiDemos/java/app/src/gms/res/layout/marker_demo.xml rename to ApiDemos/java/app/src/main/res/layout/marker_demo.xml index 66fd8bb8f..765cce1e9 100644 --- a/ApiDemos/java/app/src/gms/res/layout/marker_demo.xml +++ b/ApiDemos/java/app/src/main/res/layout/marker_demo.xml @@ -1,17 +1,18 @@ - + + + + + + diff --git a/ApiDemos/java/app/src/gms/res/layout/options_demo.xml b/ApiDemos/java/app/src/main/res/layout/options_demo.xml similarity index 50% rename from ApiDemos/java/app/src/gms/res/layout/options_demo.xml rename to ApiDemos/java/app/src/main/res/layout/options_demo.xml index 8adcccc00..143f96679 100644 --- a/ApiDemos/java/app/src/gms/res/layout/options_demo.xml +++ b/ApiDemos/java/app/src/main/res/layout/options_demo.xml @@ -1,17 +1,18 @@ - + + diff --git a/ApiDemos/java/app/src/main/res/layout/save_state_demo.xml b/ApiDemos/java/app/src/main/res/layout/save_state_demo.xml new file mode 100755 index 000000000..0855aa5b1 --- /dev/null +++ b/ApiDemos/java/app/src/main/res/layout/save_state_demo.xml @@ -0,0 +1,34 @@ + + + + + + + + + diff --git a/ApiDemos/java/app/src/gms/res/layout/snapshot_demo.xml b/ApiDemos/java/app/src/main/res/layout/snapshot_demo.xml similarity index 74% rename from ApiDemos/java/app/src/gms/res/layout/snapshot_demo.xml rename to ApiDemos/java/app/src/main/res/layout/snapshot_demo.xml index a4de6cd9e..267f0d58d 100755 --- a/ApiDemos/java/app/src/gms/res/layout/snapshot_demo.xml +++ b/ApiDemos/java/app/src/main/res/layout/snapshot_demo.xml @@ -1,18 +1,18 @@ + + + + + diff --git a/ApiDemos/java/app/src/gms/res/layout/street_view_panorama_events_demo.xml b/ApiDemos/java/app/src/main/res/layout/street_view_panorama_events_demo.xml similarity index 68% rename from ApiDemos/java/app/src/gms/res/layout/street_view_panorama_events_demo.xml rename to ApiDemos/java/app/src/main/res/layout/street_view_panorama_events_demo.xml index 2251e2774..5071f44c1 100755 --- a/ApiDemos/java/app/src/gms/res/layout/street_view_panorama_events_demo.xml +++ b/ApiDemos/java/app/src/main/res/layout/street_view_panorama_events_demo.xml @@ -1,17 +1,18 @@ - + + diff --git a/ApiDemos/java/app/src/gms/res/layout/styled_map_demo.xml b/ApiDemos/java/app/src/main/res/layout/styled_map_demo.xml similarity index 100% rename from ApiDemos/java/app/src/gms/res/layout/styled_map_demo.xml rename to ApiDemos/java/app/src/main/res/layout/styled_map_demo.xml diff --git a/ApiDemos/java/app/src/main/res/layout/tags_demo.xml b/ApiDemos/java/app/src/main/res/layout/tags_demo.xml new file mode 100644 index 000000000..f3e2653eb --- /dev/null +++ b/ApiDemos/java/app/src/main/res/layout/tags_demo.xml @@ -0,0 +1,32 @@ + + + + + + + + \ No newline at end of file diff --git a/ApiDemos/java/app/src/main/res/layout/text_fragment.xml b/ApiDemos/java/app/src/main/res/layout/text_fragment.xml new file mode 100755 index 000000000..74c892001 --- /dev/null +++ b/ApiDemos/java/app/src/main/res/layout/text_fragment.xml @@ -0,0 +1,21 @@ + + + diff --git a/ApiDemos/java/app/src/main/res/layout/tile_coordinate_demo.xml b/ApiDemos/java/app/src/main/res/layout/tile_coordinate_demo.xml new file mode 100755 index 000000000..b583e56f0 --- /dev/null +++ b/ApiDemos/java/app/src/main/res/layout/tile_coordinate_demo.xml @@ -0,0 +1,21 @@ + + + diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/tile_overlay_demo.xml b/ApiDemos/java/app/src/main/res/layout/tile_overlay_demo.xml similarity index 68% rename from ApiDemos/kotlin/app/src/gms/res/layout/tile_overlay_demo.xml rename to ApiDemos/java/app/src/main/res/layout/tile_overlay_demo.xml index af5e171cf..7b2ff5be6 100755 --- a/ApiDemos/kotlin/app/src/gms/res/layout/tile_overlay_demo.xml +++ b/ApiDemos/java/app/src/main/res/layout/tile_overlay_demo.xml @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/map_in_pager_demo.xml b/ApiDemos/kotlin/app/src/gms/res/layout/map_in_pager_demo.xml deleted file mode 100755 index ec2274a6b..000000000 --- a/ApiDemos/kotlin/app/src/gms/res/layout/map_in_pager_demo.xml +++ /dev/null @@ -1,19 +0,0 @@ - - diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/my_location_demo.xml b/ApiDemos/kotlin/app/src/gms/res/layout/my_location_demo.xml deleted file mode 100644 index 2452e22d2..000000000 --- a/ApiDemos/kotlin/app/src/gms/res/layout/my_location_demo.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/raw_mapview_demo.xml b/ApiDemos/kotlin/app/src/gms/res/layout/raw_mapview_demo.xml deleted file mode 100644 index 95b881d44..000000000 --- a/ApiDemos/kotlin/app/src/gms/res/layout/raw_mapview_demo.xml +++ /dev/null @@ -1,19 +0,0 @@ - - diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/save_state_demo.xml b/ApiDemos/kotlin/app/src/gms/res/layout/save_state_demo.xml deleted file mode 100755 index 98400fb25..000000000 --- a/ApiDemos/kotlin/app/src/gms/res/layout/save_state_demo.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/street_view_panorama_basic_demo.xml b/ApiDemos/kotlin/app/src/gms/res/layout/street_view_panorama_basic_demo.xml deleted file mode 100644 index 6ea71e61c..000000000 --- a/ApiDemos/kotlin/app/src/gms/res/layout/street_view_panorama_basic_demo.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/text_fragment.xml b/ApiDemos/kotlin/app/src/gms/res/layout/text_fragment.xml deleted file mode 100755 index 5fcc62a2d..000000000 --- a/ApiDemos/kotlin/app/src/gms/res/layout/text_fragment.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/tile_coordinate_demo.xml b/ApiDemos/kotlin/app/src/gms/res/layout/tile_coordinate_demo.xml deleted file mode 100755 index ef4bff9c3..000000000 --- a/ApiDemos/kotlin/app/src/gms/res/layout/tile_coordinate_demo.xml +++ /dev/null @@ -1,20 +0,0 @@ - - diff --git a/ApiDemos/kotlin/app/src/main/AndroidManifest.xml b/ApiDemos/kotlin/app/src/main/AndroidManifest.xml index fede1a685..689bfdf60 100644 --- a/ApiDemos/kotlin/app/src/main/AndroidManifest.xml +++ b/ApiDemos/kotlin/app/src/main/AndroidManifest.xml @@ -39,6 +39,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/AdvancedMarkersDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/AdvancedMarkersDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/AdvancedMarkersDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/AdvancedMarkersDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/BackgroundColorCustomizationDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/BackgroundColorCustomizationDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/BackgroundColorCustomizationDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/BackgroundColorCustomizationDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/BackgroundColorCustomizationProgrammaticDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/BackgroundColorCustomizationProgrammaticDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/BackgroundColorCustomizationProgrammaticDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/BackgroundColorCustomizationProgrammaticDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/BasicMapDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/BasicMapDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/BasicMapDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/BasicMapDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/CameraClampingDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/CameraClampingDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/CameraClampingDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/CameraClampingDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/CameraDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/CameraDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/CameraDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/CameraDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/CircleDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/CircleDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/CircleDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/CircleDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/CloudBasedMapStylingDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/CloudBasedMapStylingDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/CloudBasedMapStylingDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/CloudBasedMapStylingDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/DemoDetails.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/DemoDetails.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/DemoDetails.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/DemoDetails.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/DemoDetailsList.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/DemoDetailsList.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/DemoDetailsList.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/DemoDetailsList.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/EventsDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/EventsDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/EventsDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/EventsDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/FeatureView.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/FeatureView.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/FeatureView.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/FeatureView.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/GroundOverlayDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/GroundOverlayDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/GroundOverlayDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/GroundOverlayDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/IndoorDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/IndoorDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/IndoorDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/IndoorDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/LayersDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/LayersDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/LayersDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/LayersDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/LiteDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/LiteDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/LiteDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/LiteDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/LiteListDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/LiteListDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/LiteListDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/LiteListDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/LocationSourceDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/LocationSourceDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/LocationSourceDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/LocationSourceDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MainActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/MainActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MainActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/MainActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MapColorSchemeActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/MapColorSchemeActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MapColorSchemeActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/MapColorSchemeActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MapInPagerDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/MapInPagerDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MapInPagerDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/MapInPagerDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MarkerCloseInfoWindowOnRetapDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/MarkerCloseInfoWindowOnRetapDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MarkerCloseInfoWindowOnRetapDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/MarkerCloseInfoWindowOnRetapDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MarkerDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/MarkerDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MarkerDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/MarkerDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MultiMapDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/MultiMapDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MultiMapDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/MultiMapDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MyLocationDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/MyLocationDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MyLocationDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/MyLocationDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/OnMapAndViewReadyListener.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/OnMapAndViewReadyListener.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/OnMapAndViewReadyListener.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/OnMapAndViewReadyListener.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/OptionsDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/OptionsDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/OptionsDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/OptionsDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/PermissionUtils.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/PermissionUtils.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/PermissionUtils.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/PermissionUtils.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/PolygonDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/PolygonDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/PolygonDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/PolygonDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/PolylineDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/PolylineDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/PolylineDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/PolylineDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/ProgrammaticDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/ProgrammaticDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/ProgrammaticDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/ProgrammaticDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/RawMapViewDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/RawMapViewDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/RawMapViewDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/RawMapViewDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/RetainMapDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/RetainMapDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/RetainMapDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/RetainMapDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/SaveStateDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/SaveStateDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/SaveStateDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/SaveStateDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/SnapshotDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/SnapshotDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/SnapshotDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/SnapshotDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/SplitStreetViewPanoramaAndMapDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/SplitStreetViewPanoramaAndMapDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/SplitStreetViewPanoramaAndMapDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/SplitStreetViewPanoramaAndMapDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/StreetViewPanoramaBasicDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/StreetViewPanoramaBasicDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/StreetViewPanoramaBasicDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/StreetViewPanoramaBasicDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/StreetViewPanoramaEventsDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/StreetViewPanoramaEventsDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/StreetViewPanoramaEventsDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/StreetViewPanoramaEventsDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/StreetViewPanoramaNavigationDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/StreetViewPanoramaNavigationDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/StreetViewPanoramaNavigationDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/StreetViewPanoramaNavigationDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/StreetViewPanoramaOptionsDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/StreetViewPanoramaOptionsDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/StreetViewPanoramaOptionsDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/StreetViewPanoramaOptionsDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/StreetViewPanoramaViewDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/StreetViewPanoramaViewDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/StreetViewPanoramaViewDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/StreetViewPanoramaViewDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/StyledMapDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/StyledMapDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/StyledMapDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/StyledMapDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/TagsDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/TagsDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/TagsDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/TagsDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/TileCoordinateDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/TileCoordinateDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/TileCoordinateDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/TileCoordinateDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/TileOverlayDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/TileOverlayDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/TileOverlayDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/TileOverlayDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/UiSettingsDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/UiSettingsDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/UiSettingsDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/UiSettingsDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/VisibleRegionDemoActivity.kt b/ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/VisibleRegionDemoActivity.kt similarity index 100% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/VisibleRegionDemoActivity.kt rename to ApiDemos/kotlin/app/src/main/java/com/example/kotlindemos/VisibleRegionDemoActivity.kt diff --git a/ApiDemos/kotlin/app/src/gms/res/layout-land/snapshot_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout-land similarity index 100% rename from ApiDemos/kotlin/app/src/gms/res/layout-land/snapshot_demo.xml rename to ApiDemos/kotlin/app/src/main/res/layout-land diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/activity_basic_map_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/activity_basic_map_demo.xml similarity index 100% rename from ApiDemos/kotlin/app/src/gms/res/layout/activity_basic_map_demo.xml rename to ApiDemos/kotlin/app/src/main/res/layout/activity_basic_map_demo.xml diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/activity_circle_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/activity_circle_demo.xml similarity index 100% rename from ApiDemos/kotlin/app/src/gms/res/layout/activity_circle_demo.xml rename to ApiDemos/kotlin/app/src/main/res/layout/activity_circle_demo.xml diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/activity_lite_list_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/activity_lite_list_demo.xml similarity index 100% rename from ApiDemos/kotlin/app/src/gms/res/layout/activity_lite_list_demo.xml rename to ApiDemos/kotlin/app/src/main/res/layout/activity_lite_list_demo.xml diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/activity_main.xml b/ApiDemos/kotlin/app/src/main/res/layout/activity_main.xml similarity index 100% rename from ApiDemos/kotlin/app/src/gms/res/layout/activity_main.xml rename to ApiDemos/kotlin/app/src/main/res/layout/activity_main.xml diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/activity_marker_close_info_window_on_retap_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/activity_marker_close_info_window_on_retap_demo.xml similarity index 100% rename from ApiDemos/kotlin/app/src/gms/res/layout/activity_marker_close_info_window_on_retap_demo.xml rename to ApiDemos/kotlin/app/src/main/res/layout/activity_marker_close_info_window_on_retap_demo.xml diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/activity_street_view_panorama_navigation_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/activity_street_view_panorama_navigation_demo.xml similarity index 100% rename from ApiDemos/kotlin/app/src/gms/res/layout/activity_street_view_panorama_navigation_demo.xml rename to ApiDemos/kotlin/app/src/main/res/layout/activity_street_view_panorama_navigation_demo.xml diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/activity_ui_settings_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/activity_ui_settings_demo.xml similarity index 100% rename from ApiDemos/kotlin/app/src/gms/res/layout/activity_ui_settings_demo.xml rename to ApiDemos/kotlin/app/src/main/res/layout/activity_ui_settings_demo.xml diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/advanced_markers_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/advanced_markers_demo.xml similarity index 100% rename from ApiDemos/kotlin/app/src/gms/res/layout/advanced_markers_demo.xml rename to ApiDemos/kotlin/app/src/main/res/layout/advanced_markers_demo.xml diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/background_color_customization_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/background_color_customization_demo.xml similarity index 100% rename from ApiDemos/kotlin/app/src/gms/res/layout/background_color_customization_demo.xml rename to ApiDemos/kotlin/app/src/main/res/layout/background_color_customization_demo.xml diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/background_color_customization_programmatic_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/background_color_customization_programmatic_demo.xml similarity index 100% rename from ApiDemos/kotlin/app/src/gms/res/layout/background_color_customization_programmatic_demo.xml rename to ApiDemos/kotlin/app/src/main/res/layout/background_color_customization_programmatic_demo.xml diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/camera_clamping_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/camera_clamping_demo.xml similarity index 82% rename from ApiDemos/kotlin/app/src/gms/res/layout/camera_clamping_demo.xml rename to ApiDemos/kotlin/app/src/main/res/layout/camera_clamping_demo.xml index aa754b178..aec555417 100644 --- a/ApiDemos/kotlin/app/src/gms/res/layout/camera_clamping_demo.xml +++ b/ApiDemos/kotlin/app/src/main/res/layout/camera_clamping_demo.xml @@ -1,18 +1,18 @@ + + diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/marker_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/marker_demo.xml similarity index 100% rename from ApiDemos/kotlin/app/src/gms/res/layout/marker_demo.xml rename to ApiDemos/kotlin/app/src/main/res/layout/marker_demo.xml diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/multimap_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/multimap_demo.xml similarity index 77% rename from ApiDemos/kotlin/app/src/gms/res/layout/multimap_demo.xml rename to ApiDemos/kotlin/app/src/main/res/layout/multimap_demo.xml index 95e48e64a..7d873ade1 100644 --- a/ApiDemos/kotlin/app/src/gms/res/layout/multimap_demo.xml +++ b/ApiDemos/kotlin/app/src/main/res/layout/multimap_demo.xml @@ -1,17 +1,18 @@ - + + + + + + diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/options_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/options_demo.xml similarity index 50% rename from ApiDemos/kotlin/app/src/gms/res/layout/options_demo.xml rename to ApiDemos/kotlin/app/src/main/res/layout/options_demo.xml index 8adcccc00..143f96679 100644 --- a/ApiDemos/kotlin/app/src/gms/res/layout/options_demo.xml +++ b/ApiDemos/kotlin/app/src/main/res/layout/options_demo.xml @@ -1,17 +1,18 @@ - + + + diff --git a/ApiDemos/kotlin/app/src/main/res/layout/save_state_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/save_state_demo.xml new file mode 100755 index 000000000..7c9949d58 --- /dev/null +++ b/ApiDemos/kotlin/app/src/main/res/layout/save_state_demo.xml @@ -0,0 +1,34 @@ + + + + + + + + + diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/snapshot_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/snapshot_demo.xml similarity index 74% rename from ApiDemos/kotlin/app/src/gms/res/layout/snapshot_demo.xml rename to ApiDemos/kotlin/app/src/main/res/layout/snapshot_demo.xml index 0ad74d1af..1aef1ad40 100755 --- a/ApiDemos/kotlin/app/src/gms/res/layout/snapshot_demo.xml +++ b/ApiDemos/kotlin/app/src/main/res/layout/snapshot_demo.xml @@ -1,18 +1,18 @@ + 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. +--> + + + + + + + diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/street_view_panorama_events_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/street_view_panorama_events_demo.xml similarity index 68% rename from ApiDemos/kotlin/app/src/gms/res/layout/street_view_panorama_events_demo.xml rename to ApiDemos/kotlin/app/src/main/res/layout/street_view_panorama_events_demo.xml index 2251e2774..5071f44c1 100644 --- a/ApiDemos/kotlin/app/src/gms/res/layout/street_view_panorama_events_demo.xml +++ b/ApiDemos/kotlin/app/src/main/res/layout/street_view_panorama_events_demo.xml @@ -1,17 +1,18 @@ - + 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. +--> + diff --git a/ApiDemos/kotlin/app/src/main/res/layout/styled_map_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/styled_map_demo.xml index 19962c44b..17470bb0c 100644 --- a/ApiDemos/kotlin/app/src/main/res/layout/styled_map_demo.xml +++ b/ApiDemos/kotlin/app/src/main/res/layout/styled_map_demo.xml @@ -1,12 +1,12 @@ - + - \ No newline at end of file diff --git a/ApiDemos/kotlin/app/src/gms/res/layout/tags_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/tags_demo.xml similarity index 100% rename from ApiDemos/kotlin/app/src/gms/res/layout/tags_demo.xml rename to ApiDemos/kotlin/app/src/main/res/layout/tags_demo.xml diff --git a/ApiDemos/kotlin/app/src/main/res/layout/text_fragment.xml b/ApiDemos/kotlin/app/src/main/res/layout/text_fragment.xml new file mode 100755 index 000000000..74c892001 --- /dev/null +++ b/ApiDemos/kotlin/app/src/main/res/layout/text_fragment.xml @@ -0,0 +1,21 @@ + + + diff --git a/ApiDemos/kotlin/app/src/main/res/layout/tile_coordinate_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/tile_coordinate_demo.xml new file mode 100755 index 000000000..b583e56f0 --- /dev/null +++ b/ApiDemos/kotlin/app/src/main/res/layout/tile_coordinate_demo.xml @@ -0,0 +1,21 @@ + + + diff --git a/ApiDemos/java/app/src/gms/res/layout/tile_overlay_demo.xml b/ApiDemos/kotlin/app/src/main/res/layout/tile_overlay_demo.xml similarity index 68% rename from ApiDemos/java/app/src/gms/res/layout/tile_overlay_demo.xml rename to ApiDemos/kotlin/app/src/main/res/layout/tile_overlay_demo.xml index af5e171cf..7b2ff5be6 100755 --- a/ApiDemos/java/app/src/gms/res/layout/tile_overlay_demo.xml +++ b/ApiDemos/kotlin/app/src/main/res/layout/tile_overlay_demo.xml @@ -1,17 +1,18 @@ - + 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. +--> +