diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml
index b2f9183e44579..797d75f5a54ff 100644
--- a/core/res/res/values-en-rCA/strings.xml
+++ b/core/res/res/values-en-rCA/strings.xml
@@ -1256,10 +1256,10 @@
"Tap to see all networks"
"Connect"
"All networks"
- "Allow suggested Wi‑Fi networks?"
- "%s suggested networks. Device may connect automatically."
- "Allow"
- "No, thanks"
+ "Connect to Wi‑Fi networks?"
+ "Suggested by %s"
+ "Yes"
+ "No"
"Wi‑Fi will turn on automatically"
"When you\'re near a high‑quality saved network"
"Don\'t turn back on"
diff --git a/core/res/res/values-en-rXC/strings.xml b/core/res/res/values-en-rXC/strings.xml
index a6aa604304251..7ea76500e4eac 100644
--- a/core/res/res/values-en-rXC/strings.xml
+++ b/core/res/res/values-en-rXC/strings.xml
@@ -1256,10 +1256,10 @@
"Tap to see all networks"
"Connect"
"All networks"
- "Allow suggested Wi‑Fi networks?"
- "%s suggested networks. Device may connect automatically."
- "Allow"
- "No thanks"
+ "Connect to Wi‑Fi networks?"
+ "Suggested by %s"
+ "Yes"
+ "No"
"Wi‑Fi will turn on automatically"
"When you\'re near a high quality saved network"
"Don\'t turn back on"
diff --git a/packages/SettingsLib/res/values-te/strings.xml b/packages/SettingsLib/res/values-te/strings.xml
index e591121d4b592..83636dc19beb9 100644
--- a/packages/SettingsLib/res/values-te/strings.xml
+++ b/packages/SettingsLib/res/values-te/strings.xml
@@ -143,7 +143,7 @@
"సిస్టమ్ అప్డేట్లు"
"USB టీథరింగ్"
"పోర్టబుల్ హాట్స్పాట్"
- "బ్లూటూత్ టెథెరింగ్"
+ "బ్లూటూత్ టీథరింగ్"
"టీథరింగ్"
"టీథరింగ్ & పోర్టబుల్ హాట్స్పాట్"
"అన్ని కార్యాలయ అనువర్తనాలు"
@@ -376,7 +376,7 @@
"ప్రొటానోమలీ (ఎరుపు-ఆకుపచ్చ రంగు)"
"ట్రైటనోమలీ (నీలం-పసుపు రంగు)"
"రంగు సవరణ"
- "ఈ ఫీచర్ ప్రయోగాత్మకమైనది, పనితీరుపై ప్రభావం చూపవచ్చు."
+ "ఈ లక్షణం ప్రయోగాత్మకమైనది మరియు పనితీరుపై ప్రభావం చూపవచ్చు."
"%1$s ద్వారా భర్తీ చేయబడింది"
"%1$s - %2$s"
"%1$s సమయం మిగిలి ఉంది"
@@ -414,7 +414,7 @@
"నిలిపివేయబడింది"
"అనుమతించినవి"
"అనుమతించబడలేదు"
- "తెలియని యాప్లను ఇన్స్టాల్ చేయడం"
+ "తెలియని యాప్లను ఇన్స్టాల్ చేయండి"
"సెట్టింగ్ల హోమ్"
- "0%"
diff --git a/packages/SettingsLib/res/values-uz/strings.xml b/packages/SettingsLib/res/values-uz/strings.xml
index 0d3e8de0559d6..5dca4759a6290 100644
--- a/packages/SettingsLib/res/values-uz/strings.xml
+++ b/packages/SettingsLib/res/values-uz/strings.xml
@@ -201,7 +201,7 @@
"Ushbu foydalanuvchi uchun VPN sozlamalari mavjud emas"
"Ushbu foydalanuvchi uchun Modem rejimi sozlamalari mavjud emas"
"Ushbu foydalanuvchi uchun Internetga kirish nuqtasi (APN) sozlamalari mavjud emas"
- "USB orqali nosozliklarni aniqlash"
+ "USB orqali nosozliklarni tuzatish"
"USB orqali kompyuterga ulanganda tuzatish rejimi yoqilsin"
"USB orqali nosozliklarni tuzatishni taqiqlash"
"Xatoliklar hisoboti"
@@ -264,7 +264,7 @@
"Mobil internet har doim yoniq tursin, hatto Wi-Fi yoniq bo‘lsa ham (bir tarmoqdan ikkinchisiga tezroq o‘tish uchun)."
"Modem rejimida apparatli tezlashtirishdan foydalanish (agar mavjud bo‘lsa)"
"USB orqali nosozliklarni tuzatishga ruxsat berilsinmi?"
- "USB orqali nosozliklarni aniqlash faqat dasturlash maqsadlarida yoqiladi. Undan maʼlumotlarni qurilmangiz va kompyuter o‘rtasida ko‘chirish, ilovalarni xabarnomasiz o‘rnatish va jurnal maʼlumotlarini o‘qish uchun foydalaniladi."
+ "USB orqali nosozliklarni tuzatish faqat dasturlash maqsadlarida yoqiladi. Undan ma‘lumotlarni qurilmangiz va kompyuter o‘rtasida ko‘chirish, ilovalarni xabarnomasiz o‘rnatish va jurnal ma‘lumotlarini o‘qish uchun foydalaniladi."
"USB orqali nosozliklarni tuzatishga berilgan ruxsat siz hisobingizga kirgan barcha kompyuterlar uchun bekor qilinsinmi?"
"Dasturlash sozlamalariga ruxsat berilsinmi?"
"Bu sozlamalar faqat dasturlash maqsadlariga mo‘ljallangan. Shuning uchun, ular qurilmangizga va undagi ilovalariga shikast yetkazib, noto‘g‘ri ishlashiga sabab bo‘lishi mumkin."
diff --git a/packages/SettingsLib/res/values-zh-rTW/strings.xml b/packages/SettingsLib/res/values-zh-rTW/strings.xml
index c64130210d370..e85199f9ca0de 100644
--- a/packages/SettingsLib/res/values-zh-rTW/strings.xml
+++ b/packages/SettingsLib/res/values-zh-rTW/strings.xml
@@ -329,7 +329,7 @@
"顯示背景 ANR"
"為背景應用程式顯示「應用程式無回應」對話方塊"
"顯示通知管道警告"
- "當應用程式未經有效管道發布通知時，在畫面上顯示警告"
+ "當應用程式未經有效管道發佈通知時，在畫面上顯示警告"
"強制允許將應用程式寫入外部儲存空間"
"允許將任何應用程式寫入外部儲存空間 (無論資訊清單值為何)"
"將活動強制設為可調整大小"
diff --git a/packages/Shell/res/values-zh-rTW/strings.xml b/packages/Shell/res/values-zh-rTW/strings.xml
index 96671c8c0175a..fc6397dc20133 100644
--- a/packages/Shell/res/values-zh-rTW/strings.xml
+++ b/packages/Shell/res/values-zh-rTW/strings.xml
@@ -25,9 +25,9 @@
"系統即將在手機上顯示錯誤報告"
"選取即可分享錯誤報告"
"輕觸即可分享錯誤報告"
- "選取即可分享不包含螢幕截圖的錯誤報告；你也可以等候螢幕畫面擷取完畢"
- "輕觸即可分享無螢幕截圖的錯誤報告；你也可以等候螢幕畫面擷取完畢"
- "輕觸即可分享無螢幕截圖的錯誤報告；你也可以等候螢幕畫面擷取完畢"
+ "選取即可分享不包含螢幕擷取畫面的錯誤報告；你也可以等候螢幕畫面擷取完畢"
+ "輕觸即可分享無螢幕擷圖的錯誤報告；你也可以等候螢幕畫面擷取完畢"
+ "輕觸即可分享無螢幕擷圖的錯誤報告；你也可以等候螢幕畫面擷取完畢"
"錯誤報告的資料來自系統的各種記錄檔，當中可能包含敏感資料 (例如應用程式使用情形和位置資料)。請務必只與你信任的使用者和應用程式分享錯誤報告。"
"不要再顯示"
"錯誤報告"
@@ -35,9 +35,9 @@
"無法在 ZIP 檔案中加入錯誤報告"
"未命名"
"詳細資料"
- "螢幕截圖"
- "已成功拍攝螢幕截圖。"
- "無法拍攝螢幕截圖。"
+ "螢幕擷取畫面"
+ "已成功拍攝螢幕擷取畫面。"
+ "無法拍攝螢幕擷取畫面。"
"錯誤報告 #%d 的詳細資料"
"檔案名稱"
"錯誤標題"
diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml
index 938cb0dd3b120..9903cc04e97ae 100644
--- a/packages/SystemUI/res/values-en-rCA/strings.xml
+++ b/packages/SystemUI/res/values-en-rCA/strings.xml
@@ -401,7 +401,6 @@
"Less urgent notifications below"
"Tap again to open"
"Swipe up to open"
- "Swipe up to try again"
"This device is managed by your organisation"
"This device is managed by %s"
"Swipe from icon for phone"
@@ -545,7 +544,6 @@
"This keeps it in view until you unpin. Touch & hold Home to unpin."
"To unpin this screen, touch & hold Back and Overview buttons"
"To unpin this screen, touch & hold Back and Home buttons"
- "To unpin this screen, swipe up & hold"
"Got it"
"No, thanks"
"Screen pinned"
diff --git a/packages/SystemUI/res/values-en-rXC/strings.xml b/packages/SystemUI/res/values-en-rXC/strings.xml
index 139215aa196f8..d8c862affe08b 100644
--- a/packages/SystemUI/res/values-en-rXC/strings.xml
+++ b/packages/SystemUI/res/values-en-rXC/strings.xml
@@ -401,7 +401,6 @@
"Less urgent notifications below"
"Tap again to open"
"Swipe up to open"
- "Swipe up to try again"
"This device is managed by your organization"
"This device is managed by %s"
"Swipe from icon for phone"
@@ -545,7 +544,6 @@
"This keeps it in view until you unpin. Touch & hold Home to unpin."
"To unpin this screen, touch & hold Back and Overview buttons"
"To unpin this screen, touch & hold Back and Home buttons"
- "To unpin this screen, swipe up & hold"
"Got it"
"No thanks"
"Screen pinned"
diff --git a/packages/SystemUI/src/com/android/systemui/CornerHandleView.java b/packages/SystemUI/src/com/android/systemui/CornerHandleView.java
index a94952c5bc19f..6209c2c362063 100644
--- a/packages/SystemUI/src/com/android/systemui/CornerHandleView.java
+++ b/packages/SystemUI/src/com/android/systemui/CornerHandleView.java
@@ -19,6 +19,7 @@ package com.android.systemui;
import android.animation.ArgbEvaluator;
import android.content.Context;
import android.graphics.Canvas;
+import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Path;
import android.graphics.RectF;
@@ -27,6 +28,7 @@ import android.util.DisplayMetrics;
import android.view.ContextThemeWrapper;
import android.view.View;
+import com.android.internal.graphics.ColorUtils;
import com.android.settingslib.Utils;
/**
@@ -107,6 +109,7 @@ public class CornerHandleView extends View {
mPaint.setColor((int) ArgbEvaluator.getInstance().evaluate(darkIntensity,
mLightColor,
mDarkColor));
+ updateShadow();
if (getVisibility() == VISIBLE) {
invalidate();
}
@@ -118,6 +121,21 @@ public class CornerHandleView extends View {
canvas.drawPath(mPath, mPaint);
}
+ private void updateShadow() {
+ if (ColorUtils.calculateLuminance(mPaint.getColor()) > 0.7f) {
+ mPaint.setShadowLayer(/** radius */ 5,/** shadowDx */ 0, /** shadowDy */ -1,
+ /** color */ ColorUtils.setAlphaComponent(/** color */ Color.BLACK,
+ /** alpha */ 102));
+ } else {
+ mPaint.setShadowLayer(/** radius */ 0, /** shadowDx */ 0, /** shadowDy */ 0,
+ /** color */ Color.TRANSPARENT);
+ }
+
+ if (getVisibility() == VISIBLE) {
+ invalidate();
+ }
+ }
+
private static float convertDpToPixel(float dp, Context context) {
return dp * ((float) context.getResources().getDisplayMetrics().densityDpi
/ DisplayMetrics.DENSITY_DEFAULT);
diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistHandleReminderExpBehavior.java b/packages/SystemUI/src/com/android/systemui/assist/AssistHandleReminderExpBehavior.java
index 9cf7385412760..5dd3cb1d8bdcc 100644
--- a/packages/SystemUI/src/com/android/systemui/assist/AssistHandleReminderExpBehavior.java
+++ b/packages/SystemUI/src/com/android/systemui/assist/AssistHandleReminderExpBehavior.java
@@ -383,6 +383,15 @@ final class AssistHandleReminderExpBehavior implements BehaviorController {
mIsLearned =
mLearningCount >= getLearningCount() || mLearningTimeElapsed >= getLearningTimeMs();
+
+ mHandler.post(this::recordLearnTimeElapsed);
+ }
+
+ private void recordLearnTimeElapsed() {
+ if (mContext != null) {
+ Settings.Secure.putLong(
+ mContext.getContentResolver(), LEARNING_TIME_ELAPSED_KEY, mLearningTimeElapsed);
+ }
}
private void resetConsecutiveTaskSwitches() {
diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
index e42eb0a19f74f..eb60b3db7a112 100644
--- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
+++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
@@ -21,6 +21,7 @@ import android.os.AsyncTask;
import android.os.Binder;
import android.os.Bundle;
import android.os.Handler;
+import android.os.HandlerThread;
import android.os.RemoteException;
import android.os.SystemClock;
import android.os.UserHandle;
@@ -163,8 +164,10 @@ public class AssistManager implements ConfigurationChangedReceiver {
mAssistUtils = new AssistUtils(context);
mAssistDisclosure = new AssistDisclosure(context, new Handler());
mPhoneStateMonitor = new PhoneStateMonitor(context);
- mHandleController =
- new AssistHandleBehaviorController(context, mAssistUtils, new Handler());
+ final HandlerThread assistHandleThread = new HandlerThread("AssistHandleThread");
+ assistHandleThread.start();
+ mHandleController = new AssistHandleBehaviorController(
+ context, mAssistUtils, assistHandleThread.getThreadHandler());
registerVoiceInteractionSessionListener();
mInterestingConfigChanges = new InterestingConfigChanges(ActivityInfo.CONFIG_ORIENTATION
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ru/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ru/strings.xml
index 0ff85fe39c99a..dc77981e6c958 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ru/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-ru/strings.xml
@@ -17,5 +17,5 @@
- "В правом углу"
+ "Сделать вырез в углу"
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ru/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ru/strings.xml
index 2493da34af1fe..a02eaf7bdc264 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ru/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-ru/strings.xml
@@ -17,5 +17,5 @@
- "Сверху и снизу"
+ "Увеличить вырез вдвое"
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ru/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ru/strings.xml
index 89ac1c3e1b117..1d1656d2862ef 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ru/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-ru/strings.xml
@@ -17,5 +17,5 @@
- "Сверху"
+ "Сделать вырез выше"