Merge branch 'lineage-22.2' of https://github.com/LineageOS/android_frameworks_base into fifteen-los

Author: Jayant-Deshmukh

data/etc/platform.xml

@@ -165,6 +165,7 @@
     <assign-permission name="android.permission.REGISTER_STATS_PULL_ATOM" uid="media" />
     <assign-permission name="android.permission.INTERACT_ACROSS_USERS" uid="media" />
     <assign-permission name="android.permission.LOG_FOREGROUND_RESOURCE_USE" uid="media" />
+    <assign-permission name="android.permission.CAPTURE_AUDIO_OUTPUT" uid="media" />
 
     <assign-permission name="android.permission.INTERNET" uid="media" />
 

packages/SystemUI/res/values-ast-rES/cm_strings.xml

@@ -76,4 +76,5 @@
     <string name="screenrecord_hevc_switch_summary">Usa un codificador HEVC más eficiente</string>
     <string name="battery_notification_channel_tv">Alvertencia de la batería</string>
     <string name="screenshot_delete_label">Desaniciar</string>
+    <string name="screenshot_delete_description">Desaniciar la captura</string>
 </resources>

packages/SystemUI/res/values-be/cm_strings.xml

@@ -30,15 +30,13 @@
     <string name="accessibility_quick_settings_ambient_display_off">Ambient Display выключаны</string>
     <string name="accessibility_quick_settings_ambient_display_on">Ambient Display уключаны.</string>
     <string name="quick_settings_aod_label">AOD</string>
-    <string name="quick_settings_aod_off_powersave_label">AOD выключаны\nЭканомія акумулятара</string>
     <string name="quick_settings_caffeine_label">Кафеін</string>
     <string name="accessibility_quick_settings_caffeine_off">Кафеін выключаны.</string>
     <string name="accessibility_quick_settings_caffeine_on">Кафеін уключаны.</string>
     <string name="quick_settings_heads_up_label">Усплывальныя апавяшчэнні</string>
     <string name="accessibility_quick_settings_heads_up_off">Усплывальныя апавяшчэнні выключаны.</string>
     <string name="accessibility_quick_settings_heads_up_on">Усплывальныя апавяшчэнні ўключаны.</string>
     <string name="quick_settings_powershare_label">Бесправадны PowerShare</string>
-    <string name="quick_settings_powershare_off_powersave_label">Бесправадны PowerShare выключаны\nЭканомія акумулятара</string>
     <string name="quick_settings_powershare_off_low_battery_label">Бесправадны PowerShare выключаны\nНізкі зарад акумулятара</string>
     <string name="quick_settings_powershare_enabled_label">Бесправадны PowerShare уключаны</string>
     <string name="quick_settings_reading_mode">Рэжым чытання</string>
@@ -53,7 +51,6 @@
     <string name="quick_settings_usb_tether_label">USB-мадэм</string>
     <string name="quick_settings_vpn_label">VPN</string>
     <string name="quick_settings_vpn_connect_dialog_title">Падключыцца да\u2026</string>
-    <string name="vpn_credentials_hint">Увядзіце вашы ўліковыя даныя для падключэння да <xliff:g id="name">%s</xliff:g></string>
     <string name="vpn_credentials_username">Імя карыстальніка</string>
     <string name="vpn_credentials_password">Пароль</string>
     <string name="vpn_credentials_dialog_connect">Падключыцца</string>

packages/SystemUI/res/values-bg/cm_strings.xml

@@ -78,4 +78,5 @@
     <string name="screenshot_delete_label">Изтрий</string>
     <string name="screenshot_delete_description">Изтрий екранна снимка</string>
     <string name="screen_pinning_description_no_navbar">Това го държи в изглед, докато не го освободите. Натиснете &amp; задръжте бутона \"Назад\" за освобождаване.</string>
+    <string name="screen_pinning_toast_no_navbar">За да откачите този екран, докоснете и задръжте бутона \"Назад\"</string>
 </resources>

packages/SystemUI/res/values-ko/cm_strings.xml

@@ -77,4 +77,6 @@
     <string name="battery_notification_channel_tv">배터리 경고</string>
     <string name="screenshot_delete_label">삭제</string>
     <string name="screenshot_delete_description">스크린샷 삭제</string>
+    <string name="screen_pinning_description_no_navbar">고정을 해제하기 전까지 계속 볼 수 있습니다. 고정을 해제하려면 뒤로 가기 버튼을 길게 누르세요.</string>
+    <string name="screen_pinning_toast_no_navbar">이 화면을 고정 해제하려면 뒤로 가기 버튼을 길게 누르세요.</string>
 </resources>

packages/SystemUI/res/values-tr/cm_strings.xml

@@ -66,6 +66,17 @@
     <string name="vpn_credentials_password">Şifre</string>
     <string name="vpn_credentials_dialog_connect">Bağlan</string>
     <string name="status_bar_firewall">Güvenlik Duvarı</string>
+    <string name="screenrecord_lowquality_label">Daha düşük kalite</string>
+    <string name="screenrecord_lowquality_summary">Daha küçük dosya boyutu için</string>
+    <string name="screenrecord_longer_timeout_switch_label">Daha büyük dosya boyutu sınırı</string>
+    <string name="screenrecord_longer_timeout_switch_summary">Kayıt boyutunu 15 GB ile sınırlayın</string>
+    <string name="screenrecord_skip_time_label">Zamanlayıcıyı atla</string>
+    <string name="screenrecord_skip_time_summary">3 saniye beklemeyi kaldır</string>
+    <string name="screenrecord_hevc_switch_label">HEVC kodlayıcı</string>
+    <string name="screenrecord_hevc_switch_summary">Daha verimli HEVC kodlayıcıyı kullanın</string>
+    <string name="battery_notification_channel_tv">Pil uyarısı</string>
     <string name="screenshot_delete_label">Sil</string>
     <string name="screenshot_delete_description">Ekran görüntüsünü sil</string>
+    <string name="screen_pinning_description_no_navbar">Bu işlem, siz sabitlemeyi kaldırana kadar ekranı görünür durumda tutar. Sabitlemeyi kaldırmak için Geri\'ye dokunun ve basılı tutun.</string>
+    <string name="screen_pinning_toast_no_navbar">Bu ekran görünümünü kaldırmak için, Geri tuşuna dokunun ve basılı tutun</string>
 </resources>

packages/SystemUI/src/com/android/systemui/qs/tiles/UsbTetherTile.java

@@ -121,7 +121,8 @@ public Intent getLongClickIntent() {
         public void onReceive(Context context, Intent intent) {
             mUsbConnected = intent.getBooleanExtra(UsbManager.USB_CONNECTED, false);
             if (mUsbConnected && mTetheringManager.isTetheringSupported()) {
-                mUsbTetherEnabled = intent.getBooleanExtra(UsbManager.USB_FUNCTION_RNDIS, false);
+                mUsbTetherEnabled = intent.getBooleanExtra(UsbManager.USB_FUNCTION_RNDIS, false) ||
+                        intent.getBooleanExtra(UsbManager.USB_FUNCTION_NCM, false);
             } else {
                 mUsbTetherEnabled = false;
             }