diff --git a/build.gradle b/build.gradle index 21ef338467..f184816dc8 100644 --- a/build.gradle +++ b/build.gradle @@ -16,8 +16,8 @@ plugins { id 'com.google.protobuf' version "0.9.5" id 'app.cash.licensee' version "1.13.0" id 'dev.rikka.tools.refine' version "4.4.0" - id 'com.diffplug.spotless' version '7.2.1' - id 'com.google.dagger.hilt.android' version '2.57.2' + id 'com.diffplug.spotless' version '7.2.1' // Please don't try to upgrade this + id 'com.google.dagger.hilt.android' version '2.57.1' // Please don't try to upgrade this } // LC-Build-TODO: addFrameworkJar() doesn't work, what??? @@ -512,4 +512,5 @@ licensee { allowUrl("https://opensource.org/licenses/mit-license.php") bundleAndroidAsset = true +// androidAssetReportPath = 'licenses.json' } diff --git a/lawnchair/res/values-af-rZA/strings.xml b/lawnchair/res/values-af-rZA/strings.xml index 19b497e3f3..5f739fa138 100644 --- a/lawnchair/res/values-af-rZA/strings.xml +++ b/lawnchair/res/values-af-rZA/strings.xml @@ -91,6 +91,7 @@ Muurpapier Style Background opacity + Separated Search bar background Copied to clipboard Result copied to clipboard diff --git a/lawnchair/res/values-am-rET/strings.xml b/lawnchair/res/values-am-rET/strings.xml index 67d9d49b05..7667ef1b84 100644 --- a/lawnchair/res/values-am-rET/strings.xml +++ b/lawnchair/res/values-am-rET/strings.xml @@ -91,6 +91,7 @@ Wallpaper Style Background opacity + Separated Search bar background Copied to clipboard Result copied to clipboard diff --git a/lawnchair/res/values-ar-rSA/strings.xml b/lawnchair/res/values-ar-rSA/strings.xml index 9426f932ba..9642eca8c1 100644 --- a/lawnchair/res/values-ar-rSA/strings.xml +++ b/lawnchair/res/values-ar-rSA/strings.xml @@ -91,6 +91,7 @@ الخلفية أسلوب شفافية الخلفية + Separated Search bar background تم النسخ إلى الحافظة النتائج نسخت إلي الحافظة diff --git a/lawnchair/res/values-az-rAZ/strings.xml b/lawnchair/res/values-az-rAZ/strings.xml index 27c37b6ebe..ec538e4221 100644 --- a/lawnchair/res/values-az-rAZ/strings.xml +++ b/lawnchair/res/values-az-rAZ/strings.xml @@ -91,6 +91,7 @@ Wallpaper Style Background opacity + Separated Search bar background Copied to clipboard Result copied to clipboard diff --git a/lawnchair/res/values-b+sr+Latn/strings.xml b/lawnchair/res/values-b+sr+Latn/strings.xml index 46e4da7ff0..6c0011138c 100644 --- a/lawnchair/res/values-b+sr+Latn/strings.xml +++ b/lawnchair/res/values-b+sr+Latn/strings.xml @@ -91,6 +91,7 @@ Pozadina Style Neprozirnost pozadine + Separated Search bar background Kopirano u privremenu memoriju Rezultat je kopiran u privremenu memoriju diff --git a/lawnchair/res/values-bn-rBD/strings.xml b/lawnchair/res/values-bn-rBD/strings.xml index 76cee92bc1..a206de50fb 100644 --- a/lawnchair/res/values-bn-rBD/strings.xml +++ b/lawnchair/res/values-bn-rBD/strings.xml @@ -91,6 +91,7 @@ ওয়ালপেপার স্টাইল ব্যাকগ্রাউন্ডের অস্বচ্ছতা + Separated Search bar background ক্লিপবোর্ডের অস্বচ্ছতা ফলাফল ক্লিপবোর্ডে কপি করা হয়েছে diff --git a/lawnchair/res/values-bs-rBA/strings.xml b/lawnchair/res/values-bs-rBA/strings.xml index 247acedbbd..1140b4fc2d 100644 --- a/lawnchair/res/values-bs-rBA/strings.xml +++ b/lawnchair/res/values-bs-rBA/strings.xml @@ -91,6 +91,7 @@ Pozadinska slika Stil Providnost pozadine + Separated Search bar background Kopirano u međuspremnik Rezultat kopiran u međuspremnik diff --git a/lawnchair/res/values-ca-rES/strings.xml b/lawnchair/res/values-ca-rES/strings.xml index 6e2c856db7..3e482e7c10 100644 --- a/lawnchair/res/values-ca-rES/strings.xml +++ b/lawnchair/res/values-ca-rES/strings.xml @@ -91,6 +91,7 @@ Fons de pantalla Estil Opacitat del fons + Separated Search bar background S\'ha copiat al porta-retalls Resultat copiat al porta-retalls diff --git a/lawnchair/res/values-cs-rCZ/strings.xml b/lawnchair/res/values-cs-rCZ/strings.xml index ac0c52039f..3fc31912d1 100644 --- a/lawnchair/res/values-cs-rCZ/strings.xml +++ b/lawnchair/res/values-cs-rCZ/strings.xml @@ -91,6 +91,7 @@ Tapeta Styl Průhlednost Pozadí + Separated Search bar background Zkopírováno do schránky Výsledek zkopírován do schránky diff --git a/lawnchair/res/values-da-rDK/strings.xml b/lawnchair/res/values-da-rDK/strings.xml index 5ecfb37a5a..74b07051de 100644 --- a/lawnchair/res/values-da-rDK/strings.xml +++ b/lawnchair/res/values-da-rDK/strings.xml @@ -91,6 +91,7 @@ Baggrund Style Baggrundsgennemsigtighed + Separated Search bar background Kopieret til udklipsholder Result copied to clipboard diff --git a/lawnchair/res/values-de-rDE/strings.xml b/lawnchair/res/values-de-rDE/strings.xml index 9459706e25..15b2eafafb 100644 --- a/lawnchair/res/values-de-rDE/strings.xml +++ b/lawnchair/res/values-de-rDE/strings.xml @@ -91,6 +91,7 @@ Hintergrund Stil Hintergrundtransparenz + Abgegrenzter Suchleisten-Hintergrund In Zwischenablage kopiert Ergebnis in Zwischenablage kopiert diff --git a/lawnchair/res/values-el-rGR/strings.xml b/lawnchair/res/values-el-rGR/strings.xml index 97317a7642..1747739d22 100644 --- a/lawnchair/res/values-el-rGR/strings.xml +++ b/lawnchair/res/values-el-rGR/strings.xml @@ -91,6 +91,7 @@ Ταπετσαρία Στυλ Αδιαφάνεια φόντου + Separated Search bar background Αντιγράφηκε στο πρόχειρο Το αποτέλεσμα αντιγράφηκε στο πρόχειρο diff --git a/lawnchair/res/values-en-rCA/strings.xml b/lawnchair/res/values-en-rCA/strings.xml index 534874a9fb..b81d98f5d0 100644 --- a/lawnchair/res/values-en-rCA/strings.xml +++ b/lawnchair/res/values-en-rCA/strings.xml @@ -91,6 +91,7 @@ Wallpaper Style Background opacity + Separated Search bar background Copied to clipboard Result copied to clipboard diff --git a/lawnchair/res/values-es-rES/strings.xml b/lawnchair/res/values-es-rES/strings.xml index e85288255f..0633d40cc2 100644 --- a/lawnchair/res/values-es-rES/strings.xml +++ b/lawnchair/res/values-es-rES/strings.xml @@ -91,6 +91,7 @@ Fondo de pantalla Estilo Opacidad del fondo + Separated Search bar background Copiado al portapapeles Resultado copiado al portapapeles diff --git a/lawnchair/res/values-et-rEE/strings.xml b/lawnchair/res/values-et-rEE/strings.xml index e5e4a77d74..65574b3bbb 100644 --- a/lawnchair/res/values-et-rEE/strings.xml +++ b/lawnchair/res/values-et-rEE/strings.xml @@ -91,6 +91,7 @@ Taustapilt Stiil Tausta läbipaistmatus + Separated Search bar background Kopeeriti lõikelauale Tulemus kopeeriti lõikelauale diff --git a/lawnchair/res/values-fa-rIR/strings.xml b/lawnchair/res/values-fa-rIR/strings.xml index 97da776478..aa0e7910ee 100644 --- a/lawnchair/res/values-fa-rIR/strings.xml +++ b/lawnchair/res/values-fa-rIR/strings.xml @@ -91,6 +91,7 @@ کاغذ دیواری سبک شفافیت پس‌زمینه + Separated Search bar background در کلیپ‌بورد کپی شد نتیجه در کلیپ بورد کپی شد diff --git a/lawnchair/res/values-fi-rFI/strings.xml b/lawnchair/res/values-fi-rFI/strings.xml index a1e155724f..72d047f840 100644 --- a/lawnchair/res/values-fi-rFI/strings.xml +++ b/lawnchair/res/values-fi-rFI/strings.xml @@ -91,6 +91,7 @@ Taustakuva Tyyli Taustan läpinäkymättömyys + Separated Search bar background Kopioitu leikepöydälle Tulos kopioitu leikepöydälle diff --git a/lawnchair/res/values-fil-rPH/strings.xml b/lawnchair/res/values-fil-rPH/strings.xml index fe63d3f7c3..8e063ede38 100644 --- a/lawnchair/res/values-fil-rPH/strings.xml +++ b/lawnchair/res/values-fil-rPH/strings.xml @@ -91,6 +91,7 @@ Wallpaper Istillo Kalabuan ng Background + Separated Search bar background Naisalin sa clipboard Nadikit ang resulta sa clipboard diff --git a/lawnchair/res/values-fr-rFR/strings.xml b/lawnchair/res/values-fr-rFR/strings.xml index 69fea01ec8..4c9d626b2a 100644 --- a/lawnchair/res/values-fr-rFR/strings.xml +++ b/lawnchair/res/values-fr-rFR/strings.xml @@ -91,6 +91,7 @@ Fond d\'écran Style Opacité de l\'arrière-plan + Separated Search bar background Copié dans le presse-papiers Résultat copié dans le presse-papiers diff --git a/lawnchair/res/values-gl-rES/strings.xml b/lawnchair/res/values-gl-rES/strings.xml index 712a7c8a4e..6bd03d492e 100644 --- a/lawnchair/res/values-gl-rES/strings.xml +++ b/lawnchair/res/values-gl-rES/strings.xml @@ -91,6 +91,7 @@ Fondo de pantalla Estilo Opacidade do fondo + Separated Search bar background Copiado ao portapapeis Resultado copiado ao portapapeis diff --git a/lawnchair/res/values-hi-rIN/strings.xml b/lawnchair/res/values-hi-rIN/strings.xml index a9a6055210..6cf16f0c6e 100644 --- a/lawnchair/res/values-hi-rIN/strings.xml +++ b/lawnchair/res/values-hi-rIN/strings.xml @@ -91,6 +91,7 @@ वॉलपेपर Style पृष्ठभूमि अपारदर्शिता + Separated Search bar background क्लिपबोर्ड पर कॉपी किया गया Result copied to clipboard diff --git a/lawnchair/res/values-hr-rHR/strings.xml b/lawnchair/res/values-hr-rHR/strings.xml index 5254c42311..e653b65d45 100644 --- a/lawnchair/res/values-hr-rHR/strings.xml +++ b/lawnchair/res/values-hr-rHR/strings.xml @@ -91,6 +91,7 @@ Pozadina Stil Prozirnost pozadine + Separated Search bar background Kopirano u međuspremnik Odabir kopiran u međuspremnik diff --git a/lawnchair/res/values-hu-rHU/strings.xml b/lawnchair/res/values-hu-rHU/strings.xml index 55a38360cc..dc52b9b08d 100644 --- a/lawnchair/res/values-hu-rHU/strings.xml +++ b/lawnchair/res/values-hu-rHU/strings.xml @@ -91,6 +91,7 @@ Háttérkép Stílus Háttér átlátszósága + Separated Search bar background Vágólapra másolva Az eredmény a vágólapra másolva diff --git a/lawnchair/res/values-in-rID/strings.xml b/lawnchair/res/values-in-rID/strings.xml index f4d464a41d..f6f34a6217 100644 --- a/lawnchair/res/values-in-rID/strings.xml +++ b/lawnchair/res/values-in-rID/strings.xml @@ -91,6 +91,7 @@ Wallpaper Gaya Tingkat transparan latar belakang + Separated Search bar background Disalin ke papan klip Hasil disalin ke papan klip diff --git a/lawnchair/res/values-it-rIT/strings.xml b/lawnchair/res/values-it-rIT/strings.xml index eb0bb8cb6f..aa6232808e 100644 --- a/lawnchair/res/values-it-rIT/strings.xml +++ b/lawnchair/res/values-it-rIT/strings.xml @@ -91,6 +91,7 @@ Sfondo Stile Opacità sfondo + Sfondo barra di ricerca separata Copiato negli appunti Risultato copiato negli appunti diff --git a/lawnchair/res/values-iw-rIL/strings.xml b/lawnchair/res/values-iw-rIL/strings.xml index 3092c90fde..489bffb057 100644 --- a/lawnchair/res/values-iw-rIL/strings.xml +++ b/lawnchair/res/values-iw-rIL/strings.xml @@ -91,6 +91,7 @@ רקע Style Background opacity + Separated Search bar background Copied to clipboard Result copied to clipboard diff --git a/lawnchair/res/values-ja-rJP/strings.xml b/lawnchair/res/values-ja-rJP/strings.xml index df4bc802d0..47d86901c6 100644 --- a/lawnchair/res/values-ja-rJP/strings.xml +++ b/lawnchair/res/values-ja-rJP/strings.xml @@ -40,7 +40,7 @@ 完了 すべて選択 すべて選択解除 - Inverse selection + 選択を反転する 読み込み中… 無視 アップデートをダウンロード @@ -55,12 +55,12 @@ by %1$s • %2$s • %3$s たった今 - %dm - %dh - %dd - %dw - %dmo - %dy + %d分 + %d時間 + %d日 + %d週間 + %d月 + %d年 Lawnchair に管理されています 設定 @@ -87,10 +87,11 @@ グリッド レイアウト - Show wallpaper + 壁紙を表示する 壁紙 スタイル 背景の透明度 + 検索バーの背景を区切る クリップボードにコピーしました 結果をクリップボードにコピーしました @@ -98,7 +99,7 @@ 表示する項目 壁紙 - Caddy (Beta) + Caddy(ベータ版) Caddy アプリドロワーのフォルダー ドロワーフォルダー @@ -114,7 +115,7 @@ 固有のアプリのみ表示 自分のフォルダー - To perform certain actions (such as locking your phone) when performing a gesture, Lawnchair requires accessibility access.\n\nLawnchair doesn\'t watch any user action, though the privilege to do so is required for all accessibility services. Lawnchair discards any event sent by the system.\n\nIn order to lock your phone, or to open the Recents screen, Lawnchair uses the performGlobalAction Accessibility service. + ジェスチャー操作時に特定の操作（スマートフォンのロックなど）を実行するには、Lawnchair にユーザー補助機能へのアクセスが必要です。\n\nLawnchair はユーザーの操作を監視しませんが、すべてのユーザー補助サービスにはユーザー補助機能へのアクセス権限が必要です。Lawnchair はシステムから送信されたイベントをすべて破棄します。\n\nLawnchair はスマートフォンをロックしたり、「最近」画面を開いたりするために、performGlobalAction ユーザー補助機能サービスを使用します。 %1$s (%2$d) %1$d × %2$d %1$s & %2$s @@ -139,7 +140,7 @@ 行と列の数 ジェスチャー タップとスワイプ - Recents screen + タスク管理画面 「すべてクリア」ボタン、角の丸み このアプリについて アプリ情報 @@ -154,10 +155,10 @@ ホーム画面のグリッド数を 10 × 10 から 20 × 20 まで増やします 常にアイコンを再読み込みします アイコンパックからキャッシュされたアイコンを使用しないようにします - Icon swipe gestures - Perform actions when swiping left or right on icons instead of moving the home screen - Deck layout - Show a layout option to hide the app drawer and automatically add new apps to the home screen + アイコンのスワイプジェスチャー + アイコンを左右にスワイプした時にホーム画面の移動の代わりにアクションを実行します + ドックのレイアウト + アプリドロワーを非表示にし、自動的に新しいアプリをホーム画面に追加するためのレイアウトオプションを表示します ロック/ロック解除 「すべてクリア」を押したときに選択したアプリを閉じないようにします @@ -222,9 +223,9 @@ 丸みがかった正方形 水滴型 - Four-sided cookie - Seven-sided cookie - Arch + 四面クッキー + 七面クッキー + アーチ カスタムアイコン形状 カスタムアイコン形状を作成します @@ -243,12 +244,12 @@ アイコンパック テーマアイコンのソース - Tint with accent color + アクセントカラーで染色する システムアイコン テーマアイコン オフ ホーム画面 - Home screen and app drawer + ホーム画面とドロワー サポートされているアイコンパックがありません フォントを追加 @@ -341,7 +342,7 @@ Smartspacer の設定 タップでセットアップ - To use %1$s, turn on Notification Dots. + %1$sを使用するには、通知ドットをオンにします。 ホーム画面に表示します スナップショットは、Lawnchairウィジェットを配置することでホーム画面に手動で追加できます @@ -373,8 +374,8 @@ 法的事項 謝辞 プライバシーポリシー - Active - Failed to check for updates + アクティブ + アップデートの確認に失敗しました ドックを表示 - Search bar settings are available when the Dock is visible. Tap to show the Dock. + 検索バーの設定は、Dock が表示されているときに利用できます。Dock を表示するにはタップしてください。 検索バー 検索バーの設定 検索バーウィジェット @@ -507,22 +508,22 @@ 背景色 背景の透明度 - Pause - Pause %1$s? - Notifications for %1$s will be paused - App paused - %1$s was directly paused from the launcher - Pause app + 一時停止 + %1$s を一時停止しますか？ + %1$s の通知は一時停止されます + アプリを一時停止中 + %1$s はランチャーから直接一時停止しました + アプリを一時停止 ドックアイコン 下の余白 ページインジケーターの高さ アプリ検索 カスタム - %1$s and Lawnchair have a revenue share agreement.\n\nSearching with %1$s helps support Lawnchair. + %1$s と Lawnchair は収益分配契約を持っています。\n\n %1$s で検索するとLawnchair をサポートすることができます。 アプリ ウェブサイト - App required + アプリが必要 検索 Google レンズ @@ -551,9 +552,9 @@ 最大のフォルダー列数 フォルダーの行の最大値 - These settings will be ignored as Lawnchair isn\'t set as the Recents screen provider - Incompatible system integration - Your device is configured to have system gestures (known as Quickstep) provided by %1$s, but this version of %1$s isn\'t compatible with your Android version. To continue using your device, please uninstall %1$s updates or disable %1$s as a system gesture provider. + Lawnchair がアプリ履歴画面のプロバイダーとして設定されていないため、これらの設定は無視されます + 互換性のないシステム統合 + お使いのデバイスは %1$s が提供するシステムジェスチャー ( Quickstep として知られています) が設定されていますが %1$s のこのバージョンはお使いの Android のバージョンと互換性がありません。デバイスを引き続き使用するには、%1$s の更新をアンインストールするか、システムジェスチャープロバイダとして %1$s を無効にしてください。 半透明の背景 背景の透明度 クイックアクション @@ -562,8 +563,8 @@ すべてクリア 強制的に閉じる 画面の角の半径 - Custom screen corner radius - When you swipe up to open the Recents screen, the current app follows your finger, shrinking into a card. Use this slider to adjust the corner radius of the card when it\'s nearly full screen so it matches the corners of your screen. + 画面の角の半径 + アプリ履歴画面を開くために上にスワイプすると、現在のアプリは指に従ってカードに縮小します。 このスライダーを使用して、画面の角に合うようにカードの角の半径を調節します。 タスクバー タスクバーを表示(実験的な機能) - Search apps, web, and more + アプリ、ウェブ、その他を検索 アプリを検索 %1$s と一致するアプリがありません Web @@ -582,7 +583,7 @@ アプリストアで検索 %1$sで検索 アプリストアかブラウザがインストールされていません - Search on the web + Web検索 検索履歴を消去 検索ボックスをクリア @@ -592,24 +593,24 @@ あいまい検索 アプリ検索でおおよその検索ができます サジェスト - Show suggested apps at the top of the drawer + ドロワーの上部に提案されたアプリを表示 デバイスを探す - Search your phone contacts, files, and settings + 連絡先、ファイル、設定を検索 検索結果に非表示のアプリを表示する 完全一致で表示する - Web suggestion provider - Show web suggestion provider icon in search bar + Web提案プロバイダー + 検索バーにウェブ提案プロバイダーのアイコンを表示する ドック検索バーのアクションを一致させる ドック検索バーをクリックすると、アプリドロワーの検索UIを開きます 検索のアルゴリズム アプリ検索 グローバル検索 (デバイス上) グローバル検索 (ASI 経由) - Search engine name - Search engine URL - Dearch suggestions URL - %s will be replaced with the search query - %s will be replaced with the search query. Results must be in JSON OpenSearch format. + 検索エンジン名 + 検索エンジンのURL + 検索候補のURL + %sは検索クエリに置き換えられます + %s は検索クエリに置き換えられます。結果は JSON OpenSearch 形式である必要があります。 検索結果を表示 アプリとショートカット @@ -618,17 +619,17 @@ Pixel のヒント Android 設定 ファイル - Photos and videos - Audio files - All files + 画像と動画 + 音声ファイル + 全てのファイル ウェブの提案 検索履歴 電卓 - Start searching - Find apps, contacts, and more. Your recent searches will appear here. - Find apps, contacts, and more. + 検索を開始 + アプリ、連絡先などを検索します。最近の検索はここに表示されます。 + アプリ、連絡先などを検索します。 - Search on + 検索するもの メディア、ファイル、その他 連絡先やその他 %1$sで検索 @@ -638,38 +639,38 @@ ファイルの表示件数 システム設定の表示件数 検索履歴の表示件数 - Maximum number of suggestions - Maximum web suggestion delay + 候補の最大個数 + ウェブ提案の最大遅延 通知へのアクセス権が必要です 通知ドットを表示するには、 %1$s のアプリ通知をオンにします。 - Contacts permission needed - To search for contacts, grant contacts and phone permissions to %1$s - Music and audio access needed - To search your music and other audio files, %1$s needs permission to access your media library. + 連絡先へのアクセス権限が必要です + 連絡先を検索するには、%1$s に連絡先と電話の権限を付与してください + 音楽とオーディオのアクセスが必要です + 音楽やその他のオーディオファイルを検索するには、 %1$s がメディアライブラリにアクセスする権限が必要です。 - Photos and videos access needed - To search your photos and videos, %1$s needs permission to access your media library. - Access your full media library? - To search all your photos and videos, %1$s needs full access to your media library. - Grant full media permissions - Manage selected items + 写真とビデオへのアクセスが必要です + 音楽やその他のオーディオファイルを検索するには、 %1$s がメディアライブラリにアクセスする権限が必要です。 + 全メディアライブラリにアクセスしますか？ + すべての写真とビデオを検索するには、 %1$s がメディアライブラリにフルアクセスする必要があります。 + メディアの全権限を付与する + 選択したアイテムを管理 - External storage access needed - To search your files, %1$s needs permission to access your device\'s external storage. - Manage storage access needed - To display your files in search results, %1$s requires permission to manage all files on your device. This permission is used solely to list files and will not be used to read or change the content of your personal files. - To display wallpaper previews and include them in backups, %1$s requires permission %2$s. This is due to system limitations for accessing wallpaper data. - to read all files on your device - to manage all files on your device - Multiple permissions needed - To display wallpaper previews and include them in backups, %1$s requires the following permissions. This is due to system limitations for accessing wallpaper data. - Manage all files on device - Read photos and videos - Cannot enable manage storage access - Due to Play Store policy, %1$s cannot request full storage access here. To access all files, please download %1$s from GitHub. Alternatively, you can grant access to photos, videos, and audio files individually in settings. + 外部ストレージへのアクセスが必要です + ファイルを検索するには、 %1$s がデバイスのストレージにアクセスする権限が必要です。 + ストレージへのアクセスが必要です + 検索結果にファイルを表示するには、 %1$s にデバイス上のすべてのファイルを管理する権限が必要です。 この権限はファイルを一覧表示するためにのみ使用され、個人ファイルの内容を読み取りまたは変更するために使用されません。 + 壁紙のプレビューを表示し、バックアップに含めるには、 %1$s 権限 %2$sが必要です。 これは壁紙データにアクセスするシステムの制限によるものです。 + デバイス上のすべてのファイルを読み込むために + デバイス上のすべてのファイルを管理する + 複数の権限が必要です + 壁紙のプレビューを表示し、バックアップに含めるには、 %1$s 権限 が必要です。 これは壁紙データにアクセスするシステムの制限によるものです。 + デバイス上のすべてのファイルを管理 + 写真や動画の読み取り + ストレージの管理権限を有効にできません + Playストアのポリシーにより、%1$s はここでストレージへのフルアクセスをリクエストできません。すべてのファイルにアクセスするには、GitHubから %1$s をダウンロードしてください。または、設定で写真、動画、音声ファイルへのアクセスを個別に許可することもできます。 設定を開く 権限の許可 - Permissions needed - Tap to grant permissions + 権限が必要です + タップして権限を付与 diff --git a/lawnchair/res/values-ka-rGE/strings.xml b/lawnchair/res/values-ka-rGE/strings.xml index 1983e28d1a..c0b7ee07cd 100644 --- a/lawnchair/res/values-ka-rGE/strings.xml +++ b/lawnchair/res/values-ka-rGE/strings.xml @@ -91,6 +91,7 @@ ფონი Style ფონის გამჭვირვალობა + Separated Search bar background კოპირებულია Result copied to clipboard diff --git a/lawnchair/res/values-kmr-rTR/strings.xml b/lawnchair/res/values-kmr-rTR/strings.xml index 7ef3f0fba1..a351e90392 100644 --- a/lawnchair/res/values-kmr-rTR/strings.xml +++ b/lawnchair/res/values-kmr-rTR/strings.xml @@ -91,6 +91,7 @@ Wallpaper Style Background opacity + Separated Search bar background Copied to clipboard Result copied to clipboard diff --git a/lawnchair/res/values-ko-rKR/strings.xml b/lawnchair/res/values-ko-rKR/strings.xml index ad1daf3c4f..e5dffe9e1f 100644 --- a/lawnchair/res/values-ko-rKR/strings.xml +++ b/lawnchair/res/values-ko-rKR/strings.xml @@ -42,25 +42,25 @@ 모두 선택 해제 선택 반전 불러오는 중... - Dismiss + 취소 업데이트 다운로드 업데이트 설치 - View changes + 변경사항 보기 최신 버전입니다! - Updates - Failed to load changes - No changes found - Build #%1$d → #%2$d - by %1$s • %2$s • %3$s + 업데이트 + 변경 사항을 불러오는데 실패하였습니다. + 변경 사항이 없습니다 + 빌드 #%1$d → #%2$d + %1$s • %2$s • %3$s - just now - %dm - %dh - %dd - %dw - %dmo - %dy + 방금 + %d분 + %d시간 + %d일 + %d주 + %d달 + %d년 Lawnchair에서 관리 설정 @@ -87,10 +87,11 @@ 그리드 레이아웃 - Show wallpaper + 배경화면 보기 배경화면 스타일 배경 투명도 + 검색 창 배경 분리 클립보드에 복사했습니다 결과를 클립보드에 복사했습니다 @@ -114,10 +115,10 @@ 중복 앱 숨기기 내 폴더 - 특정 액션들 (휴대전화 잠그기 같은 액션)을 제스처로 발동시키려면, Lawnchair 가 접근성 기능에 접근해야 합니다. \n\nLawnchair 는 접근성 기능을 필요로 하지만 사용자의 활동을 감시하지 않으며, 시스템에서 발송된 모든 이벤트는 삭제됩니다. \n\nLawnchair 는 휴대전화를 잠그거나 최근 앱을 보기 위해서 GlobalActionAccessbility 서비스를 사용합니다. + 특정 액션들(휴대전화 잠그기 같은 액션)을 제스처로 발동시키려면, Lawnchair가 접근성 기능에 접근해야 합니다. \n\nLawnchair는 접근성 기능을 필요로 하지만 사용자의 활동을 감시하지 않으며, 시스템에서 발송된 모든 이벤트는 삭제됩니다. \n\nLawnchair는 휴대전화를 잠그거나 최근 앱을 보기 위해서 GlobalActionAccessbility 서비스를 사용합니다. %1$s (%2$d) %1$d x %2$d - %1$s 및 %2$s + %1$s & %2$s 고급 글꼴 사용자 정의 @@ -222,9 +223,9 @@ 둥근 사각형 물방울 - Four-sided cookie - Seven-sided cookie - Arch + 사각형 쿠키 + 칠각형 쿠키 + 아치 아이콘 모양 사용자 정의 사용자 정의 아이콘 모양 만들기 @@ -367,14 +368,14 @@ 퀵 스위치 점검 DevOps 지원 및 홍보 - Community - Telegram + 커뮤니티 + 텔레그램 뉴스 Legal 감사의 말 - Privacy policy - Active - Failed to check for updates + 개인정보 처리방침 + 작동 중 + 업데이트를 확인하는데 실패하였습니다 - Search apps, web, and more + 앱, 웹 등을 검색 앱 검색 \"%1$s\"(와)과 일치는 앱 없습니다. 웹으로부터 @@ -605,11 +606,11 @@ 앱 검색 글로벌 검색(기기 내) 글로벌 검색 (ASI를 통해) - Search engine name - Search engine URL - Dearch suggestions URL + 검색 엔진 이름 + 검색 엔진 URL + 검색 제안 URL %가 검색 쿼리로 대체됩니다 - %s will be replaced with the search query. Results must be in JSON OpenSearch format. + %s는 검색어로 대체됩니다. 결과는 JSON OpenSearch 형식이어야 합니다. 검색 결과에 보여주기 앱과 바로가기 @@ -618,17 +619,17 @@ Pixel 도움말 Android 설정 파일 - Photos and videos - Audio files - All files + 사진과 비디오 + 오디오 파일 + 모든 파일 웹 제안 검색 기록 계산기 - Start searching - Find apps, contacts, and more. Your recent searches will appear here. - Find apps, contacts, and more. + 검색 시작 + 앱, 연락처 등을 찾아보세요. 최근 검색 결과가 여기에 표시됩니다. + 앱, 연락처 등을 검색 - Search on + 검색 미디어, 파일 등 연락처 등 %1$s 제공 @@ -643,33 +644,33 @@ 알림 액세스가 필요합니다. 알림 점을 표시하려면 %1$s에 대한 앱 알림을 켜세요. - Contacts permission needed - To search for contacts, grant contacts and phone permissions to %1$s - Music and audio access needed - To search your music and other audio files, %1$s needs permission to access your media library. + 연락처 권한이 필요합니다 + 연락처를 검색하려면 %1$s에 연락처 및 전화 권한을 부여하세요 + 음악과 오디오 권한이 필요합니다 + 음악 및 기타 오디오 파일을 검색하려면 %1$s에 미디어 라이브러리에 대한 액세스 권한이 필요합니다. - Photos and videos access needed - To search your photos and videos, %1$s needs permission to access your media library. - Access your full media library? - To search all your photos and videos, %1$s needs full access to your media library. - Grant full media permissions - Manage selected items + 사진과 비디오 권한이 필요합니다 + 사진 및 비디오 파일을 검색하려면 %1$s에 미디어 라이브러리에 대한 액세스 권한이 필요합니다. + 전체 미디어 라이브러리에 액세스 하시겠습니까? + 모든 사진과 동영상을 검색하려면 %1$s에서 미디어 라이브러리에 대한 전체 액세스 권한이 필요합니다. + 전체 미디어 권한 + 선택한 항목 관리 - External storage access needed - To search your files, %1$s needs permission to access your device\'s external storage. - Manage storage access needed - To display your files in search results, %1$s requires permission to manage all files on your device. This permission is used solely to list files and will not be used to read or change the content of your personal files. - To display wallpaper previews and include them in backups, %1$s requires permission %2$s. This is due to system limitations for accessing wallpaper data. - to read all files on your device - to manage all files on your device - Multiple permissions needed - To display wallpaper previews and include them in backups, %1$s requires the following permissions. This is due to system limitations for accessing wallpaper data. - Manage all files on device - Read photos and videos - Cannot enable manage storage access - Due to Play Store policy, %1$s cannot request full storage access here. To access all files, please download %1$s from GitHub. Alternatively, you can grant access to photos, videos, and audio files individually in settings. + 외부 스토리지 엑세스 권한이 필요합니다 + 파일을 검색하려면 %1$s에 기기의 외부 저장소에 대한 액세스 권한이 필요합니다. + 스토리지 관리 권한이 필요합니다 + 검색 결과에 파일을 표시하려면 %1$s에 기기의 모든 파일을 관리할 수 있는 권한이 필요합니다. 이 권한은 파일 목록을 표시하는 데만 사용되며 개인 파일의 내용을 읽거나 변경하는 데는 사용되지 않습니다. + 배경화면 미리보기를 표시하고 백업에 포함하려면 %1$s에 %2$s 권한이 필요합니다. 이는 배경화면 데이터 접근에 대한 시스템 제한으로 인해 발생합니다. + 기기의 모든 파일을 읽으려면 + 기기의 모든 파일을 관리하려면 + 여러 권한이 필요합니다 + 배경화면 미리보기를 표시하고 백업에 포함하려면 %1$s에 다음 권한이 필요합니다. 이는 배경화면 데이터 접근에 대한 시스템 제한으로 인해 발생합니다. + 기기의 모든 파일 관리 + 사진과 비디오 읽기 + 저장소 액세스 관리를 활성화할 수 없습니다 + Play 스토어 정책으로 인해 %1$s은(는) 여기에서 전체 저장 공간 접근 권한을 요청할 수 없습니다. 모든 파일에 접근하려면 GitHub에서 %1$s을(를) 다운로드하세요. 또는 설정에서 사진, 동영상, 오디오 파일에 대한 접근 권한을 개별적으로 부여할 수 있습니다. 설정 열기 권한 부여 - Permissions needed + 권한이 필요합니다 여기를 눌러 권한 허용 diff --git a/lawnchair/res/values-lt-rLT/strings.xml b/lawnchair/res/values-lt-rLT/strings.xml index 9edefe6286..a8fcc8bc32 100644 --- a/lawnchair/res/values-lt-rLT/strings.xml +++ b/lawnchair/res/values-lt-rLT/strings.xml @@ -91,6 +91,7 @@ Ekrano Fonas Style Fono skaidrumas + Separated Search bar background Nukopijuota į iškarpinę Result copied to clipboard diff --git a/lawnchair/res/values-ml-rIN/strings.xml b/lawnchair/res/values-ml-rIN/strings.xml index a6ecc133aa..730cf04f22 100644 --- a/lawnchair/res/values-ml-rIN/strings.xml +++ b/lawnchair/res/values-ml-rIN/strings.xml @@ -91,6 +91,7 @@ വാൾപേപ്പർ ശൈലി പശ്ചാത്തല അതാര്യത + Separated Search bar background ക്ലിപ്പ്ബോർഡിലേക്ക് പകർത്തി ഫലം ക്ലിപ്പ്ബോർഡിലേക്ക് പകർത്തി diff --git a/lawnchair/res/values-mr-rIN/strings.xml b/lawnchair/res/values-mr-rIN/strings.xml index 8066ef37d6..203f9e2be1 100644 --- a/lawnchair/res/values-mr-rIN/strings.xml +++ b/lawnchair/res/values-mr-rIN/strings.xml @@ -91,6 +91,7 @@ Wallpaper Style Background opacity + Separated Search bar background Copied to clipboard Result copied to clipboard diff --git a/lawnchair/res/values-nl-rNL/strings.xml b/lawnchair/res/values-nl-rNL/strings.xml index 058049559f..5aa43591e9 100644 --- a/lawnchair/res/values-nl-rNL/strings.xml +++ b/lawnchair/res/values-nl-rNL/strings.xml @@ -91,6 +91,7 @@ Achtergrond Stijl Achtergronddekking + Achtergrond afzonderlijke zoekbalk Gekopieerd naar klembord Resultaat gekopieerd naar klembord diff --git a/lawnchair/res/values-no-rNO/strings.xml b/lawnchair/res/values-no-rNO/strings.xml index 6cf2aa26e8..0295990d57 100644 --- a/lawnchair/res/values-no-rNO/strings.xml +++ b/lawnchair/res/values-no-rNO/strings.xml @@ -91,6 +91,7 @@ Bakgrunn Style Bakgrunnens gjennomsiktighet + Separated Search bar background Kopiert til utklippstavle Result copied to clipboard diff --git a/lawnchair/res/values-pl-rPL/strings.xml b/lawnchair/res/values-pl-rPL/strings.xml index e1f9133d4d..0a8dcb2b58 100644 --- a/lawnchair/res/values-pl-rPL/strings.xml +++ b/lawnchair/res/values-pl-rPL/strings.xml @@ -91,6 +91,7 @@ Tapeta Styl Zakrycie tła + Separated Search bar background Skopiowano do schowka Wynik został skopiowany do schowka diff --git a/lawnchair/res/values-pt-rBR/strings.xml b/lawnchair/res/values-pt-rBR/strings.xml index 8681198657..b3beb9cc48 100644 --- a/lawnchair/res/values-pt-rBR/strings.xml +++ b/lawnchair/res/values-pt-rBR/strings.xml @@ -91,6 +91,7 @@ Papel de Parede Estilo Opacidade do fundo + Separated Search bar background Copiado para a área de transferência Resultado copiado para a área de transferência diff --git a/lawnchair/res/values-pt-rPT/strings.xml b/lawnchair/res/values-pt-rPT/strings.xml index 75c2d711ed..c29acdb4c3 100644 --- a/lawnchair/res/values-pt-rPT/strings.xml +++ b/lawnchair/res/values-pt-rPT/strings.xml @@ -91,6 +91,7 @@ Papel de parede Style Opacidade do fundo + Separated Search bar background Copiado para a área de transferência Resultado copiado para a área de transferência diff --git a/lawnchair/res/values-ro-rRO/strings.xml b/lawnchair/res/values-ro-rRO/strings.xml index 51b94df132..c002b6e847 100644 --- a/lawnchair/res/values-ro-rRO/strings.xml +++ b/lawnchair/res/values-ro-rRO/strings.xml @@ -91,6 +91,7 @@ Fundal Style Background opacity + Separated Search bar background Copied to clipboard Result copied to clipboard diff --git a/lawnchair/res/values-ru-rRU/strings.xml b/lawnchair/res/values-ru-rRU/strings.xml index 93671c8beb..0766ecebae 100644 --- a/lawnchair/res/values-ru-rRU/strings.xml +++ b/lawnchair/res/values-ru-rRU/strings.xml @@ -91,6 +91,7 @@ На основе обоев Стиль Прозрачность фона + Separated Search bar background Скопировано в буфер обмена Результат скопирован в буфер обмена diff --git a/lawnchair/res/values-sk-rSK/strings.xml b/lawnchair/res/values-sk-rSK/strings.xml index 4bae9daa87..b3975360a1 100644 --- a/lawnchair/res/values-sk-rSK/strings.xml +++ b/lawnchair/res/values-sk-rSK/strings.xml @@ -91,6 +91,7 @@ Tapeta Style Priehľadnosť pozadia + Separated Search bar background Kopírovať do schránky Result copied to clipboard diff --git a/lawnchair/res/values-sl-rSI/strings.xml b/lawnchair/res/values-sl-rSI/strings.xml index b8fbb1324a..e21088b867 100644 --- a/lawnchair/res/values-sl-rSI/strings.xml +++ b/lawnchair/res/values-sl-rSI/strings.xml @@ -91,6 +91,7 @@ Ozadje Style Background opacity + Separated Search bar background Copied to clipboard Result copied to clipboard diff --git a/lawnchair/res/values-sq-rAL/strings.xml b/lawnchair/res/values-sq-rAL/strings.xml index e6bdb6adda..bc320289d0 100644 --- a/lawnchair/res/values-sq-rAL/strings.xml +++ b/lawnchair/res/values-sq-rAL/strings.xml @@ -91,6 +91,7 @@ Sfondi Style Tejdukshmëria e sfondit + Separated Search bar background Kopjoni Result copied to clipboard diff --git a/lawnchair/res/values-sr/strings.xml b/lawnchair/res/values-sr/strings.xml index ae0ed8163b..219d614864 100644 --- a/lawnchair/res/values-sr/strings.xml +++ b/lawnchair/res/values-sr/strings.xml @@ -91,6 +91,7 @@ Позадина Стил Непрозирност позадине + Separated Search bar background Копирано у привремену меморију Резултат је копиран у привремену меморију diff --git a/lawnchair/res/values-sv-rSE/strings.xml b/lawnchair/res/values-sv-rSE/strings.xml index de11152f81..f633ae2491 100644 --- a/lawnchair/res/values-sv-rSE/strings.xml +++ b/lawnchair/res/values-sv-rSE/strings.xml @@ -91,6 +91,7 @@ Bakgrundsbild Stil Bakgrundens opacitet + Separerad bakgrund för sökfältet Kopierad till urklipp Resultat kopierat till urklipp diff --git a/lawnchair/res/values-sw-rKE/strings.xml b/lawnchair/res/values-sw-rKE/strings.xml index 91109208c2..a5c36f787f 100644 --- a/lawnchair/res/values-sw-rKE/strings.xml +++ b/lawnchair/res/values-sw-rKE/strings.xml @@ -91,6 +91,7 @@ Wallpaper Style Background opacity + Separated Search bar background Copied to clipboard Result copied to clipboard diff --git a/lawnchair/res/values-ta-rIN/strings.xml b/lawnchair/res/values-ta-rIN/strings.xml index c6327b6f73..950ac5d628 100644 --- a/lawnchair/res/values-ta-rIN/strings.xml +++ b/lawnchair/res/values-ta-rIN/strings.xml @@ -91,6 +91,7 @@ சுவர்த்தாள் Style பின்னணி ஒளிபுகாநிலை + Separated Search bar background நகலகத்தில் நகலெடுக்கப்பட்டது Result copied to clipboard diff --git a/lawnchair/res/values-te-rIN/strings.xml b/lawnchair/res/values-te-rIN/strings.xml index f5b2d4a03b..0e5bafe137 100644 --- a/lawnchair/res/values-te-rIN/strings.xml +++ b/lawnchair/res/values-te-rIN/strings.xml @@ -91,6 +91,7 @@ Wallpaper Style Background opacity + Separated Search bar background Copied to clipboard Result copied to clipboard diff --git a/lawnchair/res/values-th-rTH/strings.xml b/lawnchair/res/values-th-rTH/strings.xml index a1ac0b4542..a9cc86040c 100644 --- a/lawnchair/res/values-th-rTH/strings.xml +++ b/lawnchair/res/values-th-rTH/strings.xml @@ -91,6 +91,7 @@ ภาพพื้นหลัง สไตล์ ความทึบของพื้นหลัง + Separated Search bar background คัดลอกไปยังคลิปบอร์ดแล้ว Result copied to clipboard diff --git a/lawnchair/res/values-tr-rTR/strings.xml b/lawnchair/res/values-tr-rTR/strings.xml index 21b6667ba7..e3e9579b22 100644 --- a/lawnchair/res/values-tr-rTR/strings.xml +++ b/lawnchair/res/values-tr-rTR/strings.xml @@ -91,6 +91,7 @@ Duvar Kağıdı Stil Arka plan opaklığı + Separated Search bar background Panoya kaydedildi Sonuç panoya kopyalandı diff --git a/lawnchair/res/values-uk-rUA/strings.xml b/lawnchair/res/values-uk-rUA/strings.xml index e69885f515..a441dedf51 100644 --- a/lawnchair/res/values-uk-rUA/strings.xml +++ b/lawnchair/res/values-uk-rUA/strings.xml @@ -91,6 +91,7 @@ Шпалери Стиль Прозорість фону + Separated Search bar background Скопійовано до буфера обміну Результат скопійовано до буфера обміну diff --git a/lawnchair/res/values-ur-rIN/strings.xml b/lawnchair/res/values-ur-rIN/strings.xml index b0335f4766..6c72851c9a 100644 --- a/lawnchair/res/values-ur-rIN/strings.xml +++ b/lawnchair/res/values-ur-rIN/strings.xml @@ -91,6 +91,7 @@ وال پیپر انداز پس منظر کی دھندلاپن + Separated Search bar background کلپ بورڈ پر کاپی ہو گیا۔ نتیجہ کلپ بورڈ پر کاپی ہو گیا۔ diff --git a/lawnchair/res/values-ur-rPK/strings.xml b/lawnchair/res/values-ur-rPK/strings.xml index be550479ab..ff061f06f9 100644 --- a/lawnchair/res/values-ur-rPK/strings.xml +++ b/lawnchair/res/values-ur-rPK/strings.xml @@ -91,6 +91,7 @@ وال پیپر انداز پس منظر کی دھندلاپن + Separated Search bar background کلپ بورڈ پر کاپی ہو گیا۔ نتیجہ کلپ بورڈ پر کاپی ہو گیا۔ diff --git a/lawnchair/res/values-uz-rUZ/strings.xml b/lawnchair/res/values-uz-rUZ/strings.xml index dd9dbd3f06..621fe0ac0d 100644 --- a/lawnchair/res/values-uz-rUZ/strings.xml +++ b/lawnchair/res/values-uz-rUZ/strings.xml @@ -91,6 +91,7 @@ Wallpaper Style Background opacity + Separated Search bar background Copied to clipboard Result copied to clipboard diff --git a/lawnchair/res/values-vi-rVN/strings.xml b/lawnchair/res/values-vi-rVN/strings.xml index 2829b51329..a5691714e6 100644 --- a/lawnchair/res/values-vi-rVN/strings.xml +++ b/lawnchair/res/values-vi-rVN/strings.xml @@ -91,6 +91,7 @@ Hình nền Phong cách Độ mờ của nền + Separated Search bar background Đã sao chép Kết quả đã sao chép vào bảng nhớ tạm diff --git a/lawnchair/res/values-zh-rCN/strings.xml b/lawnchair/res/values-zh-rCN/strings.xml index 70e951f58f..6b1b702146 100644 --- a/lawnchair/res/values-zh-rCN/strings.xml +++ b/lawnchair/res/values-zh-rCN/strings.xml @@ -91,6 +91,7 @@ 壁纸 样式 背景不透明度 + Separated Search bar background 已复制到剪贴板 内容已经复制到粘贴板 diff --git a/lawnchair/res/values-zh-rTW/strings.xml b/lawnchair/res/values-zh-rTW/strings.xml index 34105b0140..1733f6525e 100644 --- a/lawnchair/res/values-zh-rTW/strings.xml +++ b/lawnchair/res/values-zh-rTW/strings.xml @@ -91,6 +91,7 @@ 桌布 樣式 背景不透明度 + Separated Search bar background 已複製至剪貼簿 已將結果複製至剪貼簿 diff --git a/lawnchair/res/values/config.xml b/lawnchair/res/values/config.xml index ad744e4acb..a5ab4bc714 100644 --- a/lawnchair/res/values/config.xml +++ b/lawnchair/res/values/config.xml @@ -119,6 +119,7 @@ true false false + true true true false diff --git a/lawnchair/res/values/strings.xml b/lawnchair/res/values/strings.xml index ec1e66c0aa..30f5b62e26 100644 --- a/lawnchair/res/values/strings.xml +++ b/lawnchair/res/values/strings.xml @@ -108,6 +108,7 @@ Wallpaper Style Background opacity + Separated Search bar background Copied to clipboard diff --git a/lawnchair/src/app/lawnchair/DeviceProfileOverrides.kt b/lawnchair/src/app/lawnchair/DeviceProfileOverrides.kt index 27f4877170..d643657f95 100644 --- a/lawnchair/src/app/lawnchair/DeviceProfileOverrides.kt +++ b/lawnchair/src/app/lawnchair/DeviceProfileOverrides.kt @@ -115,10 +115,14 @@ class DeviceProfileOverrides @Inject constructor( // apply icon and text size idp.iconSize[INDEX_DEFAULT] *= iconSizeFactor - idp.allAppsIconSize[INDEX_DEFAULT] *= allAppsIconSizeFactor idp.iconSize[INDEX_LANDSCAPE] *= iconSizeFactor idp.iconSize[INDEX_TWO_PANEL_PORTRAIT] *= iconSizeFactor idp.iconSize[INDEX_TWO_PANEL_LANDSCAPE] *= iconSizeFactor + + idp.allAppsIconSize[INDEX_DEFAULT] *= allAppsIconSizeFactor + idp.allAppsIconSize[INDEX_LANDSCAPE] *= allAppsIconSizeFactor + idp.allAppsIconSize[INDEX_TWO_PANEL_PORTRAIT] *= allAppsIconSizeFactor + idp.allAppsIconSize[INDEX_TWO_PANEL_LANDSCAPE] *= allAppsIconSizeFactor } } diff --git a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt index f6a4700ced..1d080d19fe 100644 --- a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt +++ b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt @@ -136,6 +136,15 @@ class LawnchairLauncher : QuickstepLauncher() { } override fun onStateTransitionComplete(finalState: LauncherState) {} } + private val clearSearchStateListener = object : StateManager.StateListener { + override fun onStateTransitionComplete(finalState: LauncherState) { + if (finalState == LauncherState.NORMAL && mAppsView != null && mAppsView.isSearching) { + mAppsView?.post { + mAppsView.reset(false, true) + } + } + } + } private lateinit var colorScheme: ColorScheme private var hasBackGesture = false @@ -151,6 +160,7 @@ class LawnchairLauncher : QuickstepLauncher() { preferenceManager2.enableFeed.get().distinctUntilChanged().onEach { enable -> defaultOverlay.setEnableFeed(enable) }.launchIn(scope = lifecycleScope) + launcher.stateManager.addStateListener(clearSearchStateListener) if (prefs.autoLaunchRoot.get()) { lifecycleScope.launch { diff --git a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt index 0e260b2336..92f75869f7 100644 --- a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt +++ b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt @@ -175,6 +175,12 @@ class PreferenceManager2 @Inject constructor( defaultValue = ColorOption.fromString(context.getString(R.string.config_default_app_drawer_bg_color)), ) + val appDrawerSearchBarBackground = preference( + key = booleanPreferencesKey(name = "all_apps_search_bar_background"), + defaultValue = context.resources.getBoolean(R.bool.config_default_search_bar_background), + onSet = { reloadHelper.recreate() }, + ) + val notificationDotColor = preference( key = stringPreferencesKey(name = "notification_dot_color"), parse = ColorOption::fromString, diff --git a/lawnchair/src/app/lawnchair/smartspace/CardPagerAdapter.kt b/lawnchair/src/app/lawnchair/smartspace/CardPagerAdapter.kt index 4129f31d4d..8a9f482e9d 100644 --- a/lawnchair/src/app/lawnchair/smartspace/CardPagerAdapter.kt +++ b/lawnchair/src/app/lawnchair/smartspace/CardPagerAdapter.kt @@ -1,17 +1,24 @@ package app.lawnchair.smartspace import android.content.Context +import android.graphics.Color import android.util.SparseArray import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.viewpager.widget.PagerAdapter +import app.lawnchair.preferences2.PreferenceManager2.Companion.getInstance import app.lawnchair.smartspace.model.SmartspaceTarget +import app.lawnchair.theme.color.ColorMode +import app.lawnchair.util.isWallpaperDark import com.android.launcher3.R import com.android.launcher3.util.Themes +import com.patrykmichalik.opto.core.firstBlocking class CardPagerAdapter(context: Context) : PagerAdapter() { + private val preferenceManager2 = getInstance(context) + val colorMode: ColorMode = preferenceManager2.workspaceTextColor.firstBlocking() private val currentTextColor = Themes.getAttrColor(context, R.attr.workspaceTextColor) private val targets = mutableListOf() private var smartspaceTargets = targets @@ -71,7 +78,9 @@ class CardPagerAdapter(context: Context) : PagerAdapter() { val target = smartspaceTargets[viewHolder.position] val card = viewHolder.card card.setSmartspaceTarget(target, smartspaceTargets.size > 1) - card.setPrimaryTextColor(currentTextColor) + val isDark = isWallpaperDark(card.context) + val dynamicColors = if (isDark) Color.WHITE else Color.BLACK + card.setPrimaryTextColor(if (colorMode == ColorMode.AUTO) dynamicColors else currentTextColor) } override fun getCount() = smartspaceTargets.size diff --git a/lawnchair/src/app/lawnchair/ui/preferences/about/acknowledgements/AcknowledgementsViewModel.kt b/lawnchair/src/app/lawnchair/ui/preferences/about/acknowledgements/AcknowledgementsViewModel.kt index ced2959ecf..99be8348b9 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/about/acknowledgements/AcknowledgementsViewModel.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/about/acknowledgements/AcknowledgementsViewModel.kt @@ -45,7 +45,7 @@ class AcknowledgementsViewModel( ) companion object { - private const val ACKNOWLEDGEMENTS_FILE_PATH = "app/cash/licensee/artifacts.json" + private const val ACKNOWLEDGEMENTS_FILE_PATH = "licenses.json" private const val TAG = "AcknowledgementsViewmModel" } } diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/AppDrawerPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/AppDrawerPreferences.kt index 6215ffe10d..eb03df438a 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/destinations/AppDrawerPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/destinations/AppDrawerPreferences.kt @@ -97,6 +97,10 @@ fun AppDrawerPreferences( valueRange = 0F..1F, showAsPercentage = true, ) + SwitchPreference( + label = stringResource(id = R.string.pref_all_apps_search_bar_background), + adapter = prefs2.appDrawerSearchBarBackground.getAdapter(), + ) } PreferenceGroup(heading = stringResource(id = R.string.grid)) { SliderPreference( diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index f9a9aa6982..d527056b53 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -440,7 +440,7 @@ public class DeviceProfile { mInfo = info; isTablet = info.isTablet(windowBounds); isPhone = !isTablet; - isTwoPanels = isTablet && isMultiDisplay; + isTwoPanels = isMultiDisplay; boolean isTaskBarEnabled = PreferenceExtensionsKt.firstBlocking(preferenceManager2.getEnableTaskbarOnPhone()); boolean taskbarOrBubbleBarOnPhones = enableTinyTaskbar() || (enableBubbleBar() && enableBubbleBarOnPhones()); @@ -1431,7 +1431,9 @@ public class DeviceProfile { if (mIsResponsiveGrid) { updateAllAppsWithResponsiveMeasures(); } else { - updateAllAppsIconSize(scale, context.getResources()); + // LC: All apps should use scale 1.0, not workspace scale + // This ensures drawer icons are independent of workspace scaling + updateAllAppsIconSize(1.0f, context.getResources()); } updateAllAppsContainerWidth(); if (isVerticalLayout && !mIsResponsiveGrid) { @@ -1477,9 +1479,10 @@ public class DeviceProfile { * Updates the iconSize for allApps* variants. */ private void updateAllAppsIconSize(float scale, Resources res) { + float borderScale = mIsScalableGrid ? 1.0f : scale; allAppsBorderSpacePx = new Point( - pxFromDp(inv.allAppsBorderSpaces[mTypeIndex].x, mMetrics, scale), - pxFromDp(inv.allAppsBorderSpaces[mTypeIndex].y, mMetrics, scale)); + pxFromDp(inv.allAppsBorderSpaces[mTypeIndex].x, mMetrics, borderScale), + pxFromDp(inv.allAppsBorderSpaces[mTypeIndex].y, mMetrics, borderScale)); // AllApps cells don't have real space between cells, // so we add the border space to the cell height allAppsCellHeightPx = pxFromDp(inv.allAppsCellSize[mTypeIndex].y, mMetrics) @@ -1490,8 +1493,8 @@ public class DeviceProfile { allAppsIconSizePx = pxFromDp(inv.allAppsIconSize[mTypeIndex], mMetrics); allAppsIconTextSizePx = pxFromSp(inv.allAppsIconTextSize[mTypeIndex], mMetrics); allAppsIconTextSizePx *= mTextFactors.getAllAppsIconTextSizeFactor(); - allAppsIconDrawablePaddingPx = getNormalizedIconDrawablePadding(); - allAppsCellWidthPx = pxFromDp(inv.allAppsCellSize[mTypeIndex].x, mMetrics, scale); + allAppsIconDrawablePaddingPx = getNormalizedIconDrawablePadding(allAppsIconSizePx, mIconDrawablePaddingOriginalPx); + allAppsCellWidthPx = pxFromDp(inv.allAppsCellSize[mTypeIndex].x, mMetrics); if (allAppsCellWidthPx < allAppsIconSizePx) { // If allAppsCellWidth no longer fit allAppsIconSize, reduce allAppsBorderSpace to @@ -1523,8 +1526,7 @@ public class DeviceProfile { float invIconTextSizeSp = inv.allAppsIconTextSize[mTypeIndex]; allAppsIconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mMetrics, scale)); allAppsIconTextSizePx = (int) (pxFromSp(invIconTextSizeSp, mMetrics) * scale); - allAppsIconDrawablePaddingPx = - res.getDimensionPixelSize(R.dimen.all_apps_icon_drawable_padding); + allAppsIconDrawablePaddingPx = getNormalizedIconDrawablePadding(allAppsIconSizePx, mIconDrawablePaddingOriginalPx);; allAppsIconTextSizePx *= mTextFactors.getAllAppsIconTextSizeFactor(); allAppsCellWidthPx = allAppsIconSizePx + (2 * allAppsIconDrawablePaddingPx); } diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java index 5e7f23b245..14511ae697 100644 --- a/src/com/android/launcher3/InvariantDeviceProfile.java +++ b/src/com/android/launcher3/InvariantDeviceProfile.java @@ -160,7 +160,20 @@ public class InvariantDeviceProfile { public int[] numFolderColumns; public float[] iconSize; public float[] iconTextSize; + /** + * Bitmap size for workspace icons. This is calculated independently from all apps + * to allow different icon size factors without affecting each other. + */ public int iconBitmapSize; + /** + * Bitmap size for all apps icons. This is calculated independently from workspace + * to allow different icon size factors without affecting each other. + */ + public int allAppsIconBitmapSize; + /** + * The icon density used for loading resources. This is based on the maximum of + * iconBitmapSize and allAppsIconBitmapSize to ensure adequate quality for both. + */ public int fillResIconDpi; public static @DeviceType int deviceType; public static Info displayInfo; @@ -440,8 +453,11 @@ public class InvariantDeviceProfile { for (int i = 1; i < allAppsIconSize.length; i++) { maxAllAppsIconSize = Math.max(maxAllAppsIconSize, allAppsIconSize[i]); } - iconBitmapSize = ResourceUtils.pxFromDp(Math.max(maxIconSize, maxAllAppsIconSize), metrics); - fillResIconDpi = getLauncherIconDensity(iconBitmapSize); + // Calculate separate bitmap sizes for workspace and all apps + iconBitmapSize = ResourceUtils.pxFromDp(maxIconSize, metrics); + allAppsIconBitmapSize = ResourceUtils.pxFromDp(maxAllAppsIconSize, metrics); + // Use the larger of the two for fillResIconDpi to ensure we have adequate resources + fillResIconDpi = getLauncherIconDensity(Math.max(iconBitmapSize, allAppsIconBitmapSize)); iconTextSize = displayOption.textSizes; @@ -561,7 +577,7 @@ public class InvariantDeviceProfile { private Object[] toModelState() { return new Object[]{ numColumns, numRows, numSearchContainerColumns, numDatabaseHotseatIcons, - iconBitmapSize, fillResIconDpi, numDatabaseAllAppsColumns, dbFile, mLocale}; + iconBitmapSize, allAppsIconBitmapSize, fillResIconDpi, numDatabaseAllAppsColumns, dbFile}; } /** Updates IDP using the provided context. Notifies listeners of change. */ diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java index f05d47ba29..f8d21da22e 100644 --- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java @@ -833,7 +833,15 @@ public class ActivityAllAppsContainerView } protected int getHeaderColor(float blendRatio) { - var opacity = pref.getDrawerOpacity().get(); + var showHeaderBackground = PreferenceExtensionsKt.firstBlocking( + pref2.getAppDrawerSearchBarBackground()); + + var opacity = 0.0f; + + if (showHeaderBackground) { + opacity = pref.getDrawerOpacity().get(); + } + var colorOptions = PreferenceExtensionsKt.firstBlocking(pref2.getAppDrawerBackgroundColor()); var color = colorOptions.getColorPreferenceEntry().getLightColor().invoke(mActivityContext); if (color != 0) { diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java index 87f387f46f..7d856f6d71 100644 --- a/src/com/android/launcher3/icons/IconCache.java +++ b/src/com/android/launcher3/icons/IconCache.java @@ -167,7 +167,7 @@ public class IconCache extends BaseIconCache { LauncherIcons.IconPool iconPool, DaggerSingletonTracker lifecycle) { super(context, dbFileName, MODEL_EXECUTOR.getLooper(), - idp.fillResIconDpi, idp.iconBitmapSize, true /* inMemoryCache */, iconProvider); + idp.fillResIconDpi, Math.max(idp.iconBitmapSize, idp.allAppsIconBitmapSize), true /* inMemoryCache */, iconProvider); mLauncherApps = context.getSystemService(LauncherApps.class); mUserManager = userCache; mInstallSessionHelper = installSessionHelper;