From c62327981eee97d23ffbb4c0e6e48c44b891894e Mon Sep 17 00:00:00 2001
From: Alex Stetson <alexstetson@google.com>
Date: Fri, 16 Oct 2020 11:08:29 -0700
Subject: [PATCH] Allow extended apps to change package name

For the added flexibility of allowing apps that extend from settings to
have a different package name, these instances of com.android.settings
as a xmlns need to be replaced with res-auto (which subsitutes the
package name at build time).

Bug: 174264676
Test: manual (sdk_gphone), make -j20 SettingsRoboTests
Change-Id: I03acda25dbf4d028cc73b77f41ad5dedca110ecb
---
 res/drawable/wifi_friction.xml                      |  2 +-
 res/drawable/wifi_signal.xml                        |  2 +-
 res/layout/biometric_enroll_layout.xml              | 13 ++++++-------
 res/layout/face_enroll_education.xml                |  3 +--
 res/layout/face_enroll_introduction.xml             |  1 -
 tests/robotests/res/xml-mcc999/about_legal.xml      |  2 +-
 tests/robotests/res/xml-mcc999/display_settings.xml |  2 +-
 7 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/res/drawable/wifi_friction.xml b/res/drawable/wifi_friction.xml
index fa8268d88d8..6e9010fb332 100644
--- a/res/drawable/wifi_friction.xml
+++ b/res/drawable/wifi_friction.xml
@@ -15,7 +15,7 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+        xmlns:settings="http://schemas.android.com/apk/res-auto">
     <item
         settings:state_encrypted="true"
         android:drawable="@drawable/ic_friction_lock_closed"/>
diff --git a/res/drawable/wifi_signal.xml b/res/drawable/wifi_signal.xml
index 78540755a24..fba779283a0 100644
--- a/res/drawable/wifi_signal.xml
+++ b/res/drawable/wifi_signal.xml
@@ -15,7 +15,7 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+        xmlns:settings="http://schemas.android.com/apk/res-auto">
     <item settings:state_encrypted="true">
         <layer-list>
             <item>
diff --git a/res/layout/biometric_enroll_layout.xml b/res/layout/biometric_enroll_layout.xml
index bf41fcc79a7..2f3b34c7a25 100644
--- a/res/layout/biometric_enroll_layout.xml
+++ b/res/layout/biometric_enroll_layout.xml
@@ -18,7 +18,6 @@
 <com.google.android.setupdesign.GlifLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:BiometricEnrollCheckbox="http://schemas.android.com/apk/res/com.android.settings"
     style="?attr/face_layout_theme"
     app:sucHeaderText="@string/multi_biometric_enroll_title"
     android:id="@+id/setup_wizard_layout"
@@ -59,9 +58,9 @@
             android:id="@+id/checkbox_face"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            BiometricEnrollCheckbox:title="@string/multi_biometric_enroll_face_unlock_title"
-            BiometricEnrollCheckbox:description="@string/multi_biometric_enroll_face_unlock_description"
-            BiometricEnrollCheckbox:icon="@drawable/ic_face_24dp"/>
+            app:title="@string/multi_biometric_enroll_face_unlock_title"
+            app:description="@string/multi_biometric_enroll_face_unlock_description"
+            app:icon="@drawable/ic_face_24dp"/>
 
         <include layout="@layout/horizontal_divider"/>
 
@@ -69,9 +68,9 @@
             android:id="@+id/checkbox_fingerprint"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            BiometricEnrollCheckbox:title="@string/multi_biometric_enroll_fingerprint_unlock_title"
-            BiometricEnrollCheckbox:description="@string/multi_biometric_enroll_fingerprint_unlock_description"
-            BiometricEnrollCheckbox:icon="@drawable/ic_fingerprint_24dp"/>
+            app:title="@string/multi_biometric_enroll_fingerprint_unlock_title"
+            app:description="@string/multi_biometric_enroll_fingerprint_unlock_description"
+            app:icon="@drawable/ic_fingerprint_24dp"/>
 
         <include layout="@layout/horizontal_divider"/>
 
diff --git a/res/layout/face_enroll_education.xml b/res/layout/face_enroll_education.xml
index d7b95b60737..d94e7c6c026 100644
--- a/res/layout/face_enroll_education.xml
+++ b/res/layout/face_enroll_education.xml
@@ -18,7 +18,6 @@
 <com.google.android.setupdesign.GlifLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:FaceEnrollAccessibilitySwitch="http://schemas.android.com/apk/res/com.android.settings"
     style="?attr/face_layout_theme"
     android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
@@ -94,7 +93,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:visibility="gone"
-                    FaceEnrollAccessibilitySwitch:messageText="@string/security_settings_face_enroll_introduction_accessibility_diversity"/>
+                    app:messageText="@string/security_settings_face_enroll_introduction_accessibility_diversity"/>
 
             </FrameLayout>
 
diff --git a/res/layout/face_enroll_introduction.xml b/res/layout/face_enroll_introduction.xml
index 55ac6f908db..826f5fe0a34 100644
--- a/res/layout/face_enroll_introduction.xml
+++ b/res/layout/face_enroll_introduction.xml
@@ -18,7 +18,6 @@
 <com.google.android.setupdesign.GlifLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:FaceEnrollAccessibilitySwitch="http://schemas.android.com/apk/res/com.android.settings"
     style="?attr/face_layout_theme"
     android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
diff --git a/tests/robotests/res/xml-mcc999/about_legal.xml b/tests/robotests/res/xml-mcc999/about_legal.xml
index 3e008cb7bad..cbbc99ac1bd 100644
--- a/tests/robotests/res/xml-mcc999/about_legal.xml
+++ b/tests/robotests/res/xml-mcc999/about_legal.xml
@@ -24,7 +24,7 @@
 
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="bears_bears_bears"
         settings:keywords="keywords">
 
diff --git a/tests/robotests/res/xml-mcc999/display_settings.xml b/tests/robotests/res/xml-mcc999/display_settings.xml
index fccad7fb454..b5bf789a883 100644
--- a/tests/robotests/res/xml-mcc999/display_settings.xml
+++ b/tests/robotests/res/xml-mcc999/display_settings.xml
@@ -23,7 +23,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="page_title"
     settings:keywords="keywords">