From d7102ca0727f3e7f1a794a90c83b0816897c897c Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Fri, 10 Jul 2020 11:54:14 -0700
Subject: [PATCH 1/3] Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Change-Id: I1857033f45c9da5e4cc646d0e3f0afdc295cd71a
---
 res/values-gu/strings.xml     |  6 +++---
 res/values-ja/strings.xml     |  2 +-
 res/values-ky/strings.xml     |  2 +-
 res/values-zh-rTW/strings.xml | 34 +++++++++++++++++-----------------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index d345f857177..d6fc7858b74 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -3654,9 +3654,9 @@
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"ખલેલ પાડશો નહીંને મંજૂરી આપો"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"કોઇ ઇન્સ્ટોલ કરેલ એપ્લિકેશન્સએ ખલેલ પાડશો નહીં ઍક્સેસ કરવાની વિનંતી કરી નથી"</string>
     <string name="loading_notification_apps" msgid="1458413761470945269">"ઍપ્લિકેશનો લોડ કરી રહ્યું છે..."</string>
-    <string name="app_notifications_off_desc" msgid="6691342160980435901">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનને આ ઉપકરણ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
-    <string name="channel_notifications_off_desc" msgid="6202042207121633488">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનની કૅટેગરીને આ ઉપકરણ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
-    <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનના જૂથોને આ ઉપકરણ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
+    <string name="app_notifications_off_desc" msgid="6691342160980435901">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનને આ ડિવાઇસ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
+    <string name="channel_notifications_off_desc" msgid="6202042207121633488">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનની કૅટેગરીને આ ડિવાઇસ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
+    <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનના ગ્રૂપને આ ડિવાઇસ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
     <string name="notification_channels" msgid="1502969522886493799">"કૅટેગરીઓ"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"અન્ય"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index c03af5f9ae6..718840a07cd 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -3351,7 +3351,7 @@
     <string name="zen_mode_settings_category" msgid="3794956668816783447">"音が出る割り込みの許可"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"視覚的な通知のブロック"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"視覚的な割り込みを許可"</string>
-    <string name="zen_mode_restrict_notifications_title" msgid="4169952466106040297">"非表示の通知の表示オプション"</string>
+    <string name="zen_mode_restrict_notifications_title" msgid="4169952466106040297">"通知の表示オプション"</string>
     <string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"サイレント モードが ON のとき"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"通知音なし"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"画面に通知が表示されます"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 1c16df57a30..037568c6a84 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -925,7 +925,7 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Wi‑Fi бул түзмөк менен бөлүшүлүүдө…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Туташууда…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Жалпы байланыш түйүнү"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Сиз экениңизди ырастаңыз"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Өзүңүздү ырастаңыз"</string>
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi‑Fi сырсөзү: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Байланыш түйүнүнүн сырсөзү: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Авто-туташуу"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 51b3da7e302..a2389d3751c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -2415,9 +2415,9 @@
     <string name="battery_tip_smart_battery_title" product="tablet" msgid="6813017377960004819">"延長平板電腦的電池續航力"</string>
     <string name="battery_tip_smart_battery_title" product="device" msgid="4805599360437606335">"延長裝置的電池續航力"</string>
     <string name="battery_tip_smart_battery_summary" msgid="3592965553502362965">"開啟 Battery Manager"</string>
