Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e68467e0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use res-auto as app xml namespace instead of settings."

parents 01a225fd 74c61d1f

res/xml/account_type_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,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="@string/account_settings_title"

        settings:keywords="@string/keywords_accounts">

res/xml/apn_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ 
-->



<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="@string/apn_settings" android:key="apn_list">

</PreferenceScreen>

res/xml/app_and_notification.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,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:key="apps_and_notification_screen"

    android:title="@string/app_and_notification_dashboard_title"

    settings:initialExpandedChildrenCount="4">

res/xml/app_default_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,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:key="app_default_settings_screen"

    android:title="@string/app_default_dashboard_title">

res/xml/app_list_disclosure_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,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:key="app_list_disclosure_settings">

    <PreferenceCategory

            android:key="dashboard_tile_placeholder"/>