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

Commit bde3ce5e authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Add screen title to prefs."

parents fac57416 9b346968

res/xml/app_default_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 


<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/com.android.settings"

    android:title="@string/app_default_dashboard_title">



    <Preference

        android:key="assist_and_voice_input"

res/xml/data_usage_cellular.xml

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
-->



<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android">

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:title="@string/data_usage_summary_title">



    <com.android.settings.datausage.TemplatePreferenceCategory

        android:key="mobile_category"

res/xml/data_usage_wifi.xml

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
-->



<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android">

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:title="@string/data_usage_summary_title">



    <com.android.settings.datausage.TemplatePreferenceCategory

        android:key="wifi_category"

res/xml/double_tap_power_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 
  -->



<PreferenceScreen 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"

                  android:title="@string/double_tap_power_for_camera_title">



    <com.android.settings.widget.VideoPreference

        android:key="gesture_double_tap_power_video"

res/xml/double_tap_screen_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 
  -->



<PreferenceScreen 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"

                  android:title="@string/ambient_display_title">



    <com.android.settings.widget.VideoPreference

        android:key="gesture_double_tap_screen_video"