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

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

Merge "Update preference screen title."

parents 9d31fa4c 03a3b518

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -1331,6 +1331,7 @@ 
        </activity>



        <activity android:name="SetFullBackupPassword"

                  android:label="@string/local_backup_password_title"

                android:exported="false">

        </activity>

res/xml/accessibility_shortcut_service_settings.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2017 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.

  -->



<PreferenceScreen

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

    android:title="@string/accessibility_shortcut_service_title" />

res/xml/app_data_usage.xml

+3 −2
Original line number Diff line number Diff line
@@ -14,8 +14,9 @@ 
     limitations under the License.

-->



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

                  android:title="@string/data_usage_summary_title">

<PreferenceScreen

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

    android:title="@string/data_usage_app_summary_title">



    <com.android.settings.datausage.SpinnerPreference

        android:key="cycle" />

res/xml/app_storage_settings.xml

+4 −3
Original line number Diff line number Diff line
@@ -14,9 +14,10 @@ 
     limitations under the License.

-->



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

<PreferenceScreen

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

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

                  android:title="@string/application_info_label">

    android:title="@string/storage_label">



    <com.android.settings.widget.ActionButtonPreference

        android:key="header_view" />

res/xml/billing_cycle.xml

+3 −2
Original line number Diff line number Diff line
@@ -14,8 +14,9 @@ 
     limitations under the License.

-->



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

    android:title="@string/data_usage_summary_title">

<PreferenceScreen

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

    android:title="@string/billing_cycle">



    <Preference

        android:key="billing_cycle"