remove dependency on car-list

Bug: 109810925

Test: manually
Change-Id: I45891ac2b3e20a8069df0d4511323c992316294c

3 files changed, 60 insertions, 8 deletions

diff --git a/res/drawable/button_ripple_bg.xml b/res/drawable/button_ripple_bg.xml
new file mode 100644
index 00000000..dabacb10
--- /dev/null
+++ b/res/drawable/button_ripple_bg.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2018 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.
+-->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/car_card_ripple_background"
+        android:radius="90dp">
+    <item android:id="@android:id/mask"
+          android:drawable="@drawable/rectangle_ripple_mask" />
+</ripple>
diff --git a/res/drawable/rectangle_ripple_mask.xml b/res/drawable/rectangle_ripple_mask.xml
new file mode 100644
index 00000000..69eaf8bd
--- /dev/null
+++ b/res/drawable/rectangle_ripple_mask.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2018 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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+  <corners android:radius="@dimen/car_radius_1" />
+  <solid android:color="@android:color/white" />
+</shape>
\ No newline at end of file
diff --git a/res/layout/car_app_permissions.xml b/res/layout/car_app_permissions.xml
index b8352640..e052b67a 100644
--- a/res/layout/car_app_permissions.xml
+++ b/res/layout/car_app_permissions.xml
@@ -16,6 +16,7 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -27,22 +28,22 @@
             android:id="@+id/action_bar_icon_container"
             android:layout_width="@dimen/car_margin"
             android:layout_height="@dimen/car_app_bar_height"
-            android:foreground="@drawable/car_list_item_background"
+            android:foreground="@drawable/button_ripple_bg"
             android:layout_alignParentStart="true">
             <ImageView
-                android:tint="@color/car_accent"
+                android:layout_width="@dimen/car_primary_icon_size"
+                android:layout_height="@dimen/car_primary_icon_size"
+                android:tint="@color/car_tint"
+                android:scaleType="fitCenter"
                 android:layout_gravity="center"
-                android:src="@drawable/ic_arrow_back"
-                style="@style/ListIcon"/>
+                android:src="@drawable/ic_arrow_back"/>
         </FrameLayout>
         <TextView
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/car_margin"
-            android:layout_marginTop="@dimen/optical_center_offset"
-            android:textAppearance="@style/TextAppearance.Car.Title"
-            android:textColor="@color/car_accent"
+            android:textAppearance="@style/TextAppearance.Car.Title2"
             android:text="@string/app_permissions"
             android:layout_gravity="center_vertical"
             android:layout_centerVertical="true"
@@ -56,6 +57,12 @@
         android:layout_height="@dimen/car_list_divider_height"
         android:background="@color/car_list_divider"/>
 
-    <include layout="@layout/list" />
+    <androidx.car.widget.PagedListView
+        android:id="@+id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:showPagedListViewDivider="true"
+        app:alignDividerStartTo="@id/container"
+        app:gutter="both"/>
 
 </LinearLayout>