-    <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"開啟節約耗電量模式"</string>
+    <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"開啟省電模式"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="578523794827443977">"電池電力可能會比平常更快耗盡"</string>
-    <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"節約耗電量模式已開啟"</string>
+    <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"省電模式已開啟"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"部分功能可能受到限制"</string>
     <string name="battery_tip_high_usage_title" product="default" msgid="2375953293196088319">"手機使用率比平常高"</string>
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"平板電腦使用率比平常高"</string>
@@ -2455,9 +2455,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="215449637818582819">"這個應用程式將會在背景耗用電量。你的電池電力可能會比預期更快耗盡。"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="7940183167721998470">"移除"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="4968135709160207507">"取消"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="6097167058237891756">"你的應用程式目前耗用的電力正常。如果應用程式耗用過多電力，你的手機會為你提供操作建議。\n\n如果電池電量偏低，你隨時可以開啟節約耗電量模式。"</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"你的應用程式目前耗用的電力正常。如果應用程式耗用過多電力，你的平板電腦會為你提供操作建議。\n\n如果電池電量偏低，你隨時可以開啟節約耗電量模式。"</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"你的應用程式目前耗用的電力正常。如果應用程式耗用過多電力，裝置會提供相關操作建議。\n\n如果電池電量偏低，你隨時可以開啟節約耗電量模式。"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="6097167058237891756">"你的應用程式目前耗用的電力正常。如果應用程式耗用過多電力，你的手機會為你提供操作建議。\n\n如果電池電量偏低，你隨時可以開啟省電模式。"</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"你的應用程式目前耗用的電力正常。如果應用程式耗用過多電力，你的平板電腦會為你提供操作建議。\n\n如果電池電量偏低，你隨時可以開啟省電模式。"</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"你的應用程式目前耗用的電力正常。如果應用程式耗用過多電力，裝置會提供相關操作建議。\n\n如果電池電量偏低，你隨時可以開啟省電模式。"</string>
     <string name="smart_battery_manager_title" msgid="3677620516657920364">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="9095903608520254254">"自動管理應用程式"</string>
     <string name="smart_battery_summary" product="default" msgid="1492277404000064998">"針對不常使用的應用程式限制電池用量"</string>
@@ -2550,7 +2550,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="6495519793211758353">"試著連線至其他藍牙裝置"</string>
     <string name="battery_desc_apps" msgid="4187483940383266017">"應用程式用電量"</string>
     <string name="battery_sugg_apps_info" msgid="4796917242296658454">"停止或解除安裝應用程式"</string>
-    <string name="battery_sugg_apps_gps" msgid="7221335088647925110">"選取節約耗電量模式"</string>
+    <string name="battery_sugg_apps_gps" msgid="7221335088647925110">"選取省電模式"</string>
     <string name="battery_sugg_apps_settings" msgid="6527223370162382166">"應用程式可能會提供省電的設定"</string>
     <string name="battery_desc_users" msgid="1959428568888686847">"使用者用電量"</string>
     <string name="battery_desc_unaccounted" msgid="1649497860893660763">"其他電源用量"</string>
@@ -2581,23 +2581,23 @@
     <string name="menu_stats_refresh" msgid="6727628139586938835">"重新整理"</string>
     <string name="process_mediaserver_label" msgid="6135260215912215092">"媒體伺服器"</string>
     <string name="process_dex2oat_label" msgid="1190208677726583153">"應用程式最佳化"</string>
-    <string name="battery_saver" msgid="7737147344510595864">"節約耗電量"</string>
+    <string name="battery_saver" msgid="7737147344510595864">"省電模式"</string>
     <string name="battery_saver_auto_title" msgid="6789753787070176144">"自動開啟"</string>
     <string name="battery_saver_auto_no_schedule" msgid="5123639867350138893">"未設定時間表"</string>
     <string name="battery_saver_auto_routine" msgid="4656495097900848608">"根據你平常充電的時間"</string>
     <string name="battery_saver_auto_percentage" msgid="558533724806281980">"根據電量百分比"</string>
-    <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"如果電池電量可能會在你下次的例行充電時間前耗盡，系統就會開啟「節約耗電量」模式"</string>
+    <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"如果電池電量可能會在你下次的例行充電時間前耗盡，系統就會開啟「省電」模式"</string>
     <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"將在電量為 <xliff:g id="PERCENT">%1$s</xliff:g> 時開啟"</string>
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"設定時間表"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"延長電池續航力"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"充電時關閉"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"在你手機的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉節約耗電量模式"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"在你平板電腦的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉節約耗電量模式"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"在你裝置的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉節約耗電量模式"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"在你手機的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉省電模式"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"在你平板電腦的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉省電模式"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"在你裝置的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉省電模式"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"開啟"</string>
-    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"使用節約耗電量模式"</string>
+    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"使用省電模式"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="7857393318205740864">"自動開啟"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6194649389871448663">"永遠不要"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="4294335680892392449">"電量為 <xliff:g id="PERCENT">%1$s</xliff:g> 時"</string>
@@ -3283,8 +3283,8 @@
     <string name="keywords_touch_vibration" msgid="1125291201902251273">"觸覺回饋, 震動, 螢幕, 敏感度"</string>
     <string name="keywords_ring_vibration" msgid="1736301626537417541">"觸動回饋, 震動, 手機, 通話, 敏感度, 響鈴"</string>
     <string name="keywords_notification_vibration" msgid="9162262178415439951">"觸動回饋, 震動, 敏感度"</string>
