From 069f7b255f25490641586df8b0ecb51d7a32e82d Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 15 Jun 2021 16:43:47 +0000 Subject: [PATCH 1/5] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Ib3c5fa017eb0707a197aa87281adcde5d6f317e9 --- quickstep/res/values-cs/strings.xml | 8 ++++---- quickstep/res/values-de/strings.xml | 4 ++-- quickstep/res/values-fi/strings.xml | 8 ++++---- quickstep/res/values-hr/strings.xml | 4 ++-- quickstep/res/values-it/strings.xml | 2 +- quickstep/res/values-iw/strings.xml | 8 ++++---- quickstep/res/values-ja/strings.xml | 6 +++--- quickstep/res/values-kk/strings.xml | 4 ++-- quickstep/res/values-kn/strings.xml | 6 +++--- quickstep/res/values-ko/strings.xml | 4 ++-- quickstep/res/values-ky/strings.xml | 2 +- quickstep/res/values-mn/strings.xml | 4 ++-- quickstep/res/values-ne/strings.xml | 10 +++++----- quickstep/res/values-ru/strings.xml | 6 +++--- quickstep/res/values-sl/strings.xml | 10 +++++----- quickstep/res/values-sv/strings.xml | 15 +++++---------- quickstep/res/values-te/strings.xml | 8 ++++---- quickstep/res/values-th/strings.xml | 2 +- quickstep/res/values-zh-rTW/strings.xml | 12 ++++++------ 19 files changed, 59 insertions(+), 64 deletions(-) diff --git a/quickstep/res/values-cs/strings.xml b/quickstep/res/values-cs/strings.xml index b8d24cf24e..101f86557a 100644 --- a/quickstep/res/values-cs/strings.xml +++ b/quickstep/res/values-cs/strings.xml @@ -33,14 +33,14 @@ "Návrhy aplikací pro vás" "Nechte si ve spodním řádku na ploše zobrazovat návrhy aplikací" "Nechte si na řádku oblíbených na ploše zobrazovat návrhy aplikací" - "Mějte nejpoužívanější aplikace k dispozici přímo na ploše. Návrhy se budou měnit v závislosti na sledech činností. Aplikace ve spodním řádku se přesunou na vaši plochu." - "Mějte nejpoužívanější aplikace k dispozici přímo na ploše. Návrhy se budou měnit v závislosti na sledech činností. Aplikace na řádku oblíbených se přesunou na plochu." - "Mějte nejpoužívanější aplikace k dispozici přímo na ploše. Návrhy se budou měnit v závislosti na sledech činností. Aplikace ve spodním řádku se přesunou do nové složky." + "Mějte nejpoužívanější aplikace k dispozici přímo na ploše. Návrhy se budou měnit podle vašich zvyklostí. Aplikace ve spodním řádku se přesunou nahoru na vaši plochu." + "Mějte nejpoužívanější aplikace k dispozici přímo na ploše. Návrhy se budou měnit podle vašich zvyklostí. Aplikace na řádku oblíbených se přesunou na plochu." + "Mějte nejpoužívanější aplikace k dispozici přímo na ploše. Návrhy se budou měnit podle vašich zvyklostí. Aplikace ve spodním řádku se přesunou do nové složky." "Zobrazovat návrhy aplikací" "Ne, díky" "Nastavení" "Zde se zobrazují nejpoužívanější aplikace (které se mění podle sledů činností)" - "Chcete-li získat návrhy aplikací, přetáhněte aplikace z dolního řádku" + "Návrhy aplikací získáte přetažením aplikací z dolního řádku" "Volné místo bylo vyplněno návrhy aplikací" "Návrhy aplikací jsou povoleny" "Návrhy aplikací jsou zakázány" diff --git a/quickstep/res/values-de/strings.xml b/quickstep/res/values-de/strings.xml index 1e0cd3d8a8..17849e0bed 100644 --- a/quickstep/res/values-de/strings.xml +++ b/quickstep/res/values-de/strings.xml @@ -24,7 +24,7 @@ "Keine kürzlich verwendeten Elemente" "Einstellungen zur App-Nutzung" "Alle Apps schließen" - "Zuletzt aktive Apps" + "Kürzlich geöffnete Apps" "%1$s, %2$s" "< 1 Min." "Heute noch %1$s" @@ -42,7 +42,7 @@ "Hier erscheinen die meistverwendeten Apps. Die Angaben können sich je nach deiner gewöhnlichen Nutzung ändern" "Ziehe Apps aus der unteren Reihe heraus, um Vorschläge für Apps zu erhalten" "App-Vorschläge in freiem Bereich hinzugefügt" - "Funktion \"App-Vorschläge\" aktiviert" + "Funktion „App-Vorschläge“ aktiviert" "Funktion \"App-Vorschläge\" deaktiviert" "Vorgeschlagene App: %1$s" "Wische vom äußersten linken Bildschirmrand." diff --git a/quickstep/res/values-fi/strings.xml b/quickstep/res/values-fi/strings.xml index 5c19b23658..e81906f95b 100644 --- a/quickstep/res/values-fi/strings.xml +++ b/quickstep/res/values-fi/strings.xml @@ -31,16 +31,16 @@ "Sovellusehdotukset" "Kaikki sovellukset" "Sovellusennusteet" - "Näytä sovellusehdotuksia aloitusnäytön alimmaisella rivillä" + "Näytä sovellusehdotuksia aloitusnäytön alimmalla rivillä" "Näytä sovellusehdotuksia aloitusnäytön Suosikit-rivillä" - "Voit avata käytetyimmät sovellukset kätevästi aloitusnäytöltä. Ehdotukset muuttuvat rutiiniesi perusteella. Alimmaisella rivillä olevat sovellukset siirretään aloitusnäytön yläosaan." + "Voit avata käytetyimmät sovellukset kätevästi aloitusnäytöltä. Ehdotukset muuttuvat rutiiniesi perusteella. Alimmalla rivillä olevat sovellukset siirretään aloitusnäytön yläosaan." "Voit avata käytetyimmät sovellukset kätevästi aloitusnäytöltä. Ehdotukset muuttuvat rutiiniesi perusteella. Suosikit-rivillä olevat sovellukset siirretään aloitusnäytölle." - "Voit avata käytetyimmät sovellukset kätevästi aloitusnäytöltä. Ehdotukset muuttuvat rutiiniesi perusteella. Alimmaisella rivillä olevat sovellukset siirretään uuteen kansioon." + "Voit avata käytetyimmät sovellukset kätevästi aloitusnäytöltä. Ehdotukset muuttuvat rutiiniesi perusteella. Alimmalla rivillä olevat sovellukset siirretään uuteen kansioon." "Näytä sovellusehdotuksia" "Ei kiitos" "Asetukset" "Käytetyimmät sovellukset näkyvät täällä ja muuttuvat rutiiniesi perusteella" - "Siirrä sovelluksia pois alimmaiselta riviltä, niin voit saada sovellusehdotuksia" + "Siirrä sovelluksia pois alimmalta riviltä, niin voit saada sovellusehdotuksia" "Sovellusehdotuksia lisätty tyhjään kohtaan" "Sovellusehdotukset käytössä" "Sovellusehdotukset on poistettu käytöstä" diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml index 0e3444ade3..c3520cbcd5 100644 --- a/quickstep/res/values-hr/strings.xml +++ b/quickstep/res/values-hr/strings.xml @@ -28,10 +28,10 @@ "%1$s, %2$s" "< 1 min" "Još %1$s danas" - "Predložene aplikacije" + "Prijedlozi aplikacija" "Sve aplikacije" "Vaše predviđene aplikacije" - "Prijedloge aplikacija vidjet ćete u donjem retku početnog zaslona" + "Primajte prijedloge aplikacija u donjem retku početnog zaslona" "Primajte prijedloge aplikacija u retku omiljenih na početnom zaslonu" "Lako pristupite najčešće upotrebljavanim aplikacijama s početnog zaslona. Prijedlozi će se mijenjati na temelju vaših rutina. Aplikacije iz donjeg retka pomaknut će se na početni zaslon." "Lako pristupite najčešće upotrebljavanim aplikacijama s početnog zaslona. Prijedlozi će se mijenjati na temelju vaših rutina. Aplikacije koje se nalaze u retku omiljenih pomaknut će se na početni zaslon." diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml index ea7454ae3c..b64926670a 100644 --- a/quickstep/res/values-it/strings.xml +++ b/quickstep/res/values-it/strings.xml @@ -19,7 +19,7 @@ - "Blocca" + "Blocca su schermo" "Forma libera" "Nessun elemento recente" "Impostazioni di utilizzo delle app" diff --git a/quickstep/res/values-iw/strings.xml b/quickstep/res/values-iw/strings.xml index 5b89d2c3db..ed69faaba5 100644 --- a/quickstep/res/values-iw/strings.xml +++ b/quickstep/res/values-iw/strings.xml @@ -33,16 +33,16 @@ "האפליקציות החזויות שלך" "קבלת הצעות לאפליקציות בשורה התחתונה של מסך הבית" "קבלת הצעות לאפליקציות בשורת המועדפות של מסך הבית" - "גישה נוחה לאפליקציות הכי נפוצות ישירות ממסך הבית. ההצעות ישתנו בהתאם להרגלי השימוש שלך. אפליקציות שמופיעות בשורה התחתונה יעברו למעלה למסך הבית." + "גישה נוחה לאפליקציות שנעשה בהן שימוש תכוף – ישירות ממסך הבית. ההצעות ישתנו בהתאם להרגלי השימוש שלך. אפליקציות שמופיעות בשורה התחתונה יעברו למעלה למסך הבית." "גישה נוחה לאפליקציות שהשתמשת בהן הכי הרבה, ישירות ממסך הבית. ההצעות ישתנו בהתאם להרגלי השימוש שלך. אפליקציות בשורת המועדפות יועברו למסך הבית." - "גישה נוחה לאפליקציות הכי נפוצות ישירות ממסך הבית. ההצעות ישתנו בהתאם להרגלי השימוש שלך. אפליקציות שמופיעות בשורה התחתונה יעברו למעלה למסך הבית." + "גישה נוחה לאפליקציות שנעשה בהן שימוש תכוף – ישירות ממסך הבית. ההצעות ישתנו בהתאם להרגלי השימוש שלך. אפליקציות שמופיעות בשורה התחתונה יעברו לתיקייה חדשה." "קבלת הצעות לאפליקציות" "לא, תודה" "הגדרות" "רוב האפליקציות הכי נפוצות מופיעות כאן ומשתנות בהתאם להרגלי השימוש שלך" - "יש לגרור אפליקציות מהשורה התחתונה כדי לקבל הצעות לאפליקציות" + "כדי לקבל הצעות נוספות לאפליקציות, צריך לגרור אפליקציות מהשורה התחתונה" "הצעות לאפליקציות נוספו לאזור ריק" - "ההצעות לאפליקציות מופעלות" + "התכונה \'הצעות לאפליקציות\' מופעלת" "ההצעות לאפליקציות מושבתות" "האפליקציות החזויות: %1$s" "חשוב להקפיד להחליק מהקצה הימני." diff --git a/quickstep/res/values-ja/strings.xml b/quickstep/res/values-ja/strings.xml index 0c2a03b64e..38accd1062 100644 --- a/quickstep/res/values-ja/strings.xml +++ b/quickstep/res/values-ja/strings.xml @@ -31,9 +31,9 @@ "アプリの候補" "すべてのアプリ" "予測されたアプリ" - "ホーム画面の一番下の行でアプリの候補を利用できます" + "ホーム画面の一番下にアプリの候補を表示できます" "ホーム画面のお気に入りの行でアプリの候補を利用できます" - "ホーム画面で、使用頻度の高いアプリに簡単にアクセスできるようになります。アプリの候補はルーティンに応じて変わります。一番下の行にあるアプリがホーム画面に移動します。" + "ホーム画面で、使用頻度の高いアプリに簡単にアクセスできるようになります。アプリの候補はルーティンに応じて変わります。一番下の行にあるアプリは上に移動します。" "ホーム画面で、使用頻度の高いアプリに簡単にアクセスできるようになります。アプリの候補はルーティンに応じて変わります。お気に入りの行にあるアプリがホーム画面に移動します。" "ホーム画面で、使用頻度の高いアプリに簡単にアクセスできるようになります。アプリの候補はルーティンに応じて変わります。一番下の行にあるアプリが新しいフォルダに移動します。" "アプリの候補を利用" @@ -42,7 +42,7 @@ "使用頻度の高いアプリがここに表示されます(ルーティンに応じて変わります)" "一番下の行からアプリをドラッグするとアプリの候補が表示されます" "空いたスペースにアプリの候補が追加されます" - "アプリの候補は有効です" + "アプリの候補表示が有効です" "アプリの候補は無効です" "予測されたアプリ: %1$s" "一番左端からスワイプしてください。" diff --git a/quickstep/res/values-kk/strings.xml b/quickstep/res/values-kk/strings.xml index 292f4cb037..52d8b91c5c 100644 --- a/quickstep/res/values-kk/strings.xml +++ b/quickstep/res/values-kk/strings.xml @@ -29,7 +29,7 @@ "< 1 мин" "Бүгін %1$s қалды" "Ұсынылған қолданбалар" - "Барлық қолданбалар" + "Барлық қолданба" "Ұсынылатын қолданбалар" "Негізгі экранның төменгі жолында қолданбаларды ұсыну" "Ұсынылған қолданбалар негізгі экранда таңдаулылар арасында көрсетілетін болады" @@ -42,7 +42,7 @@ "Жиі пайдаланылатын қолданбалар осы жерде көрсетіледі. Олар күнделікті әрекеттеріңізге сәйкес өзгереді." "Ұсынылған қолданбаларды көру үшін төменгі қатардан керектерін сүйреп шығарыңыз." "Ұсынылған қолданбалар бос орынға қосылды." - "\"Ұсынылған қолданбалар\" функциясы қосулы." + "Ұсынылған қолданбалар функциясы қосылды." "\"Ұсынылған қолданбалар\" функциясы өшірулі." "Болжалды қолданба: %1$s" "Сол жақтағы ең шеткі нүктеден бастап сырғытыңыз." diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml index 437fdbaae0..306f153035 100644 --- a/quickstep/res/values-kn/strings.xml +++ b/quickstep/res/values-kn/strings.xml @@ -33,9 +33,9 @@ "ನಿಮ್ಮ ಮುನ್ಸೂಚಿತ ಆ್ಯಪ್‌ಗಳು" "ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಭಾಗದ ಸಾಲಿನಲ್ಲಿ ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ಪಡೆಯಿರಿ" "ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನ ಮೆಚ್ಚಿನವುಗಳ ಸಾಲಿನಲ್ಲಿ ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ಪಡೆಯಿರಿ" - "ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿಯೇ ನೀವು ಹೆಚ್ಚು ಬಳಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಸುಲಭವಾಗಿ ಪ್ರವೇಶಿಸಿ. ನಿಮ್ಮ ದಿನಚರಿಯನ್ನು ಆಧರಿಸಿ ಸಲಹೆಗಳು ಬದಲಾಗುತ್ತವೆ. ಕೆಳಭಾಗದ ಸಾಲಿನಲ್ಲಿನ ಆ್ಯಪ್‌ಗಳು ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ ಚಲಿಸುತ್ತವೆ." - "ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿಯೇ ನೀವು ಹೆಚ್ಚು ಬಳಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಸುಲಭವಾಗಿ ಪ್ರವೇಶಿಸಿ. ನಿಮ್ಮ ದಿನಚರಿಯನ್ನು ಆಧರಿಸಿ ಸಲಹೆಗಳು ಬದಲಾಗುತ್ತವೆ. ಮೆಚ್ಚಿನವುಗಳ ಸಾಲಿನಲ್ಲಿನ ಆ್ಯಪ್‌ಗಳು ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ಗೆ ಚಲಿಸುತ್ತವೆ." - "ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿಯೇ ನೀವು ಹೆಚ್ಚು ಬಳಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಸುಲಭವಾಗಿ ಪ್ರವೇಶಿಸಿ. ನಿಮ್ಮ ದಿನಚರಿಯನ್ನು ಆಧರಿಸಿ ಸಲಹೆಗಳು ಬದಲಾಗುತ್ತವೆ. ಕೆಳಭಾಗದ ಸಾಲಿನಲ್ಲಿನ ಆ್ಯಪ್‌ಗಳು ಹೊಸ ಫೋಲ್ಡರ್‌ಗೆ ಚಲಿಸುತ್ತವೆ." + "ನೀವು ಹೆಚ್ಚು ಬಳಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿಯೇ ಸುಲಭವಾಗಿ ಪ್ರವೇಶಿಸಿ. ನಿಮ್ಮ ದಿನಚರಿಯನ್ನು ಆಧರಿಸಿ ಸಲಹೆಗಳು ಬದಲಾಗುತ್ತವೆ. ಕೆಳಭಾಗದ ಸಾಲಿನಲ್ಲಿನ ಆ್ಯಪ್‌ಗಳು ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ ಚಲಿಸುತ್ತವೆ." + "ನೀವು ಹೆಚ್ಚು ಬಳಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿಯೇ ಸುಲಭವಾಗಿ ಪ್ರವೇಶಿಸಿ. ನಿಮ್ಮ ದಿನಚರಿಯನ್ನು ಆಧರಿಸಿ ಸಲಹೆಗಳು ಬದಲಾಗುತ್ತವೆ. ಮೆಚ್ಚಿನವುಗಳ ಸಾಲಿನಲ್ಲಿನ ಆ್ಯಪ್‌ಗಳು ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ಗೆ ಚಲಿಸುತ್ತವೆ." + "ನೀವು ಹೆಚ್ಚು ಬಳಸಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿಯೇ ಸುಲಭವಾಗಿ ಪ್ರವೇಶಿಸಿ. ನಿಮ್ಮ ದಿನಚರಿಯನ್ನು ಆಧರಿಸಿ ಸಲಹೆಗಳು ಬದಲಾಗುತ್ತವೆ. ಕೆಳಭಾಗದ ಸಾಲಿನಲ್ಲಿನ ಆ್ಯಪ್‌ಗಳು ಹೊಸ ಫೋಲ್ಡರ್‌ಗೆ ಚಲಿಸುತ್ತವೆ." "ಆ್ಯಪ್ ಸಲಹೆಗಳನ್ನು ಪಡೆಯಿರಿ" "ಬೇಡ" "ಸೆಟ್ಟಿಂಗ್‌ಗಳು" diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml index b31dba9735..1666a5a1f7 100644 --- a/quickstep/res/values-ko/strings.xml +++ b/quickstep/res/values-ko/strings.xml @@ -57,7 +57,7 @@ "왼쪽에서 스와이프하여 뒤로 돌아가세요" "돌아가려면 오른쪽에서 스와이프하세요" "마지막 화면으로 돌아가려면 왼쪽 가장자리에서 화면 중앙으로 스와이프하세요" - "오른쪽 가장자리에서 화면 중앙으로 스와이프해도 마지막 화면으로 돌아갈 수도 있습니다. 지금 동작을 취해 보세요" + "오른쪽 가장자리에서 화면 중앙으로 스와이프해도 마지막 화면으로 돌아갈 수 있습니다. 지금 동작을 취해 보세요" "화면 하단 가장자리에서 위로 스와이프하세요." "손가락을 떼기 전에 멈추지 않아야 합니다." "위로 똑바르게 스와이프하세요." @@ -81,7 +81,7 @@ "설정 완료" "위로 스와이프하여 홈으로 이동" "휴대전화를 사용할 준비가 되었습니다." - "탐색 접근성 설정" + "접근성 탐색 설정" "공유" "스크린샷" "이 작업은 앱 또는 조직에서 허용되지 않습니다." diff --git a/quickstep/res/values-ky/strings.xml b/quickstep/res/values-ky/strings.xml index eb19e13102..7f6741596e 100644 --- a/quickstep/res/values-ky/strings.xml +++ b/quickstep/res/values-ky/strings.xml @@ -40,7 +40,7 @@ "Жок, рахмат" "Жөндөөлөр" "Көп иштетилген колдонмолор ушул жерде көрүнүп, тартиптин негизинде өзгөрөт" - "Сунуштарды алып туруу үчүн, ылдый жактагы тилкедеги колдонмолорду сүйрөп келиңиз" + "Сунуштарды алып туруу үчүн ылдый жактагы тилкедеги колдонмолорду сүйрөп келиңиз" "Сунушталган колдонмолор бош жерге кошулат" "Сунушталган колдонмолор функциясы иштетилди" "Сунушталган колдонмолор функциясы өчүрүлгөн" diff --git a/quickstep/res/values-mn/strings.xml b/quickstep/res/values-mn/strings.xml index 43d9a27cc3..1ef7299f70 100644 --- a/quickstep/res/values-mn/strings.xml +++ b/quickstep/res/values-mn/strings.xml @@ -31,9 +31,9 @@ "Санал болгож буй аппууд" "Бүх апп" "Таны таамагласан аппууд" - "Үндсэн нүүрнийхээ доод мөрөнд санал болгож буй аппуудыг аваарай" + "Үндсэн нүүрнийхээ доод мөрд санал болгож буй аппуудыг аваарай" "Үндсэн нүүрний дуртай мөрнөөсөө санал болгож буй аппуудыг аваарай" - "Хамгийн их ашигладаг аппууддаа Үндсэн нүүрнээс хялбархан хандаарай. Санал болгож буй аппуудыг таны хэвшлээс хамаарч өөрчилнө. Доод мөрөнд буй аппуудыг таны Үндсэн нүүр лүү дээш зөөнө." + "Хамгийн их ашигладаг аппууддаа Үндсэн нүүрнээс хялбархан хандаарай. Санал болгож буй аппуудыг таны хэвшлээс хамаарч өөрчилнө. Доод мөрд буй аппуудыг таны Үндсэн нүүр лүү дээш зөөнө." "Хамгийн их ашигладаг аппууддаа Үндсэн нүүрнээсээ хялбархан хандаарай. Санал болголтыг таны хэвшлээс хамааран өөрчилнө. Дуртай мөрөнд буй аппуудыг таны үндсэн нүүр лүү зөөнө." "Хамгийн их ашигладаг аппууддаа Үндсэн нүүрнээс хялбархан хандаарай. Санал болгож буй аппуудыг таны хэвшлээс хамаарч өөрчилнө. Доод мөрөнд буй аппуудыг шинэ фолдер луу зөөнө." "Санал болгож буй аппуудыг авах" diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml index f1351f186d..dea056b557 100644 --- a/quickstep/res/values-ne/strings.xml +++ b/quickstep/res/values-ne/strings.xml @@ -31,16 +31,16 @@ "एपसम्बन्धी सुझावहरू" "सबै एपहरू" "तपाईंलाई चाहिने एपहरू" - "तपाईंको गृह स्क्रिनको पुछारको पङ्क्तिमा सिफारिस गरिएका एपहरू प्राप्त गर्नुहोस्" - "आफ्नो होम स्क्रिनको मन पर्ने नामक पङ्क्तिमा सिफारिस गरिएका एपहरू प्राप्त गर्नुहोस्" - "गृह स्क्रिनबाटै आफूले सबैभन्दा बढी प्रयोग गर्ने एप सजिलै चलाउनुहोस्। सिफारिस गरिने एपहरूको क्रम तपाईंले एप प्रयोग गर्ने समयतालिकाअनुसार बदलिने छ। फेदको पङ्क्तिमा रहेका एपहरू तपाईंको गृह स्क्रिनको सिरानमा सर्ने छन्।" + "आफ्नो होम स्क्रिनको पुछारको रोमा एपसम्बन्धी सिफारिस प्राप्त गर्नुहोस्" + "आफ्नो होम स्क्रिनको मन पर्ने नामक पङ्क्तिमा एपसम्बन्धी सिफारिस प्राप्त गर्नुहोस्" + "आफूले सबैभन्दा बढी प्रयोग गर्ने एप होम स्क्रिनबाट सजिलै चलाउनुहोस्। सिफारिस गरिने एपहरूको क्रम तपाईंले एप प्रयोग गर्ने समयतालिकाअनुसार बदलिने छ। फेदको रोमा रहेका एपहरू तपाईंको होम स्क्रिनको सिरानमा सर्ने छन्।" "आफूले सबैभन्दा बढी प्रयोग गर्ने एपहरू गृह स्क्रिनबाटै सजिलैसँग खोल्नुहोस्। सिफारिस गरिने एपहरूको क्रम तपाईंको दिनचर्याअनुसार बदलिने छ। मन पर्ने नामक पङ्क्तिमा रहेका एपहरू सारेर होम स्क्रिनमा लगिने छन्।" "गृह स्क्रिनबाटै आफूले सबैभन्दा बढी प्रयोग गर्ने एप सजिलै चलाउनुहोस्। सिफारिस गरिने एपहरूको क्रम तपाईंले एप प्रयोग गर्ने समयतालिकाअनुसार बदलिने छ। फेदको पङ्क्तिमा रहेका एपहरू एउटा नयाँ फोल्डरमा सर्ने छन्।" - "सिफारिस गरिएका एपहरू प्राप्त गर्नुहोस्" + "एपसम्बन्धी सिफारिस प्राप्त गर्नुहोस्" "पर्दैन धन्यवाद" "सेटिङ" "सबैभन्दा बढी प्रयोग हुने एपहरू यहाँ देखिन्छन् र यी एपहरूको क्रम तपाईंले एप प्रयोग गर्ने समयतालिकाअनुसार बदलिरहन्छ" - "सिफारिस गरिएका एपहरू प्राप्त गर्न फेदको पङ्क्तिमा रहेका एपहरू ड्र्याग गरी हटाउनुहोस्" + "एपसम्बन्धी सिफारिस प्राप्त गर्न फेदको रोमा रहेका एपहरू ड्र्याग गरी हटाउनुहोस्" "खाली ठाउँमा सिफारिस गरिएका एपहरू थपिए" "सिफारिस गरिएका एपहरू देखाउने सुविधा सक्षम पारिएका छन्" "सिफारिस गरिएका एपहरू देखाउने सुविधा असक्षम पारिएको छ" diff --git a/quickstep/res/values-ru/strings.xml b/quickstep/res/values-ru/strings.xml index 6d28815ef2..ef05954ce8 100644 --- a/quickstep/res/values-ru/strings.xml +++ b/quickstep/res/values-ru/strings.xml @@ -33,14 +33,14 @@ "Ваши рекомендуемые приложения" "Рекомендуемые приложения будут появляться в нижнем ряду на главном экране" "Рекомендуемые приложения будут появляться в разделе избранных на главном экране" - "Быстрый доступ к часто используемым приложениям на главном экране. Список меняется с учетом ваших привычек. Приложения из нижнего ряда будут перемещены вверх на главный экран." + "Приложения, которыми вы часто пользуетесь, будут доступны прямо на главном экране. Их список может меняться с учетом ваших предпочтений. Приложения из нижнего ряда будут перемещены выше на главном экране." "Включите функцию для быстрого доступа к часто используемым приложениям на главном экране. Список меняется с учетом ваших действий. Приложения из раздела избранных будут перемещены на главный экран." - "Быстрый доступ к часто используемым приложениям на главном экране. Список меняется с учетом ваших привычек. Приложения из нижнего ряда будут перемещены в новую папку." + "Приложения, которыми вы часто пользуетесь, будут доступны прямо на главном экране. Их список может меняться с учетом ваших предпочтений. Приложения из нижнего ряда будут перемещены в новую папку." "Показывать рекомендации" "Отмена" "Настройки" "Здесь появляются часто используемые приложения. Список меняется с учетом ваших привычек." - "Перетащите приложения из нижнего ряда, чтобы получить рекомендации" + "Перетащите приложения из нижнего ряда, чтобы получить рекомендации." "Рекомендуемые приложения будут появляться на свободных местах." "Функция \"Рекомендуемые приложения\" включена." "Функция \"Рекомендуемые приложения\" отключена." diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml index 19982dfcb9..ed035aa74e 100644 --- a/quickstep/res/values-sl/strings.xml +++ b/quickstep/res/values-sl/strings.xml @@ -33,17 +33,17 @@ "Predvidene aplikacije" "Oglejte si predlagane aplikacije v spodnji vrstici začetnega zaslona" "Prejemajte predloge aplikacij v vrstici s priljubljenimi na začetnem zaslonu" - "Preprosto dostopajte do najpogosteje uporabljenih aplikacij kar na začetnem zaslonu. Predlogi se spreminjajo na podlagi dejanj, ki jih pogosto izvajate. Aplikacije se iz spodnje vrstice premaknejo na začetni zaslon." + "Preprosto dostopajte do najpogosteje uporabljenih aplikacij kar na začetnem zaslonu. Predlogi se spreminjajo na podlagi dejanj, ki jih pogosto izvajate. Aplikacije iz spodnje vrstice se premaknejo na začetni zaslon." "Preprosto dostopajte do najpogosteje uporabljenih aplikacij kar na začetnem zaslonu. Predlogi se spreminjajo na podlagi dejanj, ki jih pogosto izvajate. Aplikacije v vrstici s priljubljenimi bodo premaknjene na začetni zaslon." - "Preprosto dostopajte do najpogosteje uporabljenih aplikacij kar na začetnem zaslonu. Predlogi se spreminjajo na podlagi dejanj, ki jih pogosto izvajate. Aplikacije se iz spodnje vrstice premaknejo v novo mapo." + "Preprosto dostopajte do najpogosteje uporabljenih aplikacij kar na začetnem zaslonu. Predlogi se spreminjajo na podlagi dejanj, ki jih pogosto izvajate. Aplikacije iz spodnje vrstice se premaknejo v novo mapo." "Prikaži predlagane aplikacije" "Ne, hvala" "Nastavitve" "Tukaj so navedene najpogosteje uporabljene aplikacije in spremembe na podlagi rutin" - "Če si želite ogledati predlagane aplikacije, povlecite aplikacije iz spodnje vrstice" + "Če si želite ogledati predlagane aplikacije, povlecite aplikacije iz spodnje vrstice." "Predlagane aplikacije so bile dodane v prazni prostor" - "Predlogi aplikacij so omogočeni" - "Predlogi aplikacij so onemogočeni" + "Predlogi aplikacij so omogočeni." + "Predlogi aplikacij so onemogočeni." "Predvidena aplikacija: %1$s" "Pazite, da ne povlečete s skrajno levega roba." "Pazite, da povlečete z levega roba do sredine zaslona in dvignete prst." diff --git a/quickstep/res/values-sv/strings.xml b/quickstep/res/values-sv/strings.xml index 4b4407b423..1838643a64 100644 --- a/quickstep/res/values-sv/strings.xml +++ b/quickstep/res/values-sv/strings.xml @@ -51,8 +51,7 @@ "Se till att du sveper från den högra kanten till mitten av skärmen och sedan släpper." "Nu kan du svepa från vänster för att gå tillbaka." "Nu kan du svepa från höger för att gå tillbaka. Nu ska du få lära dig hur du byter mellan appar." - - + "Du är klar med rörelsen för att gå tillbaka." "Se till att du inte sveper för nära skärmens nederkant." "Öppna inställningarna om du vill ändra rörelsens känslighet" "Återgå genom att svepa från vänster" @@ -62,19 +61,15 @@ "Se till att du sveper från nederkanten på skärmen." "Se till att du sveper i en jämn rörelse innan du släpper." "Se till att du sveper rakt uppåt." - - - - + "Du är klar med rörelsen för att öppna startskärmen. Nu ska du få lära dig hur du går tillbaka." + "Du är klar med rörelsen för att öppna startskärmen." "Svep för att öppna startskärmen" "Svep uppåt från skärmens nederkant. Du kan alltid återgå startskärmen med den här rörelsen." "Se till att du sveper från nederkanten på skärmen." "Testa att trycka längre på fönstret innan du släpper." "Se till att du sveper rakt uppåt och sedan pausar." - - - - + "Du har lärt dig hur du använder rörelser. Om du vill inaktivera rörelser öppnar du inställningarna." + "Du är klar med rörelsen för att byta mellan appar." "Svep för att byta mellan appar" "Svep uppåt från skärmens nederkant. Håll fingret nedtryckt och släpp sedan." "Klart" diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml index a0351a79e3..0d18e35745 100644 --- a/quickstep/res/values-te/strings.xml +++ b/quickstep/res/values-te/strings.xml @@ -31,11 +31,11 @@ "యాప్ సలహాలు" "అన్ని యాప్‌లు" "మీ సూచించబడిన యాప్‌లు" - "మీ హోమ్ స్క్రీన్‌ దిగువ వరుసలో యాప్ సలహాలను పొందండి" + "మీ మొదటి స్క్రీన్‌ దిగువ వరుసలో యాప్ సలహాలను పొందండి" "మీ హోమ్ స్క్రీన్‌లోని ఇష్టమైన వాటి వరుసలో యాప్ సూచ‌న‌లు పొందండి" - "మీరు ఎక్కువగా ఉపయోగించే యాప్‌లను నేరుగా హోమ్ స్క్రీన్‌లోనే సులభంగా యాక్సెస్ చేయండి. మీ రోజువారీ కార్యకలాపాలను బట్టి సూచనలు మారతాయి. దిగువ వరుసలోని యాప్‌లు మీ హోమ్ స్క్రీన్ పైకి చేరుకుంటాయి." - "మీరు ఎక్కువగా ఉపయోగించే యాప్‌లను నేరుగా హోమ్ స్క్రీన్‌లోనే సులభంగా యాక్సెస్ చేయండి. మీ రోజువారీ కార్యకలాపాలను బట్టి సూచనలు మారతాయి. ఇష్టమైన వాటి వరుసలోని యాప్‌లు మీ హోమ్ స్క్రీన్‌కు చేరుకుంటాయి." - "మీరు ఎక్కువగా ఉపయోగించే యాప్‌లను నేరుగా హోమ్ స్క్రీన్‌లోనే సులభంగా యాక్సెస్ చేయండి. మీ రోజువారీ కార్యకలాపాలను బట్టి సూచనలు మారతాయి. దిగువ వరుసలోని యాప్‌లు కొత్త ఫోల్డర్‌కు తరలించబడతాయి." + "మీరు ఎక్కువగా ఉపయోగించే యాప్‌లను నేరుగా మొదటి స్క్రీన్‌లోనే సులభంగా యాక్సెస్ చేయండి. మీ రోజువారీ కార్యకలాపాలను బట్టి సూచనలు మారతాయి. దిగువ వరుసలోని యాప్‌లు మీ మొదటి స్క్రీన్ పైకి చేరుకుంటాయి." + "మీరు ఎక్కువగా ఉపయోగించే యాప్‌లను నేరుగా మొదటి స్క్రీన్‌లోనే సులభంగా యాక్సెస్ చేయండి. మీ రోజువారీ కార్యకలాపాలను బట్టి సూచనలు మారతాయి. ఇష్టమైన వాటి వరుసలోని యాప్‌లు మీ మొదటి స్క్రీన్‌కు చేరుకుంటాయి." + "మీరు ఎక్కువగా ఉపయోగించే యాప్‌లను నేరుగా మొదటి స్క్రీన్‌లోనే సులభంగా యాక్సెస్ చేయండి. మీ రోజువారీ కార్యకలాపాలను బట్టి సూచనలు మారతాయి. దిగువ వరుసలోని యాప్‌లు కొత్త ఫోల్డర్‌కు తరలించబడతాయి." "యాప్ సూచ‌న‌లను పొందండి" "వద్దు" "సెట్టింగ్‌లు" diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml index a13b43b776..1758589f8b 100644 --- a/quickstep/res/values-th/strings.xml +++ b/quickstep/res/values-th/strings.xml @@ -42,7 +42,7 @@ "แอปที่ใช้มากที่สุดจะปรากฎที่นี่และจะเปลี่ยนไปตามการใช้งานประจำ" "ลากแอปออกจากแถวล่างเพื่อดูแอปแนะนำ" "เพิ่มคำแนะนำเกี่ยวกับแอปในพื้นที่ว่างแล้ว" - "เปิดใช้คำแนะนำเกี่ยวกับแอปแล้ว" + "เปิดใช้แอปแนะนำแล้ว" "ปิดใช้คำแนะนำเกี่ยวกับแอปอยู่" "แอปที่คาดว่าจะใช้: %1$s" "ตรวจสอบว่าปัดจากขอบด้านซ้ายสุด" diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml index f3cb45840c..51bb189cd8 100644 --- a/quickstep/res/values-zh-rTW/strings.xml +++ b/quickstep/res/values-zh-rTW/strings.xml @@ -31,16 +31,16 @@ "應用程式建議" "所有應用程式" "系統預測你會使用的應用程式" - "在主畫面的底部取得應用程式建議" + "在主畫面底部顯示應用程式建議" "在主畫面的收藏列取得應用程式建議" - "在主畫面上輕鬆存取最常使用的應用程式。應用程式建議會依據你的日常使用習慣而有所不同。系統會將底部列出的應用程式上移到主畫面。" - "在主畫面上輕鬆存取最常使用的應用程式。系統會根據你的日常使用習慣提供不同的應用程式建議,並在主畫面顯示收藏列中的應用程式。" - "在主畫面上輕鬆存取最常使用的應用程式。應用程式建議會根據日常安排有所不同。系統會將底部列出的應用程式移到新的資料夾。" + "你可以輕鬆地在主畫面上找到自己常用的應用程式。應用程式建議會依據你的日常使用習慣而有所不同。系統會將底部列出的應用程式上移到主畫面。" + "你可以輕鬆地在主畫面上找到自己常用的應用程式。系統會根據你的日常使用習慣提供不同的應用程式建議,並在主畫面顯示收藏列中的應用程式。" + "你可以輕鬆地在主畫面上找到自己常用的應用程式。應用程式建議會根據日常安排有所不同。系統會將底部列出的應用程式移到新的資料夾。" "取得應用程式建議" "不用了,謝謝" "設定" "最常使用的應用程式會顯示在這裡,顯示的項目會根據日常安排有所不同" - "將應用程式從底部列向外拖曳,即可取得應用程式建議" + "將底部列中顯示的應用程式拖曳出來,即可取得應用程式建議" "應用程式建議已新增到空白位置" "應用程式建議功能已啟用" "應用程式建議功能已停用" @@ -83,7 +83,7 @@ "你可以開始使用手機了" "無障礙工具的導覽設定" "分享" - "擷取螢幕畫面" + "螢幕截圖" "這個應用程式或貴機構不允許執行這個動作" "要略過手勢操作教學課程嗎?" "你之後可以在「%1$s」應用程式找到這些說明" From 74a6d2ea55f65151716e0771ee68908f490d891b Mon Sep 17 00:00:00 2001 From: Thiru Ramasamy Date: Tue, 15 Jun 2021 10:38:19 -0700 Subject: [PATCH 2/5] Enable logging for 'Themed icons' setting. Eldar: http://eldar/510864786 Bug: 191161241 Test: local - http://gpaste/5934701681311744 & http://gpaste/6715297709948928 Change-Id: I18ad97f68b372997e222f06dabf8bbe83f15d92f --- .../quickstep/logging/SettingsChangeLogger.java | 11 +++++++++++ .../android/launcher3/logging/StatsLogManager.java | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java b/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java index 4c10822fb8..7eca360224 100644 --- a/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java +++ b/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java @@ -27,8 +27,11 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_SCREEN_SUGGESTIONS_ENABLED; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NOTIFICATION_DOT_DISABLED; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_NOTIFICATION_DOT_ENABLED; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_THEMED_ICON_DISABLED; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_THEMED_ICON_ENABLED; import static com.android.launcher3.model.QuickstepModelDelegate.LAST_PREDICTION_ENABLED_STATE; import static com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI; +import static com.android.launcher3.util.Themes.KEY_THEMED_ICONS; import android.content.Context; import android.content.SharedPreferences; @@ -40,6 +43,7 @@ import android.util.Xml; import com.android.launcher3.AutoInstallsLayout; import com.android.launcher3.R; +import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.logging.InstanceIdSequence; import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.logging.StatsLogManager.StatsLogger; @@ -170,6 +174,13 @@ public class SettingsChangeLogger implements if (gridSizeChangedEvent != null) { logger.log(gridSizeChangedEvent); } + + if (FeatureFlags.ENABLE_THEMED_ICONS.get()) { + logger.log(prefs.getBoolean(KEY_THEMED_ICONS, false) + ? LAUNCHER_THEMED_ICON_ENABLED + : LAUNCHER_THEMED_ICON_DISABLED); + } + mLoggablePrefs.forEach((key, lp) -> logger.log(() -> prefs.getBoolean(key, lp.defaultValue) ? lp.eventIdOn : lp.eventIdOff)); } diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java index 418e46de71..345a2ac594 100644 --- a/src/com/android/launcher3/logging/StatsLogManager.java +++ b/src/com/android/launcher3/logging/StatsLogManager.java @@ -473,7 +473,13 @@ public class StatsLogManager implements ResourceBasedOverride { LAUNCHER_WIDGET_RESIZE_COMPLETED(824), @UiEvent(doc = "User reconfigured a widget on their home screen.") - LAUNCHER_WIDGET_RECONFIGURED(821) + LAUNCHER_WIDGET_RECONFIGURED(821), + + @UiEvent(doc = "User enabled themed icons option in wallpaper & style settings.") + LAUNCHER_THEMED_ICON_ENABLED(836), + + @UiEvent(doc = "User disabled themed icons option in wallpaper & style settings.") + LAUNCHER_THEMED_ICON_DISABLED(837) ; // ADD MORE From 560d28e3a195caf68f16c8042e7f82afa3c81cff Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Fri, 4 Jun 2021 15:35:46 -0700 Subject: [PATCH 3/5] Initial commit of TaskBar on keyguard Bug: 180046394 Test: Tested with pin + keyboard + pattern Change-Id: I951d9508b1325c157a9c0d92fa8e77fe8df9c460 --- .../taskbar/LauncherTaskbarUIController.java | 11 ++ .../taskbar/NavbarButtonsViewController.java | 32 +++++- .../taskbar/TaskbarActivityContext.java | 11 +- .../launcher3/taskbar/TaskbarControllers.java | 7 +- .../taskbar/TaskbarKeyguardController.java | 104 ++++++++++++++++++ .../launcher3/taskbar/TaskbarManager.java | 8 +- .../taskbar/TaskbarViewController.java | 3 +- .../quickstep/TouchInteractionService.java | 2 +- 8 files changed, 163 insertions(+), 15 deletions(-) create mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarKeyguardController.java diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java index 9a836aa255..f4168d9f80 100644 --- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java @@ -55,6 +55,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController { private AlphaProperty mIconAlphaForHome; private @Nullable Animator mAnimator; private boolean mIsAnimatingToLauncher; + private TaskbarKeyguardController mKeyguardController; public LauncherTaskbarUIController( BaseQuickstepLauncher launcher, TaskbarActivityContext context) { @@ -81,6 +82,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController { mHotseatController.init(); setTaskbarViewVisible(!mLauncher.hasBeenResumed()); mLauncher.setTaskbarUIController(this); + mKeyguardController = taskbarControllers.taskbarKeyguardController; } @Override @@ -117,6 +119,15 @@ public class LauncherTaskbarUIController extends TaskbarUIController { * Should be called from onResume() and onPause(), and animates the Taskbar accordingly. */ public void onLauncherResumedOrPaused(boolean isResumed) { + if (mKeyguardController.isScreenOff()) { + if (!isResumed) { + return; + } else { + // Resuming implicitly means device unlocked + mKeyguardController.setScreenOn(); + } + } + long duration = QuickstepTransitionManager.CONTENT_ALPHA_DURATION; if (mAnimator != null) { mAnimator.cancel(); diff --git a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java index 2ae7d108ed..d40242c42c 100644 --- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java @@ -22,6 +22,7 @@ import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_HO import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_IME_SWITCH; import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_RECENTS; import static com.android.launcher3.taskbar.TaskbarViewController.ALPHA_INDEX_IME; +import static com.android.launcher3.taskbar.TaskbarViewController.ALPHA_INDEX_KEYGUARD; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_CLICKABLE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING; @@ -65,6 +66,8 @@ public class NavbarButtonsViewController { private static final int FLAG_IME_VISIBLE = 1 << 1; private static final int FLAG_ROTATION_BUTTON_VISIBLE = 1 << 2; private static final int FLAG_A11Y_VISIBLE = 1 << 3; + private static final int FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE = 1 << 4; + private static final int FLAG_KEYGUARD_VISIBLE = 1 << 5; private static final int MASK_IME_SWITCHER_VISIBLE = FLAG_SWITCHER_SUPPORTED | FLAG_IME_VISIBLE; @@ -114,6 +117,10 @@ public class NavbarButtonsViewController { mControllers.taskbarViewController.getTaskbarIconAlpha() .getProperty(ALPHA_INDEX_IME), flags -> (flags & FLAG_IME_VISIBLE) == 0, MultiValueAlpha.VALUE, 1, 0)); + mPropertyHolders.add(new StatePropertyHolder( + mControllers.taskbarViewController.getTaskbarIconAlpha() + .getProperty(ALPHA_INDEX_KEYGUARD), + flags -> (flags & FLAG_KEYGUARD_VISIBLE) == 0, MultiValueAlpha.VALUE, 1, 0)); // Rotation button RotationButton rotationButton = new RotationButtonImpl(addButton(mEndContainer)); @@ -136,16 +143,21 @@ public class NavbarButtonsViewController { mPropertyHolders.add(new StatePropertyHolder(backButton, flags -> (flags & FLAG_IME_VISIBLE) == 0, View.ROTATION, 0, Utilities.isRtl(mContext.getResources()) ? 90 : -90)); + mPropertyHolders.add(new StatePropertyHolder(backButton, + flags -> (flags & FLAG_KEYGUARD_VISIBLE) == 0 || + (flags & FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE) != 0)); // home and recents buttons View homeButton = addButton(R.drawable.ic_sysbar_home, BUTTON_HOME, startContainer, navButtonController); mPropertyHolders.add(new StatePropertyHolder(homeButton, - flags -> (flags & FLAG_IME_VISIBLE) == 0)); + flags -> (flags & FLAG_IME_VISIBLE) == 0 && + (flags & FLAG_KEYGUARD_VISIBLE) == 0)); View recentsButton = addButton(R.drawable.ic_sysbar_recent, BUTTON_RECENTS, startContainer, navButtonController); mPropertyHolders.add(new StatePropertyHolder(recentsButton, - flags -> (flags & FLAG_IME_VISIBLE) == 0)); + flags -> (flags & FLAG_IME_VISIBLE) == 0 && + (flags & FLAG_KEYGUARD_VISIBLE) == 0)); // IME switcher View imeSwitcherButton = addButton(R.drawable.ic_ime_switcher, BUTTON_IME_SWITCH, @@ -183,6 +195,22 @@ public class NavbarButtonsViewController { applyState(); } + /** + * Should be called when we need to show back button for bouncer + */ + public void setBackForBouncer(boolean isBouncerVisible) { + updateStateForFlag(FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE, isBouncerVisible); + applyState(); + } + + /** + * Slightly misnamed, but should be called when only keyguard OR AOD is showing + */ + public void setKeyguardVisible(boolean isKeyguardVisible) { + updateStateForFlag(FLAG_KEYGUARD_VISIBLE, isKeyguardVisible); + applyState(); + } + /** * Returns true if IME bar is visible */ diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index 6e477000dd..2a0fbbb1bc 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -18,6 +18,7 @@ package com.android.launcher3.taskbar; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; +import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTTOM_TAPPABLE_ELEMENT; import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_EXTRA_NAVIGATION_BAR; @@ -121,7 +122,8 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ new RotationButtonController(this, R.color.popup_color_primary_light, R.color.popup_color_primary_light), new TaskbarDragLayerController(this, mDragLayer), - new TaskbarViewController(this, taskbarView)); + new TaskbarViewController(this, taskbarView), + new TaskbarKeyguardController(this)); Display display = windowContext.getDisplay(); Context c = display.getDisplayId() == Display.DEFAULT_DISPLAY @@ -135,7 +137,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ mWindowLayoutParams = new WindowManager.LayoutParams( MATCH_PARENT, mLastRequestedNonFullscreenHeight, - TYPE_APPLICATION_OVERLAY, + TYPE_NAVIGATION_BAR_PANEL, WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE, PixelFormat.TRANSLUCENT); mWindowLayoutParams.setTitle(WINDOW_TITLE); @@ -144,7 +146,6 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ mWindowLayoutParams.setFitInsetsTypes(0); mWindowLayoutParams.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING; mWindowLayoutParams.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; - mWindowLayoutParams.setSystemApplicationOverlay(true); WindowManagerWrapper wmWrapper = WindowManagerWrapper.getInstance(); wmWrapper.setProvidesInsetsTypes( @@ -213,17 +214,19 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ systemUiStateFlags, forceUpdate); mControllers.taskbarViewController.setImeIsVisible( mControllers.navbarButtonsViewController.isImeVisible()); + mControllers.taskbarKeyguardController.updateStateForSysuiFlags(systemUiStateFlags); } public void onRotationProposal(int rotation, boolean isValid) { mControllers.rotationButtonController.onRotationProposal(rotation, isValid); } - public void disable(int displayId, int state1, int state2, boolean animate) { + public void disableNavBarElements(int displayId, int state1, int state2, boolean animate) { if (displayId != getDisplayId()) { return; } mControllers.rotationButtonController.onDisable2FlagChanged(state2); + mControllers.taskbarKeyguardController.disableNavbarElements(state1, state2); } public void onSystemBarAttributesChanged(int displayId, int behavior) { diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java index 7712ffef55..157053efdd 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarControllers.java @@ -31,6 +31,7 @@ public class TaskbarControllers { public final RotationButtonController rotationButtonController; public final TaskbarDragLayerController taskbarDragLayerController; public final TaskbarViewController taskbarViewController; + public final TaskbarKeyguardController taskbarKeyguardController; /** Do not store this controller, as it may change at runtime. */ @NonNull public TaskbarUIController uiController = TaskbarUIController.DEFAULT; @@ -41,7 +42,8 @@ public class TaskbarControllers { NavbarButtonsViewController navbarButtonsViewController, RotationButtonController rotationButtonController, TaskbarDragLayerController taskbarDragLayerController, - TaskbarViewController taskbarViewController) { + TaskbarViewController taskbarViewController, + TaskbarKeyguardController taskbarKeyguardController) { this.taskbarActivityContext = taskbarActivityContext; this.taskbarDragController = taskbarDragController; this.navButtonController = navButtonController; @@ -49,6 +51,7 @@ public class TaskbarControllers { this.rotationButtonController = rotationButtonController; this.taskbarDragLayerController = taskbarDragLayerController; this.taskbarViewController = taskbarViewController; + this.taskbarKeyguardController = taskbarKeyguardController; } /** @@ -63,6 +66,7 @@ public class TaskbarControllers { } taskbarDragLayerController.init(this); taskbarViewController.init(this); + taskbarKeyguardController.init(navbarButtonsViewController); } /** @@ -72,5 +76,6 @@ public class TaskbarControllers { uiController.onDestroy(); rotationButtonController.onDestroy(); taskbarDragLayerController.onDestroy(); + taskbarKeyguardController.onDestroy(); } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarKeyguardController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarKeyguardController.java new file mode 100644 index 0000000000..b7799d8149 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarKeyguardController.java @@ -0,0 +1,104 @@ +package com.android.launcher3.taskbar; + +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BOUNCER_SHOWING; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DOZING; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING; + +import android.app.KeyguardManager; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.view.View; + +/** + * Controller for managing keyguard state for taskbar + */ +public class TaskbarKeyguardController { + + private static final int KEYGUARD_SYSUI_FLAGS = SYSUI_STATE_BOUNCER_SHOWING | + SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING | SYSUI_STATE_DEVICE_DOZING; + + private final TaskbarActivityContext mContext; + private int mDisabledNavIcons; + private int mKeyguardSysuiFlags; + private boolean mBouncerShowing; + private NavbarButtonsViewController mNavbarButtonsViewController; + private final KeyguardManager mKeyguardManager; + private boolean mIsScreenOff; + + private final BroadcastReceiver mScreenOffReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + mIsScreenOff = true; + } + }; + + public TaskbarKeyguardController(TaskbarActivityContext context) { + mContext = context; + mKeyguardManager = mContext.getSystemService(KeyguardManager.class); + } + + public void init(NavbarButtonsViewController navbarButtonUIController) { + mNavbarButtonsViewController = navbarButtonUIController; + mContext.registerReceiver(mScreenOffReceiver, new IntentFilter(Intent.ACTION_SCREEN_OFF)); + } + + public void updateStateForSysuiFlags(int systemUiStateFlags) { + boolean bouncerShowing = (systemUiStateFlags & SYSUI_STATE_BOUNCER_SHOWING) != 0; + boolean keyguardShowing = (systemUiStateFlags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING) + != 0; + boolean dozing = (systemUiStateFlags & SYSUI_STATE_DEVICE_DOZING) != 0; + + int interestingKeyguardFlags = systemUiStateFlags & KEYGUARD_SYSUI_FLAGS; + if (interestingKeyguardFlags == mKeyguardSysuiFlags) { + return; + } + mKeyguardSysuiFlags = interestingKeyguardFlags; + + mBouncerShowing = bouncerShowing; + if (!mContext.canShowNavButtons()) { + // For gesture nav we don't need to deal with bouncer or showing taskbar when locked + return; + } + + mNavbarButtonsViewController.setKeyguardVisible(keyguardShowing || dozing); + updateIconsForBouncer(); + } + + public boolean isScreenOff() { + return mIsScreenOff; + } + + public void setScreenOn() { + mIsScreenOff = false; + } + + public void disableNavbarElements(int state1, int state2) { + if (mDisabledNavIcons == state1) { + // no change + return; + } + mDisabledNavIcons = state1; + updateIconsForBouncer(); + } + + /** + * Hides/shows taskbar when keyguard is up + */ + private void updateIconsForBouncer() { + boolean disableBack = (mDisabledNavIcons & View.STATUS_BAR_DISABLE_BACK) != 0; + boolean disableRecent = (mDisabledNavIcons & View.STATUS_BAR_DISABLE_RECENT) != 0; + boolean disableHome = (mDisabledNavIcons & View.STATUS_BAR_DISABLE_HOME) != 0; + boolean onlyBackEnabled = !disableBack && disableRecent && disableHome; + + boolean showBackForBouncer = onlyBackEnabled && + mKeyguardManager.isDeviceSecure() && + mBouncerShowing; + mNavbarButtonsViewController.setBackForBouncer(showBackForBouncer); + } + + public void onDestroy() { + mContext.unregisterReceiver(mScreenOffReceiver); + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java index 3563d09573..9f5ea50480 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java @@ -136,10 +136,6 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen onSysuiFlagsChangedInternal(mSysuiStateFlags, true /* forceUpdate */); } - /** - * See {@link com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags} - * @param systemUiStateFlags The latest SystemUiStateFlags - */ public void onSystemUiFlagsChanged(int systemUiStateFlags) { onSysuiFlagsChangedInternal(systemUiStateFlags, false /* forceUpdate */); } @@ -157,9 +153,9 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen } } - public void disable(int displayId, int state1, int state2, boolean animate) { + public void disableNavBarElements(int displayId, int state1, int state2, boolean animate) { if (mTaskbarActivityContext != null) { - mTaskbarActivityContext.disable(displayId, state1, state2, animate); + mTaskbarActivityContext.disableNavBarElements(displayId, state1, state2, animate); } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java index b6184c962b..10cc926759 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java @@ -27,6 +27,7 @@ public class TaskbarViewController { public static final int ALPHA_INDEX_HOME = 0; public static final int ALPHA_INDEX_LAUNCHER_STATE = 1; public static final int ALPHA_INDEX_IME = 2; + public static final int ALPHA_INDEX_KEYGUARD = 3; private final TaskbarActivityContext mActivity; private final TaskbarView mTaskbarView; @@ -38,7 +39,7 @@ public class TaskbarViewController { public TaskbarViewController(TaskbarActivityContext activity, TaskbarView taskbarView) { mActivity = activity; mTaskbarView = taskbarView; - mTaskbarIconAlpha = new MultiValueAlpha(mTaskbarView, 3); + mTaskbarIconAlpha = new MultiValueAlpha(mTaskbarView, 4); mTaskbarIconAlpha.setUpdateVisibility(true); } diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index a3136c7dd8..47ca3d2024 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -274,7 +274,7 @@ public class TouchInteractionService extends Service implements PluginListener mTaskbarManager - .disable(displayId, state1, state2, animate)); + .disableNavBarElements(displayId, state1, state2, animate)); } @Override From 9d3e31e67c509a0c9d09228ba95fdb893cf61a5a Mon Sep 17 00:00:00 2001 From: Hongwei Wang Date: Tue, 15 Jun 2021 12:04:17 -0700 Subject: [PATCH 4/5] Use RectFSpringAnim for auto-enter-pip Make SwipePipToHomeAnimator a subclass of RectFSpringAnim and use the bounds calculated from latter for auto-enter-pip transition. Note that the landscape to portrait case may not fully comply to RectFSpringAnim as we calculate the position separately in SwipePipToHomeAnimator. Video: http://recall/-/aaaaaabFQoRHlzixHdtY/CWBPU2A6vB8CeTFRanQLx Bug: 184789411 Test: manual, see video Change-Id: I67dae09e682b7d8f1a1f08995eb3bcf76bdf7417 --- .../android/quickstep/AbsSwipeUpHandler.java | 27 +++---- .../util/SwipePipToHomeAnimator.java | 79 +++++++++---------- 2 files changed, 48 insertions(+), 58 deletions(-) diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 8f42993b62..57dcad65c6 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -45,8 +45,6 @@ import static com.android.quickstep.GestureState.STATE_END_TARGET_SET; import static com.android.quickstep.GestureState.STATE_RECENTS_SCROLLING_FINISHED; import static com.android.quickstep.MultiStateCallback.DEBUG_STATES; import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE; -import static com.android.quickstep.util.SwipePipToHomeAnimator.FRACTION_END; -import static com.android.quickstep.util.SwipePipToHomeAnimator.FRACTION_START; import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD; import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS; import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME; @@ -248,7 +246,6 @@ public abstract class AbsSwipeUpHandler, private final Runnable mOnDeferredActivityLaunch = this::onDeferredActivityLaunch; - private static final long SWIPE_PIP_TO_HOME_DURATION = 425; private SwipePipToHomeAnimator mSwipePipToHomeAnimator; protected boolean mIsSwipingPipToHome; @@ -1127,17 +1124,14 @@ public abstract class AbsSwipeUpHandler, createHomeAnimationFactory(cookies, duration, isTranslucent, appCanEnterPip, runningTaskTarget); mIsSwipingPipToHome = homeAnimFactory.supportSwipePipToHome() && appCanEnterPip; + final RectFSpringAnim windowAnim; if (mIsSwipingPipToHome) { - mSwipePipToHomeAnimator = getSwipePipToHomeAnimator( + mSwipePipToHomeAnimator = createWindowAnimationToPip( homeAnimFactory, runningTaskTarget, start); - mSwipePipToHomeAnimator.setDuration(SWIPE_PIP_TO_HOME_DURATION); - mSwipePipToHomeAnimator.setInterpolator(interpolator); - mSwipePipToHomeAnimator.setFloatValues(FRACTION_START, FRACTION_END); - mSwipePipToHomeAnimator.start(); - mRunningWindowAnim = RunningWindowAnim.wrap(mSwipePipToHomeAnimator); + windowAnim = mSwipePipToHomeAnimator; } else { mSwipePipToHomeAnimator = null; - RectFSpringAnim windowAnim = createWindowAnimationToHome(start, homeAnimFactory); + windowAnim = createWindowAnimationToHome(start, homeAnimFactory); windowAnim.addAnimatorListener(new AnimationSuccessListener() { @Override public void onAnimationSuccess(Animator animator) { @@ -1151,9 +1145,9 @@ public abstract class AbsSwipeUpHandler, mGestureState.setState(STATE_END_TARGET_ANIMATION_FINISHED); } }); - windowAnim.start(mContext, velocityPxPerMs); - mRunningWindowAnim = RunningWindowAnim.wrap(windowAnim); } + windowAnim.start(mContext, velocityPxPerMs); + mRunningWindowAnim = RunningWindowAnim.wrap(windowAnim); homeAnimFactory.setSwipeVelocity(velocityPxPerMs.y); homeAnimFactory.playAtomicAnimation(velocityPxPerMs.y); mLauncherTransitionController = null; @@ -1209,7 +1203,7 @@ public abstract class AbsSwipeUpHandler, } } - private SwipePipToHomeAnimator getSwipePipToHomeAnimator(HomeAnimationFactory homeAnimFactory, + private SwipePipToHomeAnimator createWindowAnimationToPip(HomeAnimationFactory homeAnimFactory, RemoteAnimationTargetCompat runningTaskTarget, float startProgress) { // Directly animate the app to PiP (picture-in-picture) mode final ActivityManager.RunningTaskInfo taskInfo = mGestureState.getRunningTask(); @@ -1222,16 +1216,15 @@ public abstract class AbsSwipeUpHandler, runningTaskTarget.taskInfo.pictureInPictureParams, homeRotation, mDp.hotseatBarSizePx); - final Rect startBounds = new Rect(); - updateProgressForStartRect(new Matrix(), startProgress).round(startBounds); final SwipePipToHomeAnimator swipePipToHomeAnimator = new SwipePipToHomeAnimator( + mContext, runningTaskTarget.taskId, taskInfo.topActivity, runningTaskTarget.leash.getSurfaceControl(), TaskInfoCompat.getPipSourceRectHint( runningTaskTarget.taskInfo.pictureInPictureParams), TaskInfoCompat.getWindowConfigurationBounds(taskInfo), - startBounds, + updateProgressForStartRect(new Matrix(), startProgress), destinationBounds, mRecentsView.getPipCornerRadius(), mRecentsView); @@ -1243,7 +1236,7 @@ public abstract class AbsSwipeUpHandler, } AnimatorPlaybackController activityAnimationToHome = homeAnimFactory.createActivityAnimationToHome(); - swipePipToHomeAnimator.addListener(new AnimatorListenerAdapter() { + swipePipToHomeAnimator.addAnimatorListener(new AnimatorListenerAdapter() { private boolean mHasAnimationEnded; @Override public void onAnimationStart(Animator animation) { diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java index 61a2eafe6d..67a635b70b 100644 --- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java +++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java @@ -20,8 +20,8 @@ import static com.android.systemui.shared.system.InteractionJankMonitorWrapper.C import android.animation.Animator; import android.animation.RectEvaluator; -import android.animation.ValueAnimator; import android.content.ComponentName; +import android.content.Context; import android.graphics.Color; import android.graphics.Matrix; import android.graphics.Rect; @@ -44,30 +44,24 @@ import com.android.systemui.shared.pip.PipSurfaceTransactionHelper; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; /** - * An {@link Animator} that animates an Activity to PiP (picture-in-picture) window when - * swiping up (in gesture navigation mode). Note that this class is derived from - * {@link com.android.wm.shell.pip.PipAnimationController.PipTransitionAnimator}. - * - * TODO: consider sharing this class including the animator and leash operations between - * Launcher and SysUI. Also, there should be one source of truth for the corner radius of the - * PiP window, which would ideally be on SysUI side as well. + * Subclass of {@link RectFSpringAnim} that animates an Activity to PiP (picture-in-picture) window + * when swiping up (in gesture navigation mode). */ -public class SwipePipToHomeAnimator extends ValueAnimator { +public class SwipePipToHomeAnimator extends RectFSpringAnim { private static final String TAG = SwipePipToHomeAnimator.class.getSimpleName(); - public static final float FRACTION_START = 0f; - public static final float FRACTION_END = 1f; + private static final float END_PROGRESS = 1.0f; private final int mTaskId; private final ComponentName mComponentName; private final SurfaceControl mLeash; private final Rect mAppBounds = new Rect(); private final Rect mStartBounds = new Rect(); + private final Rect mCurrentBounds = new Rect(); private final Rect mDestinationBounds = new Rect(); private final PipSurfaceTransactionHelper mSurfaceTransactionHelper; - /** for calculating the transform in {@link #onAnimationUpdate(ValueAnimator)} */ - private final RectEvaluator mRectEvaluator = new RectEvaluator(new Rect()); + /** for calculating transform in {@link #onAnimationUpdate(AppCloseConfig, RectF, float)} */ private final RectEvaluator mInsetsEvaluator = new RectEvaluator(new Rect()); private final Rect mSourceHintRectInsets; private final Rect mSourceInsets = new Rect(); @@ -90,6 +84,7 @@ public class SwipePipToHomeAnimator extends ValueAnimator { private SurfaceControl mContentOverlay; /** + * @param context {@link Context} provides Launcher resources * @param taskId Task id associated with this animator, see also {@link #getTaskId()} * @param componentName Component associated with this animator, * see also {@link #getComponentName()} @@ -102,20 +97,22 @@ public class SwipePipToHomeAnimator extends ValueAnimator { * @param destinationBounds Bounds of the destination this animator ends to * @param cornerRadius Corner radius in pixel value for PiP window */ - public SwipePipToHomeAnimator(int taskId, + public SwipePipToHomeAnimator(@NonNull Context context, + int taskId, @NonNull ComponentName componentName, @NonNull SurfaceControl leash, @Nullable Rect sourceRectHint, @NonNull Rect appBounds, - @NonNull Rect startBounds, + @NonNull RectF startBounds, @NonNull Rect destinationBounds, int cornerRadius, @NonNull View view) { + super(startBounds, new RectF(destinationBounds), context); mTaskId = taskId; mComponentName = componentName; mLeash = leash; mAppBounds.set(appBounds); - mStartBounds.set(startBounds); + startBounds.round(mStartBounds); mDestinationBounds.set(destinationBounds); mDestinationBoundsTransformed.set(mDestinationBounds); mDestinationBoundsAnimation.set(mDestinationBounds); @@ -151,10 +148,10 @@ public class SwipePipToHomeAnimator extends ValueAnimator { t.reparent(mContentOverlay, mLeash); t.apply(); - addUpdateListener(valueAnimator -> { - float alpha = valueAnimator.getAnimatedFraction() < 0.5f + addOnUpdateListener((values, currentRect, progress) -> { + float alpha = progress < 0.5f ? 0 - : Utilities.mapToRange(valueAnimator.getAnimatedFraction(), 0.5f, 1f, + : Utilities.mapToRange(Math.min(progress, 1f), 0.5f, 1f, 0f, 1f, Interpolators.FAST_OUT_SLOW_IN); t.setAlpha(mContentOverlay, alpha); t.apply(); @@ -166,7 +163,7 @@ public class SwipePipToHomeAnimator extends ValueAnimator { appBounds.bottom - sourceRectHint.bottom); } - addListener(new AnimationSuccessListener() { + addAnimatorListener(new AnimationSuccessListener() { @Override public void onAnimationStart(Animator animation) { InteractionJankMonitorWrapper.begin(view, CUJ_APP_CLOSE_TO_PIP); @@ -191,7 +188,7 @@ public class SwipePipToHomeAnimator extends ValueAnimator { mHasAnimationEnded = true; } }); - addUpdateListener(this::onAnimationUpdate); + addOnUpdateListener(this::onAnimationUpdate); } /** sets the from rotation if it's different from the target rotation. */ @@ -219,34 +216,34 @@ public class SwipePipToHomeAnimator extends ValueAnimator { mAppBounds.top + mDestinationBounds.height()); } - private void onAnimationUpdate(ValueAnimator animator) { + private void onAnimationUpdate(@Nullable AppCloseConfig values, RectF currentRect, + float progress) { if (mHasAnimationEnded) return; final SurfaceControl.Transaction tx = PipSurfaceTransactionHelper.newSurfaceControlTransaction(); - onAnimationUpdate(tx, animator.getAnimatedFraction()); + onAnimationUpdate(tx, currentRect, progress); tx.apply(); } private PictureInPictureSurfaceTransaction onAnimationUpdate(SurfaceControl.Transaction tx, - float fraction) { - final Rect bounds = mRectEvaluator.evaluate(fraction, mStartBounds, - mDestinationBoundsAnimation); + RectF currentRect, float progress) { + currentRect.round(mCurrentBounds); final PictureInPictureSurfaceTransaction op; if (mSourceHintRectInsets == null) { // no source rect hint been set, directly scale the window down - op = onAnimationScale(fraction, tx, bounds); + op = onAnimationScale(progress, tx, mCurrentBounds); } else { // scale and crop according to the source rect hint - op = onAnimationScaleAndCrop(fraction, tx, bounds); + op = onAnimationScaleAndCrop(progress, tx, mCurrentBounds); } return op; } /** scale the window directly with no source rect hint being set */ private PictureInPictureSurfaceTransaction onAnimationScale( - float fraction, SurfaceControl.Transaction tx, Rect bounds) { + float progress, SurfaceControl.Transaction tx, Rect bounds) { if (mFromRotation == Surface.ROTATION_90 || mFromRotation == Surface.ROTATION_270) { - final RotatedPosition rotatedPosition = getRotatedPosition(fraction); + final RotatedPosition rotatedPosition = getRotatedPosition(progress); return mSurfaceTransactionHelper.scale(tx, mLeash, mAppBounds, bounds, rotatedPosition.degree, rotatedPosition.positionX, rotatedPosition.positionY); } else { @@ -256,12 +253,12 @@ public class SwipePipToHomeAnimator extends ValueAnimator { /** scale and crop the window with source rect hint */ private PictureInPictureSurfaceTransaction onAnimationScaleAndCrop( - float fraction, SurfaceControl.Transaction tx, + float progress, SurfaceControl.Transaction tx, Rect bounds) { - final Rect insets = mInsetsEvaluator.evaluate(fraction, mSourceInsets, + final Rect insets = mInsetsEvaluator.evaluate(progress, mSourceInsets, mSourceHintRectInsets); if (mFromRotation == Surface.ROTATION_90 || mFromRotation == Surface.ROTATION_270) { - final RotatedPosition rotatedPosition = getRotatedPosition(fraction); + final RotatedPosition rotatedPosition = getRotatedPosition(progress); return mSurfaceTransactionHelper.scaleAndRotate(tx, mLeash, mAppBounds, bounds, insets, rotatedPosition.degree, rotatedPosition.positionX, rotatedPosition.positionY); } else { @@ -291,22 +288,22 @@ public class SwipePipToHomeAnimator extends ValueAnimator { // get the final leash operations but do not apply to the leash. final SurfaceControl.Transaction tx = PipSurfaceTransactionHelper.newSurfaceControlTransaction(); - return onAnimationUpdate(tx, FRACTION_END); + return onAnimationUpdate(tx, new RectF(mDestinationBounds), END_PROGRESS); } - private RotatedPosition getRotatedPosition(float fraction) { + private RotatedPosition getRotatedPosition(float progress) { final float degree, positionX, positionY; if (mFromRotation == Surface.ROTATION_90) { - degree = -90 * fraction; - positionX = fraction * (mDestinationBoundsTransformed.left - mStartBounds.left) + degree = -90 * progress; + positionX = progress * (mDestinationBoundsTransformed.left - mStartBounds.left) + mStartBounds.left; - positionY = fraction * (mDestinationBoundsTransformed.bottom - mStartBounds.top) + positionY = progress * (mDestinationBoundsTransformed.bottom - mStartBounds.top) + mStartBounds.top; } else { - degree = 90 * fraction; - positionX = fraction * (mDestinationBoundsTransformed.right - mStartBounds.left) + degree = 90 * progress; + positionX = progress * (mDestinationBoundsTransformed.right - mStartBounds.left) + mStartBounds.left; - positionY = fraction * (mDestinationBoundsTransformed.top - mStartBounds.top) + positionY = progress * (mDestinationBoundsTransformed.top - mStartBounds.top) + mStartBounds.top; } return new RotatedPosition(degree, positionX, positionY); From 12e9345f4f38be1274283f768fe0422b90cf5801 Mon Sep 17 00:00:00 2001 From: Schneider Victor-tulias Date: Tue, 1 Jun 2021 14:43:14 -0700 Subject: [PATCH 5/5] Skip item infos that fail session info verification. trichromelibrary.canary is failing session info verification, but is still being added as blank icon on the workspace in some cases. Added logic to skip apps that fail this verification until the root cause can be found. Bug: 168788486 Test: none Change-Id: I8a7fe76f321de493b2c6c67ba6922eae23067ff3 --- .../model/AddWorkspaceItemsTask.java | 5 +-- .../launcher3/pm/InstallSessionHelper.java | 32 +++++++++++-------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java index 3be2c3af40..365cab1a4e 100644 --- a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java +++ b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java @@ -130,8 +130,9 @@ public class AddWorkspaceItemsTask extends BaseModelUpdateTask { packageName); if (!packageInstaller.verifySessionInfo(sessionInfo)) { - FileLog.d(LOG, "Item info failed session info verification: " - + workspaceInfo); + FileLog.d(LOG, "Item info failed session info verification. " + + "Skipping : " + workspaceInfo); + continue; } List activities = launcherApps diff --git a/src/com/android/launcher3/pm/InstallSessionHelper.java b/src/com/android/launcher3/pm/InstallSessionHelper.java index 52554900ea..2bd9ba0037 100644 --- a/src/com/android/launcher3/pm/InstallSessionHelper.java +++ b/src/com/android/launcher3/pm/InstallSessionHelper.java @@ -217,7 +217,8 @@ public class InstallSessionHelper { void tryQueuePromiseAppIcon(PackageInstaller.SessionInfo sessionInfo) { if (FeatureFlags.PROMISE_APPS_NEW_INSTALLS.get() && SessionCommitReceiver.isEnabled(mAppContext) - && verifySessionInfo(sessionInfo)) { + && verifySessionInfo(sessionInfo) + && !promiseIconAddedForId(sessionInfo.getSessionId())) { FileLog.d(LOG, "Adding package name to install queue: " + sessionInfo.getAppPackageName()); @@ -234,25 +235,28 @@ public class InstallSessionHelper { && sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER && sessionInfo.getAppIcon() != null && !TextUtils.isEmpty(sessionInfo.getAppLabel()) - && !promiseIconAddedForId(sessionInfo.getSessionId()) && !new PackageManagerHelper(mAppContext).isAppInstalled( sessionInfo.getAppPackageName(), getUserHandle(sessionInfo)); if (sessionInfo != null) { Bitmap appIcon = sessionInfo.getAppIcon(); - FileLog.d(LOG, String.format( - "Verifying session info. Valid: %b, Session verified: %b, Install reason valid:" - + " %b, App icon: %s, App label: %s, Promise icon added: %b, " - + "App installed: %b.", - validSessionInfo, - verify(sessionInfo) != null, - sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER, - appIcon == null ? "null" : IOUtils.toBase64String(appIcon), - sessionInfo.getAppLabel(), - promiseIconAddedForId(sessionInfo.getSessionId()), - new PackageManagerHelper(mAppContext).isAppInstalled( - sessionInfo.getAppPackageName(), getUserHandle(sessionInfo)))); + if (Utilities.IS_DEBUG_DEVICE) { + FileLog.d(LOG, String.format( + "Verifying session info. Valid: %b," + + " Session verified: %b," + + " Install reason valid: %b," + + " App icon: %s," + + " App label: %s," + + " App installed: %b.", + validSessionInfo, + verify(sessionInfo) != null, + sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER, + appIcon == null ? "null" : IOUtils.toBase64String(appIcon), + sessionInfo.getAppLabel(), + new PackageManagerHelper(mAppContext).isAppInstalled( + sessionInfo.getAppPackageName(), getUserHandle(sessionInfo)))); + } } else { FileLog.d(LOG, "Verifying session info failed: session info null."); }