Merge "Remove "Android Auto" mentions in sample apps' javadocs" into …

…androidx-main
ggfan · Jun 9, 2021 · 84ab1a6 · 84ab1a6
2 parents 672c528 + 42e43c5
commit 84ab1a6
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/...orld/common/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldScreen.java b/...orld/common/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldScreen.java
@@ -27,7 +27,7 @@
 /**
  * A screen that shows a simple "Hello World!" message.
  *
- * <p>See {@link HelloWorldService} for the app's entry point to Android Auto.
+ * <p>See {@link HelloWorldService} for the app's entry point to the car host.
  */
 public class HelloWorldScreen extends Screen {
     public HelloWorldScreen(@NonNull CarContext carContext) {

diff --git a/...rld/common/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldService.java b/...rld/common/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldService.java
@@ -28,7 +28,7 @@
 /**
  * Entry point for the hello world app.
  *
- * <p>{@link CarAppService} is the main interface between the app and Android Auto. For more
+ * <p>{@link CarAppService} is the main interface between the app and the car host. For more
  * details, see the <a href="https://developer.android.com/training/cars/navigation">Android for
  * Cars Library developer guide</a>.
  */

diff --git a/...tion/common/src/main/java/androidx/car/app/sample/navigation/common/app/MainActivity.java b/...tion/common/src/main/java/androidx/car/app/sample/navigation/common/app/MainActivity.java
@@ -38,7 +38,7 @@
  * The main app activity.
  *
  * <p>See {@link androidx.car.app.sample.navigation.common.car.NavigationCarAppService} for the
- * app's entry point to Android Auto.
+ * app's entry point to the cat host.
  */
 public class MainActivity extends ComponentActivity {
     static final String TAG = MainActivity.class.getSimpleName();

diff --git a/.../src/main/java/androidx/car/app/sample/navigation/common/car/NavigationCarAppService.java b/.../src/main/java/androidx/car/app/sample/navigation/common/car/NavigationCarAppService.java
@@ -35,7 +35,7 @@
 /**
  * Entry point for the templated app.
  *
- * <p>{@link CarAppService} is the main interface between the app and Android Auto. For more
+ * <p>{@link CarAppService} is the main interface between the app and the car host. For more
  * details, see the <a href="https://developer.android.com/training/cars/navigation">Android for
  * Cars Library developer guide</a>.
  */

diff --git a/...laces/common/src/main/java/androidx/car/app/sample/places/common/PlacesCarAppService.java b/...laces/common/src/main/java/androidx/car/app/sample/places/common/PlacesCarAppService.java
@@ -28,7 +28,7 @@
 /**
  * Entry point for the app.
  *
- * <p>{@link CarAppService} is the main interface between the app and Android Auto. For more
+ * <p>{@link CarAppService} is the main interface between the app and the car host. For more
  * details, see the <a href="https://developer.android.com/training/cars/navigation">Android for
  * Cars Library developer guide</a>.
  */

diff --git a/...howcase/common/src/main/java/androidx/car/app/sample/showcase/common/ShowcaseService.java b/...howcase/common/src/main/java/androidx/car/app/sample/showcase/common/ShowcaseService.java
@@ -27,7 +27,7 @@
 /**
  * Entry point for the showcase app.
  *
- * <p>{@link CarAppService} is the main interface between the app and Android Auto. For more
+ * <p>{@link CarAppService} is the main interface between the app and the car host. For more
  * details, see the <a href="https://developer.android.com/training/cars/navigation">Android for
  * Cars Library developer guide</a>.
  */

diff --git a/...c/main/java/androidx/car/app/sample/showcase/common/textandicons/DelayedFileProvider.java b/...c/main/java/androidx/car/app/sample/showcase/common/textandicons/DelayedFileProvider.java
@@ -61,7 +61,7 @@ public static Uri getUriForResource(@NonNull Context context, int resId) {
         }
         Uri uri = getUriForFile(context, FILE_PROVIDER_AUTHORITY, resourceFile);
 
-        // FileProvider requires the app to grant temporary access to Android Auto for the file.
+        // FileProvider requires the app to grant temporary access to the car hosts for the file.
         // A URI from a content provider may not need to do this if its contents are public.
         context.grantUriPermission(ANDROID_AUTO_PACKAGE_NAME, uri,
                 Intent.FLAG_GRANT_READ_URI_PERMISSION);