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

Commit 06663375 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Update suggestion text" into nyc-dev

parents 9dd15f1b ec1f28e5
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -825,11 +825,14 @@
                android:value="30" />
            <meta-data android:name="com.android.settings.title"
                android:resource="@string/zen_mode_automation_suggestion_title" />
            <meta-data android:name="com.android.settings.summary"
                android:resource="@string/zen_mode_automation_suggestion_summary" />
        </activity>

        <activity android:name="Settings$WallpaperSuggestionActivity"
                android:label="@string/wallpaper_settings_title"
                android:exported="true"
                android:icon="@drawable/ic_wallpaper"
                android:taskAffinity="">
            <intent-filter android:priority="1">
                <action android:name="android.intent.action.MAIN" />
@@ -839,6 +842,8 @@
                android:value="com.android.settings.WallpaperTypeSettings" />
            <meta-data android:name="com.android.settings.title"
                android:resource="@string/wallpaper_suggestion_title" />
            <meta-data android:name="com.android.settings.summary"
                android:resource="@string/wallpaper_suggestion_summary" />
        </activity>

        <activity android:name="Settings$ZenModeScheduleRuleSettingsActivity"
@@ -1553,6 +1558,8 @@
                android:value="android.hardware.fingerprint" />
            <meta-data android:name="com.android.settings.title"
                android:resource="@string/suggestion_additional_fingerprints" />
            <meta-data android:name="com.android.settings.summary"
                android:resource="@string/suggestion_additional_fingerprints_summary" />
        </activity>

        <activity android:name=".fingerprint.FingerprintSettings" android:exported="false"/>
@@ -2698,6 +2705,8 @@
                android:value="10" />
            <meta-data android:name="com.android.settings.title"
                android:resource="@string/wifi_calling_suggestion_title" />
            <meta-data android:name="com.android.settings.summary"
                android:resource="@string/wifi_calling_suggestion_summary" />
        </activity>

        <provider
+25 −0
Original line number Diff line number Diff line
<!--
    Copyright (C) 2016 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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="24.0dp"
        android:height="24.0dp"
        android:viewportWidth="24.0"
        android:viewportHeight="24.0"
        android:tint="?android:attr/colorAccent">
    <path
        android:fillColor="#FF000000"
        android:pathData="M4.0,4.0l7.0,0.0L11.0,2.0L4.0,2.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,7.0l2.0,0.0L4.0,4.0zm6.0,9.0l-4.0,5.0l12.0,0.0l-3.0,-4.0 -2.03,2.71L10.0,13.0zm7.0,-4.5c0.0,-0.83 -0.67,-1.5 -1.5,-1.5S14.0,7.67 14.0,8.5s0.67,1.5 1.5,1.5S17.0,9.33 17.0,8.5zM20.0,2.0l-7.0,0.0l0.0,2.0l7.0,0.0l0.0,7.0l2.0,0.0L22.0,4.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0zm0.0,18.0l-7.0,0.0l0.0,2.0l7.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0l0.0,-7.0l-2.0,0.0l0.0,7.0zM4.0,13.0L2.0,13.0l0.0,7.0c0.0,1.0 0.9,2.0 2.0,2.0l7.0,0.0l0.0,-2.0L4.0,20.0l0.0,-7.0z"/>
</vector>
+14 −4
Original line number Diff line number Diff line
@@ -1977,7 +1977,9 @@
    <!-- Wireless networks, item title to go into the WFC settings [CHAR LIMIT=30] -->
    <string name="wifi_calling_settings_title">Wi-Fi calling</string>
    <!-- Title of suggestion to turn on wifi calling [CHAR LIMIT=30] -->
    <string name="wifi_calling_suggestion_title">Enable Wi-Fi Calling</string>
    <string name="wifi_calling_suggestion_title">Turn on Wi-Fi Calling</string>
    <!-- Summary of suggestion to turn on wifi calling [CHAR LIMIT=60] -->
    <string name="wifi_calling_suggestion_summary">Use Wi-Fi instead of mobile network</string>
    <!-- WFC mode [CHAR LIMIT=30] -->
    <string name="wifi_calling_mode_title">Calling preference</string>
    <!-- WFC mode dialog [CHAR LIMIT=30] -->
@@ -2142,7 +2144,9 @@
    <!-- Wallpaper settings title [CHAR LIMIT=30] -->
    <string name="wallpaper_settings_title">Wallpaper</string>
    <!-- Wallpaper suggestion title [CHAR LIMIT=30] -->
    <string name="wallpaper_suggestion_title">Set up wallpaper</string>
    <string name="wallpaper_suggestion_title">Change wallpaper</string>
    <!-- Wallpaper suggestion title [CHAR LIMIT=60] -->
    <string name="wallpaper_suggestion_summary">Personalize your screen</string>
    <!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->
    <string name="wallpaper_settings_fragment_title">Choose wallpaper from</string>
    <!-- Display settings screen, trigger for screen saver options -->
@@ -5877,7 +5881,10 @@
    <string name="zen_mode_automation_settings_title">Automatic rules</string>
    <!--  Do not disturb: Title for the zen mode automation option Suggestion. [CHAR LIMIT=30] -->
    <string name="zen_mode_automation_suggestion_title">Set up Do Not Disturb Schedule</string>
    <string name="zen_mode_automation_suggestion_title">Set Do Not Disturb Schedule</string>
    <!--  Do not disturb: Summary for the zen mode automation option Suggestion. [CHAR LIMIT=30] -->
    <string name="zen_mode_automation_suggestion_summary">Silence your device at certain times</string>
    <!--  Do not disturb: Zen mode option: Important interruptions [CHAR LIMIT=60] -->
    <string name="zen_mode_option_important_interruptions">Priority only</string>
@@ -7194,7 +7201,10 @@
    <string name="lockpattern_settings_require_password_before_startup_summary">Require password to start up your device. While off, this device can\'t receive calls, messages, notifications, or alarms.</string>
    <!-- Title for suggestion adding more fingerprints [CHAR LIMIT=30] -->
    <string name="suggestion_additional_fingerprints">Additional Fingerprints</string>
    <string name="suggestion_additional_fingerprints">Add another fingerprint</string>
    <!-- Summary for suggestion adding more fingerprints [CHAR LIMIT=60] -->
    <string name="suggestion_additional_fingerprints_summary">Unlock with a different fingerprint</string>
    <!-- Summary of battery saver when on [CHAR LIMIT=NONE] -->
    <string name="battery_saver_on_summary">On / <xliff:g name="automatic_state" example="Never turn on automatically">%1$s</xliff:g></string>