Rename car/app directories for automotive and projected.
car/app/app-activity -> car/app/app-automotive
car/app/app-property -> car/app/app-projected
Relnote: N/A
Bug: 187073611
Test: ./gradlew :car:app:app-automotive:checkApi && ./gradlew bOS
Test: ./gradlew :car:app:app-projected:checkApi && ./gradlew bOS
Change-Id: I9fcc5a7e255ceea7f4159633bb1123303dc2314b
diff --git a/car/app/app-activity/src/test/AndroidManifest.xml b/car/app/app-activity/src/test/AndroidManifest.xml
deleted file mode 100644
index 18793e8..0000000
--- a/car/app/app-activity/src/test/AndroidManifest.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 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.
- -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.car.app.activity">
-</manifest>
diff --git a/car/app/app-activity/api/OWNERS b/car/app/app-automotive/api/OWNERS
similarity index 100%
rename from car/app/app-activity/api/OWNERS
rename to car/app/app-automotive/api/OWNERS
diff --git a/car/app/app-activity/api/current.txt b/car/app/app-automotive/api/current.txt
similarity index 100%
rename from car/app/app-activity/api/current.txt
rename to car/app/app-automotive/api/current.txt
diff --git a/car/app/app-activity/api/public_plus_experimental_current.txt b/car/app/app-automotive/api/public_plus_experimental_current.txt
similarity index 100%
rename from car/app/app-activity/api/public_plus_experimental_current.txt
rename to car/app/app-automotive/api/public_plus_experimental_current.txt
diff --git a/car/app/app-activity/api/res-current.txt b/car/app/app-automotive/api/res-current.txt
similarity index 100%
rename from car/app/app-activity/api/res-current.txt
rename to car/app/app-automotive/api/res-current.txt
diff --git a/car/app/app-activity/api/restricted_current.txt b/car/app/app-automotive/api/restricted_current.txt
similarity index 100%
rename from car/app/app-activity/api/restricted_current.txt
rename to car/app/app-automotive/api/restricted_current.txt
diff --git a/car/app/app-activity/build.gradle b/car/app/app-automotive/build.gradle
similarity index 90%
rename from car/app/app-activity/build.gradle
rename to car/app/app-automotive/build.gradle
index c1b1ed2..d5aa3c0 100644
--- a/car/app/app-activity/build.gradle
+++ b/car/app/app-automotive/build.gradle
@@ -55,9 +55,9 @@
}
androidx {
- name = "Android for Cars App Library Activity Extension"
+ name = "Android for Cars App Library Automotive Extension"
type = LibraryType.PUBLISHED_LIBRARY
mavenGroup = LibraryGroups.CAR_APP
inceptionYear = "2021"
- description = "Activity rendering specific funationaltiy to build navigation, parking, and charging apps for cars"
+ description = "Automotive OS specific funationaltiy to build navigation, parking, and charging apps for cars"
}
diff --git a/car/app/app-activity/src/androidTest/AndroidManifest.xml b/car/app/app-automotive/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from car/app/app-activity/src/androidTest/AndroidManifest.xml
rename to car/app/app-automotive/src/androidTest/AndroidManifest.xml
diff --git a/car/app/app-activity/src/main/AndroidManifest.xml b/car/app/app-automotive/src/main/AndroidManifest.xml
similarity index 93%
rename from car/app/app-activity/src/main/AndroidManifest.xml
rename to car/app/app-automotive/src/main/AndroidManifest.xml
index ddef73e..3a91379 100644
--- a/car/app/app-activity/src/main/AndroidManifest.xml
+++ b/car/app/app-automotive/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.car.app.activity"
+ package="androidx.car.app"
android:versionCode="1"
android:versionName="0.1">
<queries>
@@ -30,7 +30,7 @@
-->
<application>
<activity
- android:name=".CarAppActivity"
+ android:name=".activity.CarAppActivity"
android:theme="@android:style/Theme.NoTitleBar"
android:exported="false"
android:windowSoftInputMode="adjustResize">
diff --git a/car/app/app-activity/src/main/aidl/androidx/car/app/activity/renderer/ICarAppActivity.aidl b/car/app/app-automotive/src/main/aidl/androidx/car/app/activity/renderer/ICarAppActivity.aidl
similarity index 100%
rename from car/app/app-activity/src/main/aidl/androidx/car/app/activity/renderer/ICarAppActivity.aidl
rename to car/app/app-automotive/src/main/aidl/androidx/car/app/activity/renderer/ICarAppActivity.aidl
diff --git a/car/app/app-activity/src/main/aidl/androidx/car/app/activity/renderer/IProxyInputConnection.aidl b/car/app/app-automotive/src/main/aidl/androidx/car/app/activity/renderer/IProxyInputConnection.aidl
similarity index 100%
rename from car/app/app-activity/src/main/aidl/androidx/car/app/activity/renderer/IProxyInputConnection.aidl
rename to car/app/app-automotive/src/main/aidl/androidx/car/app/activity/renderer/IProxyInputConnection.aidl
diff --git a/car/app/app-activity/src/main/aidl/androidx/car/app/activity/renderer/IRendererCallback.aidl b/car/app/app-automotive/src/main/aidl/androidx/car/app/activity/renderer/IRendererCallback.aidl
similarity index 100%
rename from car/app/app-activity/src/main/aidl/androidx/car/app/activity/renderer/IRendererCallback.aidl
rename to car/app/app-automotive/src/main/aidl/androidx/car/app/activity/renderer/IRendererCallback.aidl
diff --git a/car/app/app-activity/src/main/aidl/androidx/car/app/activity/renderer/IRendererService.aidl b/car/app/app-automotive/src/main/aidl/androidx/car/app/activity/renderer/IRendererService.aidl
similarity index 100%
rename from car/app/app-activity/src/main/aidl/androidx/car/app/activity/renderer/IRendererService.aidl
rename to car/app/app-automotive/src/main/aidl/androidx/car/app/activity/renderer/IRendererService.aidl
diff --git a/car/app/app-activity/src/main/aidl/androidx/car/app/activity/renderer/surface/ISurfaceControl.aidl b/car/app/app-automotive/src/main/aidl/androidx/car/app/activity/renderer/surface/ISurfaceControl.aidl
similarity index 100%
rename from car/app/app-activity/src/main/aidl/androidx/car/app/activity/renderer/surface/ISurfaceControl.aidl
rename to car/app/app-automotive/src/main/aidl/androidx/car/app/activity/renderer/surface/ISurfaceControl.aidl
diff --git a/car/app/app-activity/src/main/aidl/androidx/car/app/activity/renderer/surface/ISurfaceListener.aidl b/car/app/app-automotive/src/main/aidl/androidx/car/app/activity/renderer/surface/ISurfaceListener.aidl
similarity index 100%
rename from car/app/app-activity/src/main/aidl/androidx/car/app/activity/renderer/surface/ISurfaceListener.aidl
rename to car/app/app-automotive/src/main/aidl/androidx/car/app/activity/renderer/surface/ISurfaceListener.aidl
diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/ActivityLifecycleDelegate.java b/car/app/app-automotive/src/main/java/androidx/car/app/activity/ActivityLifecycleDelegate.java
similarity index 100%
rename from car/app/app-activity/src/main/java/androidx/car/app/activity/ActivityLifecycleDelegate.java
rename to car/app/app-automotive/src/main/java/androidx/car/app/activity/ActivityLifecycleDelegate.java
diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/CarAppActivity.java b/car/app/app-automotive/src/main/java/androidx/car/app/activity/CarAppActivity.java
similarity index 99%
rename from car/app/app-activity/src/main/java/androidx/car/app/activity/CarAppActivity.java
rename to car/app/app-automotive/src/main/java/androidx/car/app/activity/CarAppActivity.java
index f6a961e..3171fb1 100644
--- a/car/app/app-activity/src/main/java/androidx/car/app/activity/CarAppActivity.java
+++ b/car/app/app-automotive/src/main/java/androidx/car/app/activity/CarAppActivity.java
@@ -32,6 +32,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
+import androidx.car.app.R;
import androidx.car.app.activity.renderer.ICarAppActivity;
import androidx.car.app.activity.renderer.IRendererCallback;
import androidx.car.app.activity.renderer.IRendererService;
diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/CarAppViewModel.java b/car/app/app-automotive/src/main/java/androidx/car/app/activity/CarAppViewModel.java
similarity index 100%
rename from car/app/app-activity/src/main/java/androidx/car/app/activity/CarAppViewModel.java
rename to car/app/app-automotive/src/main/java/androidx/car/app/activity/CarAppViewModel.java
diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/CarAppViewModelFactory.java b/car/app/app-automotive/src/main/java/androidx/car/app/activity/CarAppViewModelFactory.java
similarity index 100%
rename from car/app/app-activity/src/main/java/androidx/car/app/activity/CarAppViewModelFactory.java
rename to car/app/app-automotive/src/main/java/androidx/car/app/activity/CarAppViewModelFactory.java
diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/ErrorHandler.java b/car/app/app-automotive/src/main/java/androidx/car/app/activity/ErrorHandler.java
similarity index 98%
rename from car/app/app-activity/src/main/java/androidx/car/app/activity/ErrorHandler.java
rename to car/app/app-automotive/src/main/java/androidx/car/app/activity/ErrorHandler.java
index 3d9f610..9fa3081 100644
--- a/car/app/app-activity/src/main/java/androidx/car/app/activity/ErrorHandler.java
+++ b/car/app/app-automotive/src/main/java/androidx/car/app/activity/ErrorHandler.java
@@ -21,6 +21,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.RestrictTo;
import androidx.annotation.StringRes;
+import androidx.car.app.R;
/**
* Error handling abstraction
diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/ErrorMessageFragment.java b/car/app/app-automotive/src/main/java/androidx/car/app/activity/ErrorMessageFragment.java
similarity index 99%
rename from car/app/app-activity/src/main/java/androidx/car/app/activity/ErrorMessageFragment.java
rename to car/app/app-automotive/src/main/java/androidx/car/app/activity/ErrorMessageFragment.java
index 6619209..c66cc1a 100644
--- a/car/app/app-activity/src/main/java/androidx/car/app/activity/ErrorMessageFragment.java
+++ b/car/app/app-automotive/src/main/java/androidx/car/app/activity/ErrorMessageFragment.java
@@ -33,6 +33,7 @@
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;
import androidx.annotation.VisibleForTesting;
+import androidx.car.app.R;
import androidx.fragment.app.Fragment;
import java.util.List;
diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/LogTags.java b/car/app/app-automotive/src/main/java/androidx/car/app/activity/LogTags.java
similarity index 100%
rename from car/app/app-activity/src/main/java/androidx/car/app/activity/LogTags.java
rename to car/app/app-automotive/src/main/java/androidx/car/app/activity/LogTags.java
diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/ServiceConnectionManager.java b/car/app/app-automotive/src/main/java/androidx/car/app/activity/ServiceConnectionManager.java
similarity index 100%
rename from car/app/app-activity/src/main/java/androidx/car/app/activity/ServiceConnectionManager.java
rename to car/app/app-automotive/src/main/java/androidx/car/app/activity/ServiceConnectionManager.java
diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/ServiceDispatcher.java b/car/app/app-automotive/src/main/java/androidx/car/app/activity/ServiceDispatcher.java
similarity index 100%
rename from car/app/app-activity/src/main/java/androidx/car/app/activity/ServiceDispatcher.java
rename to car/app/app-automotive/src/main/java/androidx/car/app/activity/ServiceDispatcher.java
diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/LegacySurfacePackage.java b/car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/LegacySurfacePackage.java
similarity index 100%
rename from car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/LegacySurfacePackage.java
rename to car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/LegacySurfacePackage.java
diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/OnBackPressedListener.java b/car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/OnBackPressedListener.java
similarity index 100%
rename from car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/OnBackPressedListener.java
rename to car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/OnBackPressedListener.java
diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/OnCreateInputConnectionListener.java b/car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/OnCreateInputConnectionListener.java
similarity index 100%
rename from car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/OnCreateInputConnectionListener.java
rename to car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/OnCreateInputConnectionListener.java
diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/RemoteProxyInputConnection.java b/car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/RemoteProxyInputConnection.java
similarity index 100%
rename from car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/RemoteProxyInputConnection.java
rename to car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/RemoteProxyInputConnection.java
diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/SurfaceControlCallback.java b/car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/SurfaceControlCallback.java
similarity index 100%
rename from car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/SurfaceControlCallback.java
rename to car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/SurfaceControlCallback.java
diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/SurfaceHolderListener.java b/car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/SurfaceHolderListener.java
similarity index 100%
rename from car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/SurfaceHolderListener.java
rename to car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/SurfaceHolderListener.java
diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/SurfaceWrapper.java b/car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/SurfaceWrapper.java
similarity index 100%
rename from car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/SurfaceWrapper.java
rename to car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/SurfaceWrapper.java
diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/SurfaceWrapperProvider.java b/car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/SurfaceWrapperProvider.java
similarity index 100%
rename from car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/SurfaceWrapperProvider.java
rename to car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/SurfaceWrapperProvider.java
diff --git a/car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/TemplateSurfaceView.java b/car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/TemplateSurfaceView.java
similarity index 100%
rename from car/app/app-activity/src/main/java/androidx/car/app/activity/renderer/surface/TemplateSurfaceView.java
rename to car/app/app-automotive/src/main/java/androidx/car/app/activity/renderer/surface/TemplateSurfaceView.java
diff --git a/car/app/app-activity/src/main/res/drawable/car_app_bug_report_icon.xml b/car/app/app-automotive/src/main/res/drawable/car_app_bug_report_icon.xml
similarity index 100%
rename from car/app/app-activity/src/main/res/drawable/car_app_bug_report_icon.xml
rename to car/app/app-automotive/src/main/res/drawable/car_app_bug_report_icon.xml
diff --git a/car/app/app-activity/src/main/res/drawable/car_app_icon_error.xml b/car/app/app-automotive/src/main/res/drawable/car_app_icon_error.xml
similarity index 100%
rename from car/app/app-activity/src/main/res/drawable/car_app_icon_error.xml
rename to car/app/app-automotive/src/main/res/drawable/car_app_icon_error.xml
diff --git a/car/app/app-activity/src/main/res/drawable/car_app_no_content_view_focus_ring.xml b/car/app/app-automotive/src/main/res/drawable/car_app_no_content_view_focus_ring.xml
similarity index 100%
rename from car/app/app-activity/src/main/res/drawable/car_app_no_content_view_focus_ring.xml
rename to car/app/app-automotive/src/main/res/drawable/car_app_no_content_view_focus_ring.xml
diff --git a/car/app/app-activity/src/main/res/drawable/car_app_rounded_corner.xml b/car/app/app-automotive/src/main/res/drawable/car_app_rounded_corner.xml
similarity index 100%
rename from car/app/app-activity/src/main/res/drawable/car_app_rounded_corner.xml
rename to car/app/app-automotive/src/main/res/drawable/car_app_rounded_corner.xml
diff --git a/car/app/app-activity/src/main/res/layout/activity_template.xml b/car/app/app-automotive/src/main/res/layout/activity_template.xml
similarity index 100%
rename from car/app/app-activity/src/main/res/layout/activity_template.xml
rename to car/app/app-automotive/src/main/res/layout/activity_template.xml
diff --git a/car/app/app-activity/src/main/res/layout/error_message_fragment.xml b/car/app/app-automotive/src/main/res/layout/error_message_fragment.xml
similarity index 100%
rename from car/app/app-activity/src/main/res/layout/error_message_fragment.xml
rename to car/app/app-automotive/src/main/res/layout/error_message_fragment.xml
diff --git a/car/app/app-activity/src/main/res/values/colors.xml b/car/app/app-automotive/src/main/res/values/colors.xml
similarity index 100%
rename from car/app/app-activity/src/main/res/values/colors.xml
rename to car/app/app-automotive/src/main/res/values/colors.xml
diff --git a/car/app/app-activity/src/main/res/values/dimens.xml b/car/app/app-automotive/src/main/res/values/dimens.xml
similarity index 100%
rename from car/app/app-activity/src/main/res/values/dimens.xml
rename to car/app/app-automotive/src/main/res/values/dimens.xml
diff --git a/car/app/app-activity/src/main/res/values/strings.xml b/car/app/app-automotive/src/main/res/values/strings.xml
similarity index 100%
rename from car/app/app-activity/src/main/res/values/strings.xml
rename to car/app/app-automotive/src/main/res/values/strings.xml
diff --git a/car/app/app-property/src/main/AndroidManifest.xml b/car/app/app-automotive/src/test/AndroidManifest.xml
similarity index 94%
copy from car/app/app-property/src/main/AndroidManifest.xml
copy to car/app/app-automotive/src/test/AndroidManifest.xml
index c920c0a..d66221d 100644
--- a/car/app/app-property/src/main/AndroidManifest.xml
+++ b/car/app/app-automotive/src/test/AndroidManifest.xml
@@ -15,6 +15,5 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.car.app.property">
-
-</manifest>
\ No newline at end of file
+ package="androidx.car.app">
+</manifest>
diff --git a/car/app/app-activity/src/test/java/androidx/car/app/activity/CarAppActivityTest.java b/car/app/app-automotive/src/test/java/androidx/car/app/activity/CarAppActivityTest.java
similarity index 100%
rename from car/app/app-activity/src/test/java/androidx/car/app/activity/CarAppActivityTest.java
rename to car/app/app-automotive/src/test/java/androidx/car/app/activity/CarAppActivityTest.java
diff --git a/car/app/app-activity/src/test/java/androidx/car/app/activity/CarAppViewModelFactoryTest.java b/car/app/app-automotive/src/test/java/androidx/car/app/activity/CarAppViewModelFactoryTest.java
similarity index 100%
rename from car/app/app-activity/src/test/java/androidx/car/app/activity/CarAppViewModelFactoryTest.java
rename to car/app/app-automotive/src/test/java/androidx/car/app/activity/CarAppViewModelFactoryTest.java
diff --git a/car/app/app-activity/src/test/java/androidx/car/app/activity/CarAppViewModelTest.java b/car/app/app-automotive/src/test/java/androidx/car/app/activity/CarAppViewModelTest.java
similarity index 100%
rename from car/app/app-activity/src/test/java/androidx/car/app/activity/CarAppViewModelTest.java
rename to car/app/app-automotive/src/test/java/androidx/car/app/activity/CarAppViewModelTest.java
diff --git a/car/app/app-activity/src/test/java/androidx/car/app/activity/ServiceConnectionManagerTest.java b/car/app/app-automotive/src/test/java/androidx/car/app/activity/ServiceConnectionManagerTest.java
similarity index 100%
rename from car/app/app-activity/src/test/java/androidx/car/app/activity/ServiceConnectionManagerTest.java
rename to car/app/app-automotive/src/test/java/androidx/car/app/activity/ServiceConnectionManagerTest.java
diff --git a/car/app/app-activity/src/test/java/androidx/car/app/activity/ServiceDispatcherTest.java b/car/app/app-automotive/src/test/java/androidx/car/app/activity/ServiceDispatcherTest.java
similarity index 100%
rename from car/app/app-activity/src/test/java/androidx/car/app/activity/ServiceDispatcherTest.java
rename to car/app/app-automotive/src/test/java/androidx/car/app/activity/ServiceDispatcherTest.java
diff --git a/car/app/app-activity/src/test/resources/robolectric.properties b/car/app/app-automotive/src/test/resources/robolectric.properties
similarity index 100%
rename from car/app/app-activity/src/test/resources/robolectric.properties
rename to car/app/app-automotive/src/test/resources/robolectric.properties
diff --git a/car/app/app-property/api/current.txt b/car/app/app-projected/api/current.txt
similarity index 100%
rename from car/app/app-property/api/current.txt
rename to car/app/app-projected/api/current.txt
diff --git a/car/app/app-property/api/public_plus_experimental_current.txt b/car/app/app-projected/api/public_plus_experimental_current.txt
similarity index 100%
rename from car/app/app-property/api/public_plus_experimental_current.txt
rename to car/app/app-projected/api/public_plus_experimental_current.txt
diff --git a/car/app/app-property/api/res-current.txt b/car/app/app-projected/api/res-current.txt
similarity index 100%
rename from car/app/app-property/api/res-current.txt
rename to car/app/app-projected/api/res-current.txt
diff --git a/car/app/app-property/api/restricted_current.txt b/car/app/app-projected/api/restricted_current.txt
similarity index 100%
rename from car/app/app-property/api/restricted_current.txt
rename to car/app/app-projected/api/restricted_current.txt
diff --git a/car/app/app-property/build.gradle b/car/app/app-projected/build.gradle
similarity index 86%
rename from car/app/app-property/build.gradle
rename to car/app/app-projected/build.gradle
index 07349b8..e034dce6 100644
--- a/car/app/app-property/build.gradle
+++ b/car/app/app-projected/build.gradle
@@ -31,9 +31,9 @@
}
androidx {
- name = "androidx.car.app:app-property"
+ name = "Android for Cars App Library Projected Extension"
type = LibraryType.PUBLISHED_LIBRARY
mavenGroup = LibraryGroups.CAR_APP
inceptionYear = "2021"
- description = "Access car properties such as energy levels and speed"
+ description = "Android Auto Projected specific funationaltiy to build navigation, parking, and charging apps for cars"
}
diff --git a/car/app/app-property/src/main/AndroidManifest.xml b/car/app/app-projected/src/androidTest/AndroidManifest.xml
similarity index 94%
rename from car/app/app-property/src/main/AndroidManifest.xml
rename to car/app/app-projected/src/androidTest/AndroidManifest.xml
index c920c0a..67a2102 100644
--- a/car/app/app-property/src/main/AndroidManifest.xml
+++ b/car/app/app-projected/src/androidTest/AndroidManifest.xml
@@ -15,6 +15,6 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.car.app.property">
+ package="androidx.car.app">
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/car/app/app-property/src/main/AndroidManifest.xml b/car/app/app-projected/src/main/AndroidManifest.xml
similarity index 94%
copy from car/app/app-property/src/main/AndroidManifest.xml
copy to car/app/app-projected/src/main/AndroidManifest.xml
index c920c0a..9dcedf7 100644
--- a/car/app/app-property/src/main/AndroidManifest.xml
+++ b/car/app/app-projected/src/main/AndroidManifest.xml
@@ -15,6 +15,6 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.car.app.property">
+ package="androidx.car.app">
</manifest>
\ No newline at end of file
diff --git a/car/app/app-property/src/main/java/androidx/car/app/property/package-info.java b/car/app/app-projected/src/main/java/androidx/car/app/property/package-info.java
similarity index 100%
rename from car/app/app-property/src/main/java/androidx/car/app/property/package-info.java
rename to car/app/app-projected/src/main/java/androidx/car/app/property/package-info.java
diff --git a/car/app/app-property/src/androidTest/AndroidManifest.xml b/car/app/app-property/src/androidTest/AndroidManifest.xml
deleted file mode 100644
index 75d3534..0000000
--- a/car/app/app-property/src/androidTest/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 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.
- -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.car.app.property.test">
-
-</manifest>
diff --git a/car/app/app-samples/helloworld/automotive/build.gradle b/car/app/app-samples/helloworld/automotive/build.gradle
index bdea0208..57c5447 100644
--- a/car/app/app-samples/helloworld/automotive/build.gradle
+++ b/car/app/app-samples/helloworld/automotive/build.gradle
@@ -40,5 +40,5 @@
dependencies {
implementation(project(":car:app:app-samples:helloworld-common"))
- implementation(project(":car:app:app-activity"))
+ implementation(project(":car:app:app-automotive"))
}
diff --git a/car/app/app-samples/navigation/automotive/build.gradle b/car/app/app-samples/navigation/automotive/build.gradle
index c78328d..523c000 100644
--- a/car/app/app-samples/navigation/automotive/build.gradle
+++ b/car/app/app-samples/navigation/automotive/build.gradle
@@ -40,5 +40,5 @@
dependencies {
implementation(project(":car:app:app-samples:navigation-common"))
- implementation(project(":car:app:app-activity"))
+ implementation(project(":car:app:app-automotive"))
}
diff --git a/car/app/app-samples/places/automotive/build.gradle b/car/app/app-samples/places/automotive/build.gradle
index 170b871d..9e60909 100644
--- a/car/app/app-samples/places/automotive/build.gradle
+++ b/car/app/app-samples/places/automotive/build.gradle
@@ -40,5 +40,5 @@
dependencies {
implementation(project(":car:app:app-samples:places-common"))
- implementation(project(":car:app:app-activity"))
+ implementation(project(":car:app:app-automotive"))
}
diff --git a/car/app/app-samples/showcase/automotive/build.gradle b/car/app/app-samples/showcase/automotive/build.gradle
index 241604f6..851984a 100644
--- a/car/app/app-samples/showcase/automotive/build.gradle
+++ b/car/app/app-samples/showcase/automotive/build.gradle
@@ -40,5 +40,5 @@
dependencies {
implementation(project(":car:app:app-samples:showcase-common"))
- implementation(project(":car:app:app-activity"))
+ implementation(project(":car:app:app-automotive"))
}
diff --git a/development/build_log_simplifier/messages.ignore b/development/build_log_simplifier/messages.ignore
index 50c675c..d7addf0 100644
--- a/development/build_log_simplifier/messages.ignore
+++ b/development/build_log_simplifier/messages.ignore
@@ -1059,3 +1059,8 @@
# > Task :compose:material:material:reportLibraryMetrics
java\.lang\.Object androidx\.compose\.material\.SnackbarHostState\.showSnackbar\(java\.lang\.String, java\.lang\.String, androidx\.compose\.material\.SnackbarDuration, kotlin\.coroutines\.Continuation\)
java\.lang\.Object androidx\.compose\.material\.SwipeableState\.processNewAnchors\$material_release\(java\.util\.Map, java\.util\.Map, kotlin\.coroutines\.Continuation\)
+# > Task :car:app:app-samples:helloworld-automotive:processReleaseMainManifest
+\[:car:app:app\-automotive\] \$OUT_DIR/androidx/car/app/app\-automotive/build/intermediates/merged_manifest/release/AndroidManifest\.xml Warning:
+Package name 'androidx\.car\.app' used in: :car:app:app\-automotive, :car:app:app\.
+# > Task :car:app:app-automotive:processDebugUnitTestManifest
+\[:car:app:app\-automotive\] \$OUT_DIR/androidx/car/app/app\-automotive/build/intermediates/merged_manifest/debug/AndroidManifest\.xml Warning:
diff --git a/docs-tip-of-tree/build.gradle b/docs-tip-of-tree/build.gradle
index 21ac59b..6300ef3 100644
--- a/docs-tip-of-tree/build.gradle
+++ b/docs-tip-of-tree/build.gradle
@@ -40,8 +40,8 @@
docs(project(":camera:camera-video"))
docs(project(":camera:camera-view"))
docs(project(":car:app:app"))
- docs(project(":car:app:app-activity"))
- docs(project(":car:app:app-property"))
+ docs(project(":car:app:app-automotive"))
+ docs(project(":car:app:app-projected"))
docs(project(":car:app:app-testing"))
docs(project(":cardview:cardview"))
docs(project(":collection:collection"))
diff --git a/settings.gradle b/settings.gradle
index 9c31229..aa48bce 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -218,8 +218,8 @@
includeProject(":camera:integration-tests:camera-testapp-view", "camera/integration-tests/viewtestapp", [BuildType.MAIN])
includeProject(":camera:integration-tests:camera-testlib-extensions", "camera/integration-tests/extensionstestlib", [BuildType.MAIN])
includeProject(":car:app:app", "car/app/app", [BuildType.MAIN])
-includeProject(":car:app:app-activity", "car/app/app-activity", [BuildType.MAIN])
-includeProject(":car:app:app-property", "car/app/app-property", [BuildType.MAIN])
+includeProject(":car:app:app-automotive", "car/app/app-automotive", [BuildType.MAIN])
+includeProject(":car:app:app-projected", "car/app/app-projected", [BuildType.MAIN])
includeProject(":car:app:app-samples:helloworld-automotive", "car/app/app-samples/helloworld/automotive", [BuildType.MAIN])
includeProject(":car:app:app-samples:helloworld-common", "car/app/app-samples/helloworld/common", [BuildType.MAIN])
includeProject(":car:app:app-samples:helloworld-mobile", "car/app/app-samples/helloworld/mobile", [BuildType.MAIN])
