Skip to content

Commit 84ab1a6

Browse files
Treehugger RobotGerrit Code Review
authored andcommitted
Merge "Remove "Android Auto" mentions in sample apps' javadocs" into androidx-main
2 parents 672c528 + 42e43c5 commit 84ab1a6

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

car/app/app-samples/helloworld/common/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldScreen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/**
2828
* A screen that shows a simple "Hello World!" message.
2929
*
30-
* <p>See {@link HelloWorldService} for the app's entry point to Android Auto.
30+
* <p>See {@link HelloWorldService} for the app's entry point to the car host.
3131
*/
3232
public class HelloWorldScreen extends Screen {
3333
public HelloWorldScreen(@NonNull CarContext carContext) {

car/app/app-samples/helloworld/common/src/main/java/androidx/car/app/sample/helloworld/common/HelloWorldService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
/**
2929
* Entry point for the hello world app.
3030
*
31-
* <p>{@link CarAppService} is the main interface between the app and Android Auto. For more
31+
* <p>{@link CarAppService} is the main interface between the app and the car host. For more
3232
* details, see the <a href="https://developer.android.com/training/cars/navigation">Android for
3333
* Cars Library developer guide</a>.
3434
*/

car/app/app-samples/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/app/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* The main app activity.
3939
*
4040
* <p>See {@link androidx.car.app.sample.navigation.common.car.NavigationCarAppService} for the
41-
* app's entry point to Android Auto.
41+
* app's entry point to the cat host.
4242
*/
4343
public class MainActivity extends ComponentActivity {
4444
static final String TAG = MainActivity.class.getSimpleName();

car/app/app-samples/navigation/common/src/main/java/androidx/car/app/sample/navigation/common/car/NavigationCarAppService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
/**
3636
* Entry point for the templated app.
3737
*
38-
* <p>{@link CarAppService} is the main interface between the app and Android Auto. For more
38+
* <p>{@link CarAppService} is the main interface between the app and the car host. For more
3939
* details, see the <a href="https://developer.android.com/training/cars/navigation">Android for
4040
* Cars Library developer guide</a>.
4141
*/

car/app/app-samples/places/common/src/main/java/androidx/car/app/sample/places/common/PlacesCarAppService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
/**
2929
* Entry point for the app.
3030
*
31-
* <p>{@link CarAppService} is the main interface between the app and Android Auto. For more
31+
* <p>{@link CarAppService} is the main interface between the app and the car host. For more
3232
* details, see the <a href="https://developer.android.com/training/cars/navigation">Android for
3333
* Cars Library developer guide</a>.
3434
*/

car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/ShowcaseService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/**
2828
* Entry point for the showcase app.
2929
*
30-
* <p>{@link CarAppService} is the main interface between the app and Android Auto. For more
30+
* <p>{@link CarAppService} is the main interface between the app and the car host. For more
3131
* details, see the <a href="https://developer.android.com/training/cars/navigation">Android for
3232
* Cars Library developer guide</a>.
3333
*/

car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/textandicons/DelayedFileProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static Uri getUriForResource(@NonNull Context context, int resId) {
6161
}
6262
Uri uri = getUriForFile(context, FILE_PROVIDER_AUTHORITY, resourceFile);
6363

64-
// FileProvider requires the app to grant temporary access to Android Auto for the file.
64+
// FileProvider requires the app to grant temporary access to the car hosts for the file.
6565
// A URI from a content provider may not need to do this if its contents are public.
6666
context.grantUriPermission(ANDROID_AUTO_PACKAGE_NAME, uri,
6767
Intent.FLAG_GRANT_READ_URI_PERMISSION);

0 commit comments

Comments
 (0)