Merge "Removing remaining references of ActivityView in packages/services/Car" into sc-dev
diff --git a/tests/CarCtsFakeLauncher/src/com/android/car/fakelauncher/LauncherActivity.java b/tests/CarCtsFakeLauncher/src/com/android/car/fakelauncher/LauncherActivity.java
index 42d802a..0e73284 100644
--- a/tests/CarCtsFakeLauncher/src/com/android/car/fakelauncher/LauncherActivity.java
+++ b/tests/CarCtsFakeLauncher/src/com/android/car/fakelauncher/LauncherActivity.java
@@ -28,7 +28,7 @@
/**
* A placeholder launcher for CTS.
*
- * Current CarLauncher invokes Maps Activity in its ActivityView and it creates unexpected events
+ * Current CarLauncher invokes Maps Activity in its TaskView and it creates unexpected events
* for CTS and they make CTS fail.
*/
public class LauncherActivity extends Activity {
diff --git a/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml b/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml
index a16af8a..af573f7 100644
--- a/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml
+++ b/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml
@@ -194,8 +194,6 @@
</intent-filter>
</activity>
- <activity android:name=".activityview.ActivityViewTestFragment"/>
-
<service android:name=".vendorservice.LogLifecycleService"
android:exported="false"
android:directBootAware="true">
diff --git a/tests/EmbeddedKitchenSinkApp/res/layout/activity_view_test_fragment.xml b/tests/EmbeddedKitchenSinkApp/res/layout/activity_view_test_fragment.xml
deleted file mode 100644
index 568bad5..0000000
--- a/tests/EmbeddedKitchenSinkApp/res/layout/activity_view_test_fragment.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <LinearLayout android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
- <Button android:id="@+id/av_launch_activity"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/av_start_activity"/>
- <Button android:id="@+id/av_resize"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/av_resize"/>
- </LinearLayout>
- <RelativeLayout android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="20dp">
- <android.car.app.CarActivityView android:id="@+id/av_activityview"
- android:layout_width="match_parent"
- android:layout_height="match_parent"/>
- </RelativeLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/tests/carservice_test/AndroidManifest.xml b/tests/carservice_test/AndroidManifest.xml
index 7133831..7bf749e 100644
--- a/tests/carservice_test/AndroidManifest.xml
+++ b/tests/carservice_test/AndroidManifest.xml
@@ -51,7 +51,6 @@
</intent-filter>
</service>
- <activity android:name="com.android.car.CarUxRestrictionsManagerServiceTest$ActivityViewTestActivity"/>
<activity android:name="com.android.car.pm.ActivityBlockingActivityTest$NonDoNoHistoryActivity"
android:noHistory="true"/>
<activity android:name="com.android.car.pm.ActivityBlockingActivityTest$NonDoActivity"/>