Remove trust agent related resources
Bug: 154357193
Test: build, mp carsysui
Change-Id: Ibbb88d2ddab769d9bd8b838b93f93e4ed3d7c7f1
diff --git a/packages/CarSystemUI/res/drawable/unlock_dialog_background.xml b/packages/CarSystemUI/res/drawable/unlock_dialog_background.xml
deleted file mode 100644
index bec6ba7..0000000
--- a/packages/CarSystemUI/res/drawable/unlock_dialog_background.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2019 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">
- <solid android:color="@color/unlock_dialog_background_color"/>
- <padding
- android:bottom="@*android:dimen/car_padding_2"
- android:left="@*android:dimen/car_padding_2"
- android:right="@*android:dimen/car_padding_2"
- android:top="@*android:dimen/car_padding_2"/>
- <corners
- android:radius="@dimen/unlock_dialog_radius"/>
-</shape>
\ No newline at end of file
diff --git a/packages/CarSystemUI/res/layout/trust_agent_unlock_dialog.xml b/packages/CarSystemUI/res/layout/trust_agent_unlock_dialog.xml
deleted file mode 100644
index 9df78f1..0000000
--- a/packages/CarSystemUI/res/layout/trust_agent_unlock_dialog.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2019 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
- -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/unlock_dialog_parent"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center">
-
- <LinearLayout
- android:id="@+id/unlock_dialog"
- android:layout_width="@dimen/unlock_dialog_width"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:layout_gravity="center"
- android:orientation="vertical"
- android:background="@drawable/unlock_dialog_background"
- android:padding="@*android:dimen/car_padding_2">
- <FrameLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content">
- <ProgressBar
- android:layout_gravity="center"
- android:layout_width="@dimen/unlock_dialog_progress_bar_size"
- android:layout_height="@dimen/unlock_dialog_progress_bar_size" />
- <ImageView
- android:id="@+id/avatar"
- android:layout_gravity="center"
- android:layout_width="@dimen/unlock_dialog_avatar_size"
- android:layout_height="@dimen/unlock_dialog_avatar_size"
- android:scaleType="fitCenter"/>
- </FrameLayout>
-
- <TextView
- android:id="@+id/user_name"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:text="@string/unlock_dialog_default_user_name"
- android:textSize="@*android:dimen/car_body1_size"
- android:textColor="@android:color/white"/>
-
- <TextView
- android:id="@+id/unlocking_text"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_marginTop="@*android:dimen/car_padding_1"
- android:text="@string/unlock_dialog_message_default"
- android:textSize="@*android:dimen/car_body4_size"
- android:textColor="@color/unlock_dialog_message_text_default"/>
-
- <Button
- android:id="@+id/enter_pin_button"
- android:layout_marginTop="@*android:dimen/car_padding_1"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:text="@string/unlock_dialog_button_text_pin"
- style="@style/UnlockDialogButton"/>
- </LinearLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/packages/CarSystemUI/res/values/colors_car.xml b/packages/CarSystemUI/res/values/colors_car.xml
index 0a3f7aa..5f33f8f 100644
--- a/packages/CarSystemUI/res/values/colors_car.xml
+++ b/packages/CarSystemUI/res/values/colors_car.xml
@@ -25,10 +25,4 @@
<color name="car_user_switcher_name_text_color">@*android:color/car_body1_light</color>
<color name="car_user_switcher_add_user_background_color">@*android:color/car_dark_blue_grey_600</color>
<color name="car_user_switcher_add_user_add_sign_color">@*android:color/car_body1_light</color>
-
- <!-- colors for unlock dialog -->
- <color name="unlock_dialog_background_color">#ff282a2d</color>
- <color name="unlock_dialog_message_text_default">@*android:color/car_grey_400</color>
- <color name="unlock_dialog_enter_pin_text_color">#ff66b5ff</color>
-
</resources>
diff --git a/packages/CarSystemUI/res/values/dimens_car.xml b/packages/CarSystemUI/res/values/dimens_car.xml
index 9cb09c9..e7ecf7f 100644
--- a/packages/CarSystemUI/res/values/dimens_car.xml
+++ b/packages/CarSystemUI/res/values/dimens_car.xml
@@ -42,11 +42,4 @@
<dimen name="car_user_switcher_container_height">420dp</dimen>
<!-- This must be the negative of car_user_switcher_container_height for the animation. -->
<dimen name="car_user_switcher_container_anim_height">-420dp</dimen>
-
- <!-- dimensions for the unlock dialog -->
- <dimen name="unlock_dialog_width">500dp</dimen>
- <dimen name="unlock_dialog_radius">16dp</dimen>
- <dimen name="unlock_dialog_avatar_size">100dp</dimen>
- <dimen name="unlock_dialog_progress_bar_size">140dp</dimen>
-
</resources>
diff --git a/packages/CarSystemUI/res/values/integers_car.xml b/packages/CarSystemUI/res/values/integers_car.xml
index d245f67..db8ce954 100644
--- a/packages/CarSystemUI/res/values/integers_car.xml
+++ b/packages/CarSystemUI/res/values/integers_car.xml
@@ -16,7 +16,6 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <integer name="car_user_switcher_anim_cascade_delay_ms">27</integer>
<!-- Full screen user switcher column number TODO: move to support library-->
<integer name="user_fullscreen_switcher_num_col">3</integer>
@@ -26,8 +25,6 @@
<!--Percentage of the screen height, from the bottom, that a notification panel being peeked
at will result in remaining closed the panel if released-->
<integer name="notification_settle_close_percentage">80</integer>
- <!-- The delay before the unlock dialog pops up -->
- <integer name="unlock_dialog_delay_ms">0</integer>
<!-- Timeout values in milliseconds for displaying volume dialog-->
<integer name="car_volume_dialog_display_normal_timeout">3000</integer>
diff --git a/packages/CarSystemUI/res/values/strings_car.xml b/packages/CarSystemUI/res/values/strings_car.xml
index 717692e..83e91c5 100644
--- a/packages/CarSystemUI/res/values/strings_car.xml
+++ b/packages/CarSystemUI/res/values/strings_car.xml
@@ -29,19 +29,4 @@
<string name="user_add_user_message_setup">When you add a new user, that person needs to set up their space.</string>
<!-- Message to inform user that the newly created user will have permissions to update apps for all other users. [CHAR LIMIT=100] -->
<string name="user_add_user_message_update">Any user can update apps for all other users.</string>
- <!-- Default messages displayed on the unlock dialog before unlock advertising started. [CHAR LIMIT=30]-->
- <string name="unlock_dialog_message_default">Waiting\u2026</string>
- <!-- Message to inform user that the IHU is looking for trusted device. [CHAR LIMIT=30] -->
- <string name="unlock_dialog_message_start">Looking for trusted device\u2026</string>
-
- <!-- Cancel Button text for user who has PIN as security lock. [CHAR LIMIT=30] -->
- <string name="unlock_dialog_button_text_pin">Enter PIN instead</string>
- <!-- Cancel Button text for user who has Pattern as security lock. [CHAR LIMIT=30] -->
- <string name="unlock_dialog_button_text_pattern">Enter Pattern instead</string>
- <!-- Cancel Button text for user who has Password as security lock. [CHAR LIMIT=30] -->
- <string name="unlock_dialog_button_text_password">Enter Password instead</string>
- <!-- Default user name shows on unlock dialog -->
- <string name="unlock_dialog_default_user_name">Default Name</string>
- <!-- Default title for unlock dialog -->
- <string name="unlock_dialog_title">Unlock Dialogue</string>
</resources>
diff --git a/packages/CarSystemUI/res/values/styles.xml b/packages/CarSystemUI/res/values/styles.xml
index a9423bf..371bebd 100644
--- a/packages/CarSystemUI/res/values/styles.xml
+++ b/packages/CarSystemUI/res/values/styles.xml
@@ -46,12 +46,4 @@
<item name="android:layout_width">96dp</item>
<item name="android:background">@drawable/nav_button_background</item>
</style>
-
- <style name="UnlockDialogButton">
- <item name="android:background">?android:attr/selectableItemBackground</item>
- <item name="android:textAlignment">center</item>
- <item name="android:textColor">@color/unlock_dialog_enter_pin_text_color</item>
- <item name="android:paddingHorizontal">16dp</item>
- <item name="android:textAllCaps">false</item>
- </style>
</resources>
\ No newline at end of file