-    <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"節約耗電量, 固定式, 保留, 省電功能, 電池"</string>
-    <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"日常安排, 時間表, 節約耗電量, 節約電量, 電池, 自動, 百分比"</string>
+    <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"省電, 固定式, 保留, 省電模式, 電池"</string>
+    <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"日常安排, 時間表, 省電, 節約電量, 電池, 自動, 百分比"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, 進階通話功能, 4G 通話功能"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"新增語言, 新增一種語言"</string>
     <string name="default_sound" msgid="6604374495015245195">"預設音效"</string>
@@ -4223,7 +4223,7 @@
     <string name="condition_zen_title" msgid="7674761111934567490">"已開啟零打擾模式"</string>
     <string name="condition_zen_summary_phone_muted" msgid="6516753722927681820">"手機已設為靜音"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="9019937492602199663">"允許例外"</string>
-    <string name="condition_battery_title" msgid="6395113995454385248">"節約耗電量模式已開啟"</string>
+    <string name="condition_battery_title" msgid="6395113995454385248">"省電模式已開啟"</string>
     <string name="condition_battery_summary" msgid="8436806157833107886">"只能使用部分功能"</string>
     <string name="condition_cellular_title" msgid="155474690792125747">"行動數據已關閉"</string>
     <string name="condition_cellular_summary" msgid="1678098728303268851">"只能透過 Wi-Fi 使用網際網路"</string>
@@ -4400,8 +4400,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"已連線到多個裝置"</string>
     <string name="demo_mode" msgid="6566167465451386728">"系統 UI 示範模式"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"深色主題"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"開啟/因「節約耗電量」功能而暫時停用"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"因「節約耗電量」功能而暫時啟用"</string>
+    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"開啟/因「省電模式」而暫時停用"</string>
+    <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"因「省電模式」而暫時啟用"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"支援的應用程式也會切換為深色主題"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"我知道了"</string>
     <string name="dark_theme_slice_title" msgid="4684222119481114062">"試用深色主題"</string>

From 0bdffb98c3fc311562e19c3a1767d46ba249aced Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Thu, 9 Jul 2020 12:52:36 -0400
Subject: [PATCH 2/3] Increase expand/collapse tap target

Fixes: 157160901
Test: manual with voice a11y service
Change-Id: Ic1cdd3ee4f22d66d76718fae11304a0d6128def2
(cherry picked from commit bfab43571d3b246a50dbbd369f2b269f21663ffb)
---
 res/layout/notification_history_app_layout.xml        |  6 ++++--
 .../history/NotificationHistoryActivity.java          | 11 ++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/res/layout/notification_history_app_layout.xml b/res/layout/notification_history_app_layout.xml
index a1b3be79082..481253a10e9 100644
--- a/res/layout/notification_history_app_layout.xml
+++ b/res/layout/notification_history_app_layout.xml
@@ -24,6 +24,7 @@
         android:id="@+id/app_header"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
+        android:background="@drawable/button_ripple_radius"
         android:paddingTop="12dp"
         android:paddingBottom="12dp"
         android:paddingStart="16dp">
@@ -58,13 +59,14 @@
                 android:paddingTop="8dp"
                 android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"/>
         </LinearLayout>
-        <ImageButton
+        <ImageView
             android:id="@+id/expand"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:layout_height="48dp"
             android:layout_width="48dp"
-            android:background="@drawable/button_ripple_radius"
+            android:scaleType="center"
+            android:contentDescription="@null"
             android:src="@*android:drawable/ic_expand_more"/>
     </RelativeLayout>
 
diff --git a/src/com/android/settings/notification/history/NotificationHistoryActivity.java b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
index 7635a4f99c4..b1847400e91 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryActivity.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
@@ -155,21 +155,22 @@ public class NotificationHistoryActivity extends Activity {
 
             final View container = viewForPackage.findViewById(R.id.notification_list);
             container.setVisibility(View.GONE);
-            ImageButton expand = viewForPackage.findViewById(R.id.expand);
-            expand.setContentDescription(container.getVisibility() == View.VISIBLE
+            View header = viewForPackage.findViewById(R.id.app_header);
+            ImageView expand = viewForPackage.findViewById(R.id.expand);
+            header.setStateDescription(container.getVisibility() == View.VISIBLE
                     ? getString(R.string.condition_expand_hide)
                     : getString(R.string.condition_expand_show));
             int finalI = i;
-            expand.setOnClickListener(v -> {
+            header.setOnClickListener(v -> {
                 container.setVisibility(container.getVisibility() == View.VISIBLE
                         ? View.GONE : View.VISIBLE);
                 expand.setImageResource(container.getVisibility() == View.VISIBLE
                         ? R.drawable.ic_expand_less
                         : com.android.internal.R.drawable.ic_expand_more);
-                expand.setContentDescription(container.getVisibility() == View.VISIBLE
+                header.setStateDescription(container.getVisibility() == View.VISIBLE
                         ? getString(R.string.condition_expand_hide)
                         : getString(R.string.condition_expand_show));
-                expand.sendAccessibilityEvent(TYPE_VIEW_ACCESSIBILITY_FOCUSED);
+                header.sendAccessibilityEvent(TYPE_VIEW_ACCESSIBILITY_FOCUSED);
                 mUiEventLogger.logWithPosition(
                         (container.getVisibility() == View.VISIBLE)
                             ? NotificationHistoryEvent.NOTIFICATION_HISTORY_PACKAGE_HISTORY_OPEN

From bb75ff263373e972455beaf8daa696037a54a7af Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Fri, 10 Jul 2020 14:04:22 -0700
Subject: [PATCH 3/3] Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Change-Id: I93a781244f823ee7229205de4865c2d05d8353d6
---
 res/values-gu/strings.xml     |  6 +++---
 res/values-ja/strings.xml     |  2 +-
 res/values-ky/strings.xml     |  2 +-
 res/values-zh-rTW/strings.xml | 34 +++++++++++++++++-----------------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 16bcbe26e84..e5896f08418 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -3653,9 +3653,9 @@
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"ખલેલ પાડશો નહીંને મંજૂરી આપો"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"કોઇ ઇન્સ્ટોલ કરેલ એપ્લિકેશન્સએ ખલેલ પાડશો નહીં ઍક્સેસ કરવાની વિનંતી કરી નથી"</string>
     <string name="loading_notification_apps" msgid="1458413761470945269">"ઍપ્લિકેશનો લોડ કરી રહ્યું છે..."</string>
-    <string name="app_notifications_off_desc" msgid="6691342160980435901">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનને આ ઉપકરણ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
-    <string name="channel_notifications_off_desc" msgid="6202042207121633488">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનની કૅટેગરીને આ ઉપકરણ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
-    <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનના જૂથોને આ ઉપકરણ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
+    <string name="app_notifications_off_desc" msgid="6691342160980435901">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનને આ ડિવાઇસ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
+    <string name="channel_notifications_off_desc" msgid="6202042207121633488">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનની કૅટેગરીને આ ડિવાઇસ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
+    <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનના ગ્રૂપને આ ડિવાઇસ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
     <string name="notification_channels" msgid="1502969522886493799">"કૅટેગરીઓ"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"અન્ય"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index cbd7e12539f..63f34b93a67 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -3350,7 +3350,7 @@
     <string name="zen_mode_settings_category" msgid="3794956668816783447">"音が出る割り込みの許可"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"視覚的な通知のブロック"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"視覚的な割り込みを許可"</string>
-    <string name="zen_mode_restrict_notifications_title" msgid="4169952466106040297">"非表示の通知の表示オプション"</string>
+    <string name="zen_mode_restrict_notifications_title" msgid="4169952466106040297">"通知の表示オプション"</string>
     <string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"サイレント モードが ON のとき"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"通知音なし"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"画面に通知が表示されます"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 499941eb8fb..544cacbff48 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -925,7 +925,7 @@
     <string name="wifi_dpp_sharing_wifi_with_this_device" msgid="7250369936882080107">"Wi‑Fi бул түзмөк менен бөлүшүлүүдө…"</string>
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Туташууда…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Жалпы байланыш түйүнү"</string>
-    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Сиз экениңизди ырастаңыз"</string>
+    <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Өзүңүздү ырастаңыз"</string>
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi‑Fi сырсөзү: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Байланыш түйүнүнүн сырсөзү: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Авто-туташуу"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f5aaba574f3..4c2b4811f98 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -2414,9 +2414,9 @@
     <string name="battery_tip_smart_battery_title" product="tablet" msgid="6813017377960004819">"延長平板電腦的電池續航力"</string>
     <string name="battery_tip_smart_battery_title" product="device" msgid="4805599360437606335">"延長裝置的電池續航力"</string>
     <string name="battery_tip_smart_battery_summary" msgid="3592965553502362965">"開啟 Battery Manager"</string>
-    <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"開啟節約耗電量模式"</string>
+    <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"開啟省電模式"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="578523794827443977">"電池電力可能會比平常更快耗盡"</string>
-    <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"節約耗電量模式已開啟"</string>
+    <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"省電模式已開啟"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"部分功能可能受到限制"</string>
     <string name="battery_tip_high_usage_title" product="default" msgid="2375953293196088319">"手機使用率比平常高"</string>
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"平板電腦使用率比平常高"</string>
@@ -2454,9 +2454,9 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="215449637818582819">"這個應用程式將會在背景耗用電量。你的電池電力可能會比預期更快耗盡。"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="7940183167721998470">"移除"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="4968135709160207507">"取消"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="6097167058237891756">"你的應用程式目前耗用的電力正常。如果應用程式耗用過多電力，你的手機會為你提供操作建議。\n\n如果電池電量偏低，你隨時可以開啟節約耗電量模式。"</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"你的應用程式目前耗用的電力正常。如果應用程式耗用過多電力，你的平板電腦會為你提供操作建議。\n\n如果電池電量偏低，你隨時可以開啟節約耗電量模式。"</string>
-    <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"你的應用程式目前耗用的電力正常。如果應用程式耗用過多電力，裝置會提供相關操作建議。\n\n如果電池電量偏低，你隨時可以開啟節約耗電量模式。"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="6097167058237891756">"你的應用程式目前耗用的電力正常。如果應用程式耗用過多電力，你的手機會為你提供操作建議。\n\n如果電池電量偏低，你隨時可以開啟省電模式。"</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"你的應用程式目前耗用的電力正常。如果應用程式耗用過多電力，你的平板電腦會為你提供操作建議。\n\n如果電池電量偏低，你隨時可以開啟省電模式。"</string>
+    <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"你的應用程式目前耗用的電力正常。如果應用程式耗用過多電力，裝置會提供相關操作建議。\n\n如果電池電量偏低，你隨時可以開啟省電模式。"</string>
     <string name="smart_battery_manager_title" msgid="3677620516657920364">"Battery Manager"</string>
     <string name="smart_battery_title" msgid="9095903608520254254">"自動管理應用程式"</string>
     <string name="smart_battery_summary" product="default" msgid="1492277404000064998">"針對不常使用的應用程式限制電池用量"</string>
@@ -2549,7 +2549,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="6495519793211758353">"試著連線至其他藍牙裝置"</string>
     <string name="battery_desc_apps" msgid="4187483940383266017">"應用程式用電量"</string>
     <string name="battery_sugg_apps_info" msgid="4796917242296658454">"停止或解除安裝應用程式"</string>
-    <string name="battery_sugg_apps_gps" msgid="7221335088647925110">"選取節約耗電量模式"</string>
+    <string name="battery_sugg_apps_gps" msgid="7221335088647925110">"選取省電模式"</string>
     <string name="battery_sugg_apps_settings" msgid="6527223370162382166">"應用程式可能會提供省電的設定"</string>
     <string name="battery_desc_users" msgid="1959428568888686847">"使用者用電量"</string>
     <string name="battery_desc_unaccounted" msgid="1649497860893660763">"其他電源用量"</string>
@@ -2580,23 +2580,23 @@
     <string name="menu_stats_refresh" msgid="6727628139586938835">"重新整理"</string>
     <string name="process_mediaserver_label" msgid="6135260215912215092">"媒體伺服器"</string>
     <string name="process_dex2oat_label" msgid="1190208677726583153">"應用程式最佳化"</string>
-    <string name="battery_saver" msgid="7737147344510595864">"節約耗電量"</string>
+    <string name="battery_saver" msgid="7737147344510595864">"省電模式"</string>
     <string name="battery_saver_auto_title" msgid="6789753787070176144">"自動開啟"</string>
     <string name="battery_saver_auto_no_schedule" msgid="5123639867350138893">"未設定時間表"</string>
     <string name="battery_saver_auto_routine" msgid="4656495097900848608">"根據你平常充電的時間"</string>
     <string name="battery_saver_auto_percentage" msgid="558533724806281980">"根據電量百分比"</string>
-    <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"如果電池電量可能會在你下次的例行充電時間前耗盡，系統就會開啟「節約耗電量」模式"</string>
+    <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"如果電池電量可能會在你下次的例行充電時間前耗盡，系統就會開啟「省電」模式"</string>
     <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"將在電量為 <xliff:g id="PERCENT">%1$s</xliff:g> 時開啟"</string>
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"設定時間表"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"延長電池續航力"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"充電時關閉"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"在你手機的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉節約耗電量模式"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"在你平板電腦的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉節約耗電量模式"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"在你裝置的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉節約耗電量模式"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"在你手機的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉省電模式"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"在你平板電腦的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉省電模式"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"在你裝置的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉省電模式"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"開啟"</string>
-    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"使用節約耗電量模式"</string>
+    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"使用省電模式"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="7857393318205740864">"自動開啟"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6194649389871448663">"永遠不要"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="4294335680892392449">"電量為 <xliff:g id="PERCENT">%1$s</xliff:g> 時"</string>
@@ -3282,8 +3282,8 @@
     <string name="keywords_touch_vibration" msgid="1125291201902251273">"觸覺回饋, 震動, 螢幕, 敏感度"</string>
     <string name="keywords_ring_vibration" msgid="1736301626537417541">"觸動回饋, 震動, 手機, 通話, 敏感度, 響鈴"</string>
     <string name="keywords_notification_vibration" msgid="9162262178415439951">"觸動回饋, 震動, 敏感度"</string>
-    <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"節約耗電量, 固定式, 保留, 省電功能, 電池"</string>
-    <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"日常安排, 時間表, 節約耗電量, 節約電量, 電池, 自動, 百分比"</string>
+    <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"省電, 固定式, 保留, 省電模式, 電池"</string>
+    <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"日常安排, 時間表, 省電, 節約電量, 電池, 自動, 百分比"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, 進階通話功能, 4G 通話功能"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"新增語言, 新增一種語言"</string>
     <string name="default_sound" msgid="6604374495015245195">"預設音效"</string>
@@ -4222,7 +4222,7 @@
     <string name="condition_zen_title" msgid="7674761111934567490">"已開啟零打擾模式"</string>
     <string name="condition_zen_summary_phone_muted" msgid="6516753722927681820">"手機已設為靜音"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="9019937492602199663">"允許例外"</string>
-    <string name="condition_battery_title" msgid="6395113995454385248">"節約耗電量模式已開啟"</string>
+    <string name="condition_battery_title" msgid="6395113995454385248">"省電模式已開啟"</string>
     <string name="condition_battery_summary" msgid="8436806157833107886">"只能使用部分功能"</string>
     <string name="condition_cellular_title" msgid="155474690792125747">"行動數據已關閉"</string>
     <string name="condition_cellular_summary" msgid="1678098728303268851">"只能透過 Wi-Fi 使用網際網路"</string>
@@ -4399,8 +4399,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"已連線到多個裝置"</string>
     <string name="demo_mode" msgid="6566167465451386728">"系統 UI 示範模式"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"深色主題"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"開啟/因「節約耗電量」功能而暫時停用"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"因「節約耗電量」功能而暫時啟用"</string>
+    <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"開啟/因「省電模式」而暫時停用"</string>
+    <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"因「省電模式」而暫時啟用"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"支援的應用程式也會切換為深色主題"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"我知道了"</string>
     <string name="dark_theme_slice_title" msgid="4684222119481114062">"試用深色主題"</string>