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
This commit is contained in:
@@ -15,7 +15,7 @@
|
|||||||
-->
|
-->
|
||||||
|
|
||||||
<selector xmlns:android="http://schemas.android.com/apk/res/android"
|
<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
|
<item
|
||||||
settings:state_encrypted="true"
|
settings:state_encrypted="true"
|
||||||
android:drawable="@drawable/ic_friction_lock_closed"/>
|
android:drawable="@drawable/ic_friction_lock_closed"/>
|
||||||
|
@@ -15,7 +15,7 @@
|
|||||||
-->
|
-->
|
||||||
|
|
||||||
<selector xmlns:android="http://schemas.android.com/apk/res/android"
|
<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">
|
<item settings:state_encrypted="true">
|
||||||
<layer-list>
|
<layer-list>
|
||||||
<item>
|
<item>
|
||||||
|
@@ -18,7 +18,6 @@
|
|||||||
<com.google.android.setupdesign.GlifLayout
|
<com.google.android.setupdesign.GlifLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
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"
|
style="?attr/face_layout_theme"
|
||||||
app:sucHeaderText="@string/multi_biometric_enroll_title"
|
app:sucHeaderText="@string/multi_biometric_enroll_title"
|
||||||
android:id="@+id/setup_wizard_layout"
|
android:id="@+id/setup_wizard_layout"
|
||||||
@@ -59,9 +58,9 @@
|
|||||||
android:id="@+id/checkbox_face"
|
android:id="@+id/checkbox_face"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
BiometricEnrollCheckbox:title="@string/multi_biometric_enroll_face_unlock_title"
|
app:title="@string/multi_biometric_enroll_face_unlock_title"
|
||||||
BiometricEnrollCheckbox:description="@string/multi_biometric_enroll_face_unlock_description"
|
app:description="@string/multi_biometric_enroll_face_unlock_description"
|
||||||
BiometricEnrollCheckbox:icon="@drawable/ic_face_24dp"/>
|
app:icon="@drawable/ic_face_24dp"/>
|
||||||
|
|
||||||
<include layout="@layout/horizontal_divider"/>
|
<include layout="@layout/horizontal_divider"/>
|
||||||
|
|
||||||
@@ -69,9 +68,9 @@
|
|||||||
android:id="@+id/checkbox_fingerprint"
|
android:id="@+id/checkbox_fingerprint"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
BiometricEnrollCheckbox:title="@string/multi_biometric_enroll_fingerprint_unlock_title"
|
app:title="@string/multi_biometric_enroll_fingerprint_unlock_title"
|
||||||
BiometricEnrollCheckbox:description="@string/multi_biometric_enroll_fingerprint_unlock_description"
|
app:description="@string/multi_biometric_enroll_fingerprint_unlock_description"
|
||||||
BiometricEnrollCheckbox:icon="@drawable/ic_fingerprint_24dp"/>
|
app:icon="@drawable/ic_fingerprint_24dp"/>
|
||||||
|
|
||||||
<include layout="@layout/horizontal_divider"/>
|
<include layout="@layout/horizontal_divider"/>
|
||||||
|
|
||||||
|
@@ -18,7 +18,6 @@
|
|||||||
<com.google.android.setupdesign.GlifLayout
|
<com.google.android.setupdesign.GlifLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
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"
|
style="?attr/face_layout_theme"
|
||||||
android:id="@+id/setup_wizard_layout"
|
android:id="@+id/setup_wizard_layout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@@ -94,7 +93,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
FaceEnrollAccessibilitySwitch:messageText="@string/security_settings_face_enroll_introduction_accessibility_diversity"/>
|
app:messageText="@string/security_settings_face_enroll_introduction_accessibility_diversity"/>
|
||||||
|
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|
|
||||||
|
@@ -18,7 +18,6 @@
|
|||||||
<com.google.android.setupdesign.GlifLayout
|
<com.google.android.setupdesign.GlifLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
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"
|
style="?attr/face_layout_theme"
|
||||||
android:id="@+id/setup_wizard_layout"
|
android:id="@+id/setup_wizard_layout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
<PreferenceScreen
|
<PreferenceScreen
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
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"
|
android:title="bears_bears_bears"
|
||||||
settings:keywords="keywords">
|
settings:keywords="keywords">
|
||||||
|
|
||||||
|
@@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
<PreferenceScreen
|
<PreferenceScreen
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
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"
|
android:title="page_title"
|
||||||
settings:keywords="keywords">
|
settings:keywords="keywords">
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user