Correct CompositeCircleView classes
Fixes: 228137444
Test: atest PermissionHistoryTest
Change-Id: I9298d8436ce314ac77ae7048fcc00348f09ee90d
diff --git a/PermissionController/res/layout/image_view.xml b/PermissionController/res/layout/image_view.xml
index debca25..7c30eb2 100644
--- a/PermissionController/res/layout/image_view.xml
+++ b/PermissionController/res/layout/image_view.xml
@@ -19,7 +19,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/ImageView">
- <com.android.permissioncontroller.permission.ui.handheld.dashboard.PreferenceImageView
+ <com.android.permissioncontroller.permission.ui.handheld.v31.PreferenceImageView
android:id="@+id/icon"
style="@style/ImageViewIcon" />
diff --git a/PermissionController/res/layout/permission_usage_graphic.xml b/PermissionController/res/layout/permission_usage_graphic.xml
index c5922e1..4818d0e 100644
--- a/PermissionController/res/layout/permission_usage_graphic.xml
+++ b/PermissionController/res/layout/permission_usage_graphic.xml
@@ -21,16 +21,16 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <com.android.permissioncontroller.permission.ui.handheld.dashboard.CompositeCircleViewLabeler
+ <com.android.permissioncontroller.permission.ui.handheld.v31.CompositeCircleViewLabeler
android:id="@+id/composite_circle_view_labeler"
android:layout_height="260dp"
android:layout_width="match_parent">
- <com.android.permissioncontroller.permission.ui.handheld.dashboard.CompositeCircleView
+ <com.android.permissioncontroller.permission.ui.handheld.v31.CompositeCircleView
android:id="@+id/composite_circle_view"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_marginHorizontal="30dp"
android:layout_marginVertical="40dp"/>
- </com.android.permissioncontroller.permission.ui.handheld.dashboard.CompositeCircleViewLabeler>
+ </com.android.permissioncontroller.permission.ui.handheld.v31.CompositeCircleViewLabeler>
</LinearLayout>
diff --git a/PermissionController/res/layout/title_summary_image_view.xml b/PermissionController/res/layout/title_summary_image_view.xml
index 5612644..8650616 100644
--- a/PermissionController/res/layout/title_summary_image_view.xml
+++ b/PermissionController/res/layout/title_summary_image_view.xml
@@ -20,7 +20,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content">
- <com.android.permissioncontroller.permission.ui.handheld.dashboard.PreferenceImageView
+ <com.android.permissioncontroller.permission.ui.handheld.v31.PreferenceImageView
android:id="@+id/icon"
style="@style/TitleSummaryImageViewIcon" />