diff --git a/README.md b/README.md index f5ca9833680..b77f55d4c7c 100644 --- a/README.md +++ b/README.md @@ -1,53 +1,29 @@ -# Lawnchair 14 +# Genymotion fork of Lawnchair 14.0 +This is a fork of the `14-dev` branch of the [lawnchair](https://github.com/LawnchairLauncher/) repository. -[![Build debug APK](https://github.com/LawnchairLauncher/lawnchair/actions/workflows/ci.yml/badge.svg)](https://github.com/LawnchairLauncher/lawnchair/actions/workflows/ci.yml) -[![Build release APK](https://github.com/LawnchairLauncher/lawnchair/actions/workflows/release_update.yml/badge.svg)](https://github.com/LawnchairLauncher/lawnchair/actions/workflows/release_update.yml) -[![Crowdin](https://badges.crowdin.net/e/188ba69d884418987f0b7f1dd55e3a4e/localized.svg)](https://lawnchair.crowdin.com/lawnchair) -[![Telegram](https://img.shields.io/endpoint?url=https%3A%2F%2Ftg.sumanjay.workers.dev%2Flccommunity)](https://t.me/lccommunity) -[![Discord](https://img.shields.io/discord/803299970169700402?label=server&logo=discord)](https://discord.gg/3x8qNWxgGZ) +Lawnchair is based on the AOSP Launcher3 launcher. - -Lawnchair is a free, open-source home app for Android. Taking Launcher3 — Android’s default home app — as a starting point, it ports Pixel Launcher features and introduces rich options for customization. - -This branch houses the codebase of Lawnchair 14, currently in development and based on Launcher3 from Android 14. For Lawnchair 9 to 13, see the branches with the `9-` to `13-` prefixes, respectively. - -## Contribute code - -Whether you’ve fixed a bug or introduced a new feature, we welcome pull requests! (If you’d like to make a larger change and check with us first, you can do so via [Lawnchair’s Telegram group chat](https://t.me/lawnchairci).) To help translate Lawnchair 14 instead, please see “[Translate](#translate).” +We adjust it to our Genymotion products needs. +For example, we change the default home screen workspaces to add our wanted apps and widgets, like the Qwant search bar. +## Build the apk You can use Git to clone this repository: ``` -git clone --recursive https://github.com/LawnchairLauncher/lawnchair.git +git clone --recursive git@github.com:Genymobile/Lawnchair.git ``` -To build the app, select the `lawnWithQuickstepDebug` build type. Should you face errors relating to the `iconloaderlib` and `searchuilib` projects, run `git submodule update --init --recursive`. - -Here are a few contribution tips: - -- [The `lawnchair` package](https://github.com/LawnchairLauncher/lawnchair/tree/14-dev/lawnchair) houses Lawnchair’s own code, whereas [the `src` package](https://github.com/LawnchairLauncher/lawnchair/tree/14-dev/src) includes a clone of the Launcher3 codebase with modifications. Generally, place new files in the former, keeping changes to the latter to a minimum. - -- You can use either Java or, preferably, Kotlin. - -- Make sure your code is logical and well formatted. If using Kotlin, see [“Coding conventions” in the Kotlin documentation](https://kotlinlang.org/docs/coding-conventions.html). - -- Set `14-dev` as the base branch for pull requests. - -## Translate - -You can help translate Lawnchair 14 [on Crowdin](https://lawnchair.crowdin.com/lawnchair). Here are a few tips: - -- When using quotation marks, insert the symbols specific to the target language, as listed in [this table](https://en.wikipedia.org/wiki/Quotation_mark#Summary_table). - -- Lawnchair uses title case for some English UI text. Title case isn’t used in other languages; opt for sentence case instead. +To build the app, select the `lawnWithQuickstepDebug` build type. -- Some English terminology may have no commonly used equivalents in other languages. In such cases, use short descriptive phrases—for example, the equivalent of _bottom row_ for _dock_. +Should you face errors relating to the `iconloaderlib` and `searchuilib` projects, run `git submodule update --init --recursive`. -## Quick links +## Integrate the apk in the AOSP build +At the moment, we embark the Lawnchair release apk directly as a prebuilt in our AOSP builds. We put it in this private internal repository: https://github.com/Genymobile/genymotion_private_vendor_genymotion_prebuilts_apps -- [News](https://t.me/lawnchairci) -- [Lawnchair on Twitter](https://twitter.com/lawnchairapp) -- [Website](https://lawnchair.app) -- [_XDA_ thread](https://forum.xda-developers.com/t/lawnchair-customizable-pixel-launcher.3627137/) +To update this prebuilt: +- build the `lawnWithQuickstepMarketRelease` build variant via Gradle; +- copy the obtained apk in `vendor/genymotion/prebuilts/Lawnchair/`; +- rename it `lawnchair--.apk` +- update the apk name in the `vendor/genymotion/prebuilts/Lawnchair/Android.bp`. -You can view all our links [in the Lawnchair Wiki](https://github.com/LawnchairLauncher/lawnchair/wiki). +Ideally, we should update the initial Launcher3 Android.bp of this repository to make it properly build the Lawnchair app. This would allow us to directly embark the source code of this repository in our AOSP environments and ease versioning. diff --git a/lawnchair/res/values-af-rZA/strings.xml b/lawnchair/res/values-af-rZA/strings.xml index 74ea1eaf5c1..c29f6863e73 100644 --- a/lawnchair/res/values-af-rZA/strings.xml +++ b/lawnchair/res/values-af-rZA/strings.xml @@ -418,6 +418,7 @@ Settings Entry Soek vir meer toepassings Search on Startpage + Search on Qwant No app store or browser installed. From the web From your contacts diff --git a/lawnchair/res/values-am-rET/strings.xml b/lawnchair/res/values-am-rET/strings.xml index b3715d95e25..d359cdb0c54 100644 --- a/lawnchair/res/values-am-rET/strings.xml +++ b/lawnchair/res/values-am-rET/strings.xml @@ -418,6 +418,7 @@ Settings Entry Search for More Apps Search on Startpage + Search on Qwant No app store or browser installed. From the web From your contacts diff --git a/lawnchair/res/values-ar-rSA/strings.xml b/lawnchair/res/values-ar-rSA/strings.xml index fc09c8bfcda..d0c4105247f 100644 --- a/lawnchair/res/values-ar-rSA/strings.xml +++ b/lawnchair/res/values-ar-rSA/strings.xml @@ -422,6 +422,7 @@ مدخل الإعدادات البحث عن مزيد من التطبيقات Search on Startpage + Search on Qwant لا يوجد متجر تطبيقات أو متصفح مثبت. من الويب من جهات اتصالاتك diff --git a/lawnchair/res/values-b+sr+Latn/strings.xml b/lawnchair/res/values-b+sr+Latn/strings.xml index 105450e4f89..322db7c72a5 100644 --- a/lawnchair/res/values-b+sr+Latn/strings.xml +++ b/lawnchair/res/values-b+sr+Latn/strings.xml @@ -419,6 +419,7 @@ Podešavanje Pretražite više aplikacija Pretražuj pomoću usluge Startpage + Pretražuj pomoću usluge Qwant Nije instalirana prodavnica aplikacija ili pregledač. Veb Kontakti diff --git a/lawnchair/res/values-bn-rBD/strings.xml b/lawnchair/res/values-bn-rBD/strings.xml index 4b7ea53afe9..46e551b9271 100644 --- a/lawnchair/res/values-bn-rBD/strings.xml +++ b/lawnchair/res/values-bn-rBD/strings.xml @@ -418,6 +418,7 @@ Settings Entry আরো অ্যাপ খোঁজ করুন Search on Startpage + Search on Qwant কোনো অ্যাপ স্টোর বা ব্রাউজার খুঁজে পাওয়া যায় নি. From the web From your contacts diff --git a/lawnchair/res/values-ca-rES/strings.xml b/lawnchair/res/values-ca-rES/strings.xml index fa80a0d0b4d..c3deeada6f1 100644 --- a/lawnchair/res/values-ca-rES/strings.xml +++ b/lawnchair/res/values-ca-rES/strings.xml @@ -418,6 +418,7 @@ Entrades de Configuració Cerca més aplicacions Buscar en Startpage + Buscar en Qwant No hi ha una botiga d\'aplicacions O navegador web instal·lat. Desde la web Des dels teus contactes diff --git a/lawnchair/res/values-cs-rCZ/strings.xml b/lawnchair/res/values-cs-rCZ/strings.xml index a384a63e606..bf4e21d401f 100644 --- a/lawnchair/res/values-cs-rCZ/strings.xml +++ b/lawnchair/res/values-cs-rCZ/strings.xml @@ -420,6 +420,7 @@ Settings Entry Vyhledat další aplikace Search on Startpage + Search on Qwant Není nainstalovaný obchod ani prohlížeč. From the web From your contacts diff --git a/lawnchair/res/values-da-rDK/strings.xml b/lawnchair/res/values-da-rDK/strings.xml index 515cc33cece..672a3346a5c 100644 --- a/lawnchair/res/values-da-rDK/strings.xml +++ b/lawnchair/res/values-da-rDK/strings.xml @@ -418,6 +418,7 @@ Settings Entry Search for More Apps Search on Startpage + Search on Qwant No app store or browser installed. From the web From your contacts diff --git a/lawnchair/res/values-de-rDE/strings.xml b/lawnchair/res/values-de-rDE/strings.xml index dd369dbaf42..e4cd39a8c16 100644 --- a/lawnchair/res/values-de-rDE/strings.xml +++ b/lawnchair/res/values-de-rDE/strings.xml @@ -420,6 +420,7 @@ workspace_increase_max_grid_size_label Einstellungs-Eintrag Weitere Apps suchen Suche bei Startpage + Suche bei Qwant Kein Appstore oder Browser installiert. Aus dem Internet Aus Deinen Kontakten diff --git a/lawnchair/res/values-el-rGR/strings.xml b/lawnchair/res/values-el-rGR/strings.xml index 05312c18c50..de451c4d69d 100644 --- a/lawnchair/res/values-el-rGR/strings.xml +++ b/lawnchair/res/values-el-rGR/strings.xml @@ -418,6 +418,7 @@ Ρυθμίσεις Εισαγωγής Αναζήτηση για περισσότερες εφαρμογές Αναζήτηση σε Σελίδα έναρξης + Αναζήτηση σε Qwant Δεν υπάρχει εγκατεστημένο κατάστημα εφαρμογών ή πρόγραμμα περιήγησης. Από το διαδίκτυο Από τις επαφές σας diff --git a/lawnchair/res/values-en-rCA/strings.xml b/lawnchair/res/values-en-rCA/strings.xml index d5a394bee47..c3954c14bcf 100644 --- a/lawnchair/res/values-en-rCA/strings.xml +++ b/lawnchair/res/values-en-rCA/strings.xml @@ -418,6 +418,7 @@ Settings Entry Search for More Apps Search on Startpage + Search on Qwant No app store or browser installed. From the web From your contacts diff --git a/lawnchair/res/values-es-rES/strings.xml b/lawnchair/res/values-es-rES/strings.xml index ab0b1ed73c5..69d03e607ef 100644 --- a/lawnchair/res/values-es-rES/strings.xml +++ b/lawnchair/res/values-es-rES/strings.xml @@ -418,6 +418,7 @@ Configuración Buscar más Aplicaciones Buscar en Startpage + Buscar en Qwant No hay tienda de aplicaciones ni navegador instalado. De internet De tus contactos diff --git a/lawnchair/res/values-fa-rIR/strings.xml b/lawnchair/res/values-fa-rIR/strings.xml index c0cab3416de..8a9c13f32e2 100644 --- a/lawnchair/res/values-fa-rIR/strings.xml +++ b/lawnchair/res/values-fa-rIR/strings.xml @@ -418,6 +418,7 @@ Settings Entry جست‌و‌جو برنامه‌های بیشتر Search on Startpage + Search on Qwant هیچ فروشگاه برنامه یا مرورگری نصب نیست. From the web From your contacts diff --git a/lawnchair/res/values-fi-rFI/strings.xml b/lawnchair/res/values-fi-rFI/strings.xml index af8bd6f7e1c..f018c37f472 100644 --- a/lawnchair/res/values-fi-rFI/strings.xml +++ b/lawnchair/res/values-fi-rFI/strings.xml @@ -418,6 +418,7 @@ Settings Entry Etsi lisää sovelluksia Search on Startpage + Search on Qwant Sovelluskauppaa tai selainta ei ole asennettu. From the web From your contacts diff --git a/lawnchair/res/values-fil-rPH/strings.xml b/lawnchair/res/values-fil-rPH/strings.xml index e5a872e87f5..8ac37e8026e 100644 --- a/lawnchair/res/values-fil-rPH/strings.xml +++ b/lawnchair/res/values-fil-rPH/strings.xml @@ -418,6 +418,7 @@ Settings Entry Maghanap ng Higit pang Mga App Search on Startpage + Search on Qwant Walang naka-install na app store o browser. From the web From your contacts diff --git a/lawnchair/res/values-fr-rFR/strings.xml b/lawnchair/res/values-fr-rFR/strings.xml index 71eb589d9ae..76735899aba 100644 --- a/lawnchair/res/values-fr-rFR/strings.xml +++ b/lawnchair/res/values-fr-rFR/strings.xml @@ -418,6 +418,7 @@ Entrée des paramètres Rechercher plus d\'applications Rechercher sur Page de démarrage + Rechercher sur Qwant Aucun app store ou navigateur installé. Depuis le web Depuis vos contacts diff --git a/lawnchair/res/values-gl-rES/strings.xml b/lawnchair/res/values-gl-rES/strings.xml index 1e8aeec8c5e..4ae8555988f 100644 --- a/lawnchair/res/values-gl-rES/strings.xml +++ b/lawnchair/res/values-gl-rES/strings.xml @@ -418,6 +418,7 @@ Settings Entry Search for More Apps Search on Startpage + Search on Qwant No app store or browser installed. From the web From your contacts diff --git a/lawnchair/res/values-hi-rIN/strings.xml b/lawnchair/res/values-hi-rIN/strings.xml index 676752efd97..1b32eee3323 100644 --- a/lawnchair/res/values-hi-rIN/strings.xml +++ b/lawnchair/res/values-hi-rIN/strings.xml @@ -418,6 +418,7 @@ Settings Entry और ऐप खोजें Search on Startpage + Search on Qwant कोई ऐप स्टोर या ब्राउज़र उपस्थित नहीं है| वेब से आपके संपर्कों से diff --git a/lawnchair/res/values-hu-rHU/strings.xml b/lawnchair/res/values-hu-rHU/strings.xml index ece387f99fe..197e969daa0 100644 --- a/lawnchair/res/values-hu-rHU/strings.xml +++ b/lawnchair/res/values-hu-rHU/strings.xml @@ -418,6 +418,7 @@ Settings Entry További alkalmazások keresése Search on Startpage + Search on Qwant Nincs alkalmazásbolt vagy böngésző telepítve. From the web From your contacts diff --git a/lawnchair/res/values-in-rID/strings.xml b/lawnchair/res/values-in-rID/strings.xml index 50437481e27..c718d84a1ce 100644 --- a/lawnchair/res/values-in-rID/strings.xml +++ b/lawnchair/res/values-in-rID/strings.xml @@ -417,6 +417,7 @@ Entri Pengaturan Cari Lebih Banyak Aplikasi Cari di Startpage + Cari di Qwant Tidak ada toko aplikasi atau browser yang terinstal. Dari web Dari kontak Anda diff --git a/lawnchair/res/values-it-rIT/strings.xml b/lawnchair/res/values-it-rIT/strings.xml index 411953bc5a8..0e240fb5e59 100644 --- a/lawnchair/res/values-it-rIT/strings.xml +++ b/lawnchair/res/values-it-rIT/strings.xml @@ -418,6 +418,7 @@ Settings Entry Cerca altre app Search on Startpage + Search on Qwant Nessun app store o browser internet installato. From the web From your contacts diff --git a/lawnchair/res/values-iw-rIL/strings.xml b/lawnchair/res/values-iw-rIL/strings.xml index 0d8a43d1e87..fc9f44fa70d 100644 --- a/lawnchair/res/values-iw-rIL/strings.xml +++ b/lawnchair/res/values-iw-rIL/strings.xml @@ -420,6 +420,7 @@ Settings Entry חפש עוד יישומים Search on Startpage + Search on Qwant לא נמצאו חנות או דפדפן מותקנים. מהרשת מאנשי הקשר diff --git a/lawnchair/res/values-ja-rJP/strings.xml b/lawnchair/res/values-ja-rJP/strings.xml index 03f9f8760a3..4bfb30a588b 100644 --- a/lawnchair/res/values-ja-rJP/strings.xml +++ b/lawnchair/res/values-ja-rJP/strings.xml @@ -417,6 +417,7 @@ Settings Entry その他のアプリを検索 Startpage で検索 + Qwant で検索 アプリストアまたはブラウザがインストールされていません。 Web 連絡先 diff --git a/lawnchair/res/values-kmr-rTR/strings.xml b/lawnchair/res/values-kmr-rTR/strings.xml index b24f5ca298a..3cbf3937705 100644 --- a/lawnchair/res/values-kmr-rTR/strings.xml +++ b/lawnchair/res/values-kmr-rTR/strings.xml @@ -418,6 +418,7 @@ Settings Entry Search for More Apps Search on Startpage + Search on Qwant No app store or browser installed. From the web From your contacts diff --git a/lawnchair/res/values-ko-rKR/strings.xml b/lawnchair/res/values-ko-rKR/strings.xml index 9e4c49cbdc7..3a6ec1f4308 100644 --- a/lawnchair/res/values-ko-rKR/strings.xml +++ b/lawnchair/res/values-ko-rKR/strings.xml @@ -417,6 +417,7 @@ 설정 항목 더 많은 앱 검색하기 Startpage에서 검색 + Qwant에서 검색 앱 스토어나 브라우저가 설치되어 있지 않습니다. From the web From your contacts diff --git a/lawnchair/res/values-lt-rLT/strings.xml b/lawnchair/res/values-lt-rLT/strings.xml index cd8006d91e6..57f096662bd 100644 --- a/lawnchair/res/values-lt-rLT/strings.xml +++ b/lawnchair/res/values-lt-rLT/strings.xml @@ -420,6 +420,7 @@ Settings Entry Ieškoti Daugiau Programų Search on Startpage + Search on Qwant Nei programėlių parduotuvė, nei naršyklė nėra įdiegta. From the web From your contacts diff --git a/lawnchair/res/values-ml-rIN/strings.xml b/lawnchair/res/values-ml-rIN/strings.xml index 8f580094b98..11c71576708 100644 --- a/lawnchair/res/values-ml-rIN/strings.xml +++ b/lawnchair/res/values-ml-rIN/strings.xml @@ -418,6 +418,7 @@ Settings Entry കൂടുതൽ ആപ്പുകൾക്കായി തിരയുക Search on Startpage + Search on Qwant No app store or browser installed. From the web From your contacts diff --git a/lawnchair/res/values-mr-rIN/strings.xml b/lawnchair/res/values-mr-rIN/strings.xml index cde483093f8..4e28154f579 100644 --- a/lawnchair/res/values-mr-rIN/strings.xml +++ b/lawnchair/res/values-mr-rIN/strings.xml @@ -418,6 +418,7 @@ Settings Entry Search for More Apps Search on Startpage + Search on Qwant No app store or browser installed. From the web From your contacts diff --git a/lawnchair/res/values-nl-rNL/strings.xml b/lawnchair/res/values-nl-rNL/strings.xml index 6a44717545e..9df00a2739c 100644 --- a/lawnchair/res/values-nl-rNL/strings.xml +++ b/lawnchair/res/values-nl-rNL/strings.xml @@ -418,6 +418,7 @@ Instellingen Zoeken naar Meer Apps Zoeken met Startpagina + Zoeken met Qwant Geen appwinkel of browser geïnstalleerd. Van het internet Uit je contacten diff --git a/lawnchair/res/values-no-rNO/strings.xml b/lawnchair/res/values-no-rNO/strings.xml index d0d87c51cfc..b8b245196e2 100644 --- a/lawnchair/res/values-no-rNO/strings.xml +++ b/lawnchair/res/values-no-rNO/strings.xml @@ -418,6 +418,7 @@ Settings Entry Search for More Apps Search on Startpage + Search on Qwant No app store or browser installed. From the web From your contacts diff --git a/lawnchair/res/values-pl-rPL/strings.xml b/lawnchair/res/values-pl-rPL/strings.xml index 47cfdac2ee1..658d581e1d6 100644 --- a/lawnchair/res/values-pl-rPL/strings.xml +++ b/lawnchair/res/values-pl-rPL/strings.xml @@ -420,6 +420,7 @@ Wpis ustawień Wyszukaj więcej aplikacji Szukaj na Startpage + Szukaj na Qwant Brak zainstalowanego sklepu z aplikacjami lub przeglądarki. Z sieci Z twoich kontaktów diff --git a/lawnchair/res/values-pt-rBR/strings.xml b/lawnchair/res/values-pt-rBR/strings.xml index 3ea9287ce54..a51a39747c3 100644 --- a/lawnchair/res/values-pt-rBR/strings.xml +++ b/lawnchair/res/values-pt-rBR/strings.xml @@ -418,6 +418,7 @@ Entrada de configurações Pesquisar por mais Aplicativos Pesquisar na Página Inicial + Pesquisar na Qwant Nenhuma loja de aplicativos ou navegador instalado. Da web Dos seus contatos diff --git a/lawnchair/res/values-pt-rPT/strings.xml b/lawnchair/res/values-pt-rPT/strings.xml index b3049104cd1..4e7c339ff4d 100644 --- a/lawnchair/res/values-pt-rPT/strings.xml +++ b/lawnchair/res/values-pt-rPT/strings.xml @@ -418,6 +418,7 @@ Entrada de Definições Procurar Mais Aplicações Pesquisar em Startpage + Pesquisar em Qwant Nenhuma loja de aplicações ou navegador instalado. Da web Dos seus contactos diff --git a/lawnchair/res/values-ro-rRO/strings.xml b/lawnchair/res/values-ro-rRO/strings.xml index 197d544d447..03fc8d36daa 100644 --- a/lawnchair/res/values-ro-rRO/strings.xml +++ b/lawnchair/res/values-ro-rRO/strings.xml @@ -419,6 +419,7 @@ Settings Entry Caută mai multe aplicații Search on Startpage + Search on Qwant Niciun magazin de aplicații sau browser este instalat. From the web From your contacts diff --git a/lawnchair/res/values-ru-rRU/strings.xml b/lawnchair/res/values-ru-rRU/strings.xml index 7c3e35473ba..7a0ba6f625e 100644 --- a/lawnchair/res/values-ru-rRU/strings.xml +++ b/lawnchair/res/values-ru-rRU/strings.xml @@ -420,6 +420,7 @@ Запись настроек Поиск дополнительных приложений Искать на Startpage + Искать на Qwant Магазин приложений или браузер не установлены. Из Интернета Из ваших контактов diff --git a/lawnchair/res/values-sk-rSK/strings.xml b/lawnchair/res/values-sk-rSK/strings.xml index 76a38eb7ae7..3f3b22d7441 100644 --- a/lawnchair/res/values-sk-rSK/strings.xml +++ b/lawnchair/res/values-sk-rSK/strings.xml @@ -420,6 +420,7 @@ Settings Entry Hľadať ďalšie aplikácie Search on Startpage + Search on Qwant Nie je nainštalovaný žiadny obchod s aplikáciami ani prehliadač. From the web From your contacts diff --git a/lawnchair/res/values-sl-rSI/strings.xml b/lawnchair/res/values-sl-rSI/strings.xml index 6ebad8609cf..f429a017efe 100644 --- a/lawnchair/res/values-sl-rSI/strings.xml +++ b/lawnchair/res/values-sl-rSI/strings.xml @@ -420,6 +420,7 @@ Settings Entry Išči več aplikacij Search on Startpage + Search on Qwant No app store or browser installed. From the web From your contacts diff --git a/lawnchair/res/values-sq-rAL/strings.xml b/lawnchair/res/values-sq-rAL/strings.xml index 1765bbdb10f..3095a41e006 100644 --- a/lawnchair/res/values-sq-rAL/strings.xml +++ b/lawnchair/res/values-sq-rAL/strings.xml @@ -418,6 +418,7 @@ Settings Entry Kërko për më shumë Aplikacione Search on Startpage + Search on Qwant Asnjë Dyqan i aplikacioneve apo Shfletues të instaluar. From the web From your contacts diff --git a/lawnchair/res/values-sr/strings.xml b/lawnchair/res/values-sr/strings.xml index 7f1ef828f12..3bd5adfccf6 100644 --- a/lawnchair/res/values-sr/strings.xml +++ b/lawnchair/res/values-sr/strings.xml @@ -419,6 +419,7 @@ Подешавање Претражите више апликација Претражуј помоћу услуге Startpage + Претражуј помоћу услуге Qwant Није инсталирана продавница апликација или прегледач. Веб Контакти diff --git a/lawnchair/res/values-sv-rSE/strings.xml b/lawnchair/res/values-sv-rSE/strings.xml index 7692a8fabf6..db83841af4f 100644 --- a/lawnchair/res/values-sv-rSE/strings.xml +++ b/lawnchair/res/values-sv-rSE/strings.xml @@ -418,6 +418,7 @@ Inställningar Sök efter fler appar Sök på Startpage + Sök på Qwant Ingen appbutik eller webbläsare installerad. Från webben Från dina kontakter diff --git a/lawnchair/res/values-sw-rKE/strings.xml b/lawnchair/res/values-sw-rKE/strings.xml index 28c697f662b..6a7060ed69b 100644 --- a/lawnchair/res/values-sw-rKE/strings.xml +++ b/lawnchair/res/values-sw-rKE/strings.xml @@ -418,6 +418,7 @@ Settings Entry Tafuta Programu Zaidi Search on Startpage + Search on Qwant Hakuna duka la programu au kivinjari kilichosakinishwa. From the web From your contacts diff --git a/lawnchair/res/values-ta-rIN/strings.xml b/lawnchair/res/values-ta-rIN/strings.xml index 8cd38d5913a..d5f504bc1bf 100644 --- a/lawnchair/res/values-ta-rIN/strings.xml +++ b/lawnchair/res/values-ta-rIN/strings.xml @@ -418,6 +418,7 @@ Settings Entry மேலும் செயலிகளுக்காகத் தேடு Search on Startpage + Search on Qwant No app store or browser installed. From the web From your contacts diff --git a/lawnchair/res/values-te-rIN/strings.xml b/lawnchair/res/values-te-rIN/strings.xml index 7c0b87dd725..3329a9c76c3 100644 --- a/lawnchair/res/values-te-rIN/strings.xml +++ b/lawnchair/res/values-te-rIN/strings.xml @@ -418,6 +418,7 @@ Settings Entry Search for More Apps Search on Startpage + Search on Qwant No app store or browser installed. From the web From your contacts diff --git a/lawnchair/res/values-th-rTH/strings.xml b/lawnchair/res/values-th-rTH/strings.xml index 0c5704736b6..a00d9281af0 100644 --- a/lawnchair/res/values-th-rTH/strings.xml +++ b/lawnchair/res/values-th-rTH/strings.xml @@ -417,6 +417,7 @@ Settings Entry ค้นหาแอพเพิ่มเติม Search on Startpage + Search on Qwant ยังไม่ได้ติดตั้งแอพสโตร์หรือเบราว์เซอร์ จากเว็บไซต์ จากรายชื่อ diff --git a/lawnchair/res/values-tr-rTR/strings.xml b/lawnchair/res/values-tr-rTR/strings.xml index 1b9d91c78b7..afee0a7a03b 100644 --- a/lawnchair/res/values-tr-rTR/strings.xml +++ b/lawnchair/res/values-tr-rTR/strings.xml @@ -418,6 +418,7 @@ Ayarlar maddesi Daha Fazla Uygulama İçin Ara Startpage \'da ara + Qwant \'da ara Ne uygulama mağazası ne de tarayıcı yüklü değil. Web\'den Kişilerden diff --git a/lawnchair/res/values-uk-rUA/strings.xml b/lawnchair/res/values-uk-rUA/strings.xml index d828e206574..a1d235a83a6 100644 --- a/lawnchair/res/values-uk-rUA/strings.xml +++ b/lawnchair/res/values-uk-rUA/strings.xml @@ -420,6 +420,7 @@ Налаштування запису Пошук інших додатків Шукати в Головна сторінка + Шукати в Qwant Не встановлено жодного магазину додатків або браузера. З Інтернету З ваших контактів diff --git a/lawnchair/res/values-ur-rIN/strings.xml b/lawnchair/res/values-ur-rIN/strings.xml index 2ff5ecc975e..90d35a507e2 100644 --- a/lawnchair/res/values-ur-rIN/strings.xml +++ b/lawnchair/res/values-ur-rIN/strings.xml @@ -418,6 +418,7 @@ Settings Entry Search for More Apps Search on Startpage + Search on Qwant No app store or browser installed. From the web From your contacts diff --git a/lawnchair/res/values-ur-rPK/strings.xml b/lawnchair/res/values-ur-rPK/strings.xml index ff375d8a1f4..253bc396bcd 100644 --- a/lawnchair/res/values-ur-rPK/strings.xml +++ b/lawnchair/res/values-ur-rPK/strings.xml @@ -418,6 +418,7 @@ Settings Entry Search for More Apps Search on Startpage + Search on Qwant No app store or browser installed. From the web From your contacts diff --git a/lawnchair/res/values-uz-rUZ/strings.xml b/lawnchair/res/values-uz-rUZ/strings.xml index c4451e55bc0..029fe3ad90c 100644 --- a/lawnchair/res/values-uz-rUZ/strings.xml +++ b/lawnchair/res/values-uz-rUZ/strings.xml @@ -418,6 +418,7 @@ Settings Entry Search for More Apps Search on Startpage + Search on Qwant No app store or browser installed. From the web From your contacts diff --git a/lawnchair/res/values-vi-rVN/strings.xml b/lawnchair/res/values-vi-rVN/strings.xml index 3cfa41862d8..a9352a2f87e 100644 --- a/lawnchair/res/values-vi-rVN/strings.xml +++ b/lawnchair/res/values-vi-rVN/strings.xml @@ -417,6 +417,7 @@ Mục cài đặt Tìm thêm ứng dụng Tìm kiếm trên Startpage + Tìm kiếm trên Qwant Không có cửa hàng ứng dụng hay trình duyệt được cài đặt. Từ web Từ liên lạc của bạn diff --git a/lawnchair/res/values-zh-rCN/strings.xml b/lawnchair/res/values-zh-rCN/strings.xml index da44694757e..9de13756a35 100644 --- a/lawnchair/res/values-zh-rCN/strings.xml +++ b/lawnchair/res/values-zh-rCN/strings.xml @@ -417,6 +417,7 @@ 设置项 搜索更多应用 在 Startpage 上搜索 + 在 Qwant 上搜索 没有安装应用商店或浏览器。 来自网络 来自您的联系人 diff --git a/lawnchair/res/values-zh-rTW/strings.xml b/lawnchair/res/values-zh-rTW/strings.xml index 63c8acb2d09..5242eb16c78 100644 --- a/lawnchair/res/values-zh-rTW/strings.xml +++ b/lawnchair/res/values-zh-rTW/strings.xml @@ -417,6 +417,7 @@ 設定選項 搜尋更多應用程式 使用 Startpage 搜尋 + 使用 Qwant 搜尋 尚未安裝應用程式商店或瀏覽器 網路上的搜尋結果 聯絡人搜尋結果 diff --git a/lawnchair/res/values/config.xml b/lawnchair/res/values/config.xml index 5068dacf2e4..169dfa4215f 100644 --- a/lawnchair/res/values/config.xml +++ b/lawnchair/res/values/config.xml @@ -56,10 +56,10 @@ - startpage + qwant - system + circle gregorian @@ -79,7 +79,7 @@ system - lawnchair + disabled true true @@ -108,7 +108,7 @@ true true false - true + false true false false diff --git a/lawnchair/res/values/strings.xml b/lawnchair/res/values/strings.xml index 47df2d1f98a..237b152ff90 100644 --- a/lawnchair/res/values/strings.xml +++ b/lawnchair/res/values/strings.xml @@ -313,6 +313,7 @@ App Search Startpage + Qwant Google Google Go DuckDuckGo @@ -524,6 +525,7 @@ Search for More Apps Search on Startpage + Search on Qwant No app store or browser installed. From the web diff --git a/lawnchair/res/xml/default_workspace_2x2.xml b/lawnchair/res/xml/default_workspace_2x2.xml index 749f9ce8e98..49f3c1db750 100644 --- a/lawnchair/res/xml/default_workspace_2x2.xml +++ b/lawnchair/res/xml/default_workspace_2x2.xml @@ -16,26 +16,31 @@ - - + + + + + - - - - - - - - @@ -44,21 +49,13 @@ - - - - - - - - + launcher:y="0" > + + diff --git a/lawnchair/res/xml/default_workspace_3x3.xml b/lawnchair/res/xml/default_workspace_3x3.xml index 0909d6ba36a..94bfada25c9 100644 --- a/lawnchair/res/xml/default_workspace_3x3.xml +++ b/lawnchair/res/xml/default_workspace_3x3.xml @@ -16,27 +16,30 @@ - - - - - - - - - - + launcher:y="-3" + launcher:spanX="3" + launcher:spanY="1" /> - + + + - - - - - - - - + launcher:y="0" > + + - - + launcher:y="0" > + + diff --git a/lawnchair/res/xml/default_workspace_4x5.xml b/lawnchair/res/xml/default_workspace_4x5.xml index f146c790591..6c813940822 100644 --- a/lawnchair/res/xml/default_workspace_4x5.xml +++ b/lawnchair/res/xml/default_workspace_4x5.xml @@ -16,6 +16,24 @@ + + + + - - - - @@ -62,88 +72,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lawnchair/res/xml/default_workspace_5x5.xml b/lawnchair/res/xml/default_workspace_5x5.xml index 1367fcfe9d0..6033b478314 100644 --- a/lawnchair/res/xml/default_workspace_5x5.xml +++ b/lawnchair/res/xml/default_workspace_5x5.xml @@ -16,8 +16,26 @@ + + + + - + - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/lawnchair/res/xml/default_workspace_5x6.xml b/lawnchair/res/xml/default_workspace_5x6.xml index 6cc554275ff..1d76c880677 100644 --- a/lawnchair/res/xml/default_workspace_5x6.xml +++ b/lawnchair/res/xml/default_workspace_5x6.xml @@ -16,8 +16,26 @@ + + + + - + - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/lawnchair/res/xml/default_workspace_5x7.xml b/lawnchair/res/xml/default_workspace_5x7.xml index 7f2693c44b3..40b2dd523f7 100644 --- a/lawnchair/res/xml/default_workspace_5x7.xml +++ b/lawnchair/res/xml/default_workspace_5x7.xml @@ -16,8 +16,26 @@ + + + + - + - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/lawnchair/res/xml/default_workspace_6x5.xml b/lawnchair/res/xml/default_workspace_6x5.xml index b79b04d7436..c6658deb437 100644 --- a/lawnchair/res/xml/default_workspace_6x5.xml +++ b/lawnchair/res/xml/default_workspace_6x5.xml @@ -1,5 +1,5 @@ - - + - - + + + - + + + + + - - + + - - + + - - + - - - + + diff --git a/lawnchair/res/xml/default_workspace_6x6.xml b/lawnchair/res/xml/default_workspace_6x6.xml index 27dd3ee8a54..c3e64edc84c 100644 --- a/lawnchair/res/xml/default_workspace_6x6.xml +++ b/lawnchair/res/xml/default_workspace_6x6.xml @@ -16,8 +16,26 @@ + + + + - + - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + launcher:container="-101" + launcher:screen="5" + launcher:x="5" + launcher:y="0" > - - - - - - diff --git a/lawnchair/src/app/lawnchair/allapps/SearchResultView.kt b/lawnchair/src/app/lawnchair/allapps/SearchResultView.kt index 3640c5c1dd0..eceee1e2a22 100644 --- a/lawnchair/src/app/lawnchair/allapps/SearchResultView.kt +++ b/lawnchair/src/app/lawnchair/allapps/SearchResultView.kt @@ -7,6 +7,7 @@ import android.widget.Toast import app.lawnchair.search.CONTACT import app.lawnchair.search.FILES import app.lawnchair.search.MARKET_STORE +import app.lawnchair.search.QWANT import app.lawnchair.search.START_PAGE import app.lawnchair.search.SUGGESTION import app.lawnchair.search.SearchTargetCompat @@ -42,7 +43,7 @@ sealed interface SearchResultView { fun shouldHandleClick(targetCompat: SearchTargetCompat): Boolean { val packageName = targetCompat.packageName - return (packageName in listOf(START_PAGE, MARKET_STORE, SUGGESTION, CONTACT, FILES)) && + return (packageName in listOf(QWANT, MARKET_STORE, SUGGESTION, CONTACT, FILES)) && targetCompat.layoutType != LayoutType.SMALL_ICON_HORIZONTAL_TEXT && targetCompat.resultType != SearchTargetCompat.RESULT_TYPE_SHORTCUT } diff --git a/lawnchair/src/app/lawnchair/preferences/PreferenceManager.kt b/lawnchair/src/app/lawnchair/preferences/PreferenceManager.kt index 39fba16d963..a0c7565f163 100644 --- a/lawnchair/src/app/lawnchair/preferences/PreferenceManager.kt +++ b/lawnchair/src/app/lawnchair/preferences/PreferenceManager.kt @@ -37,10 +37,10 @@ class PreferenceManager private constructor(private val context: Context) : Base Unit } - val iconPackPackage = StringPref("pref_iconPackPackage", "", reloadIcons) + val iconPackPackage = StringPref("pref_iconPackPackage", "org.materialos.icons", reloadIcons) val themedIconPackPackage = StringPref("pref_themedIconPackPackage", "", recreate) val allowRotation = BoolPref("pref_allowRotation", false) - val wrapAdaptiveIcons = BoolPref("prefs_wrapAdaptive", false, recreate) + val wrapAdaptiveIcons = BoolPref("prefs_wrapAdaptive", true, recreate) val transparentIconBackground = BoolPref("prefs_transparentIconBackground", false, recreate) val addIconToHome = BoolPref("pref_add_icon_to_home", true) val hotseatColumns = IntPref("pref_hotseatColumns", 4, reloadGrid) diff --git a/lawnchair/src/app/lawnchair/qsb/providers/QsbSearchProvider.kt b/lawnchair/src/app/lawnchair/qsb/providers/QsbSearchProvider.kt index aec2c946683..dc8c64a9da3 100644 --- a/lawnchair/src/app/lawnchair/qsb/providers/QsbSearchProvider.kt +++ b/lawnchair/src/app/lawnchair/qsb/providers/QsbSearchProvider.kt @@ -133,6 +133,7 @@ sealed class QsbSearchProvider( Bing, Brave, Startpage, + Qwant, ) /** diff --git a/lawnchair/src/app/lawnchair/qsb/providers/Qwant.kt b/lawnchair/src/app/lawnchair/qsb/providers/Qwant.kt new file mode 100644 index 00000000000..a90e2fcb4ca --- /dev/null +++ b/lawnchair/src/app/lawnchair/qsb/providers/Qwant.kt @@ -0,0 +1,15 @@ +package app.lawnchair.qsb.providers + +import android.content.Intent +import app.lawnchair.qsb.ThemingMethod +import com.android.launcher3.R + +data object Qwant : QsbSearchProvider( + id = "qwant", + name = R.string.search_provider_qwant, + icon = R.drawable.ic_qwant, + themingMethod = ThemingMethod.TINT, + packageName = "com.qwant.liberty", + action = Intent.ACTION_WEB_SEARCH, + website = "https://qwant.com/", +) diff --git a/lawnchair/src/app/lawnchair/search/GenerateSearchTarget.kt b/lawnchair/src/app/lawnchair/search/GenerateSearchTarget.kt index 279029c0a9c..56129fcea67 100644 --- a/lawnchair/src/app/lawnchair/search/GenerateSearchTarget.kt +++ b/lawnchair/src/app/lawnchair/search/GenerateSearchTarget.kt @@ -38,7 +38,7 @@ class GenerateSearchTarget(private val context: Context) { private val marketSearchComponent = resolveMarketSearchActivity() internal fun getSuggestionTarget(suggestion: String): SearchTargetCompat { - val url = getStartPageUrl(suggestion) + val url = getQwantUrl(suggestion) val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) val id = suggestion + url val action = SearchActionCompat.Builder(id, suggestion) @@ -59,7 +59,7 @@ class GenerateSearchTarget(private val context: Context) { internal fun getRecentKeywordTarget(recentKeyword: RecentKeyword): SearchTargetCompat { val value = recentKeyword.getValueByKey("display1") ?: "" - val url = getStartPageUrl(value) + val url = getQwantUrl(value) val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) val id = recentKeyword.data.toString() + url val action = SearchActionCompat.Builder(id, value) @@ -175,6 +175,20 @@ class GenerateSearchTarget(private val context: Context) { return createSearchTarget(id, action, START_PAGE, extras) } + internal fun getQwantSearchItem(query: String): SearchTargetCompat { + val url = getQwantUrl(query) + val id = "browser:$query" + val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) + val action = SearchActionCompat.Builder(id, context.getString(R.string.all_apps_search_qwant_message)) + .setIcon(Icon.createWithResource(context, R.drawable.ic_qwant)) + .setIntent(browserIntent) + .build() + val extras = bundleOf( + SearchResultView.EXTRA_HIDE_SUBTITLE to true, + ) + return createSearchTarget(id, action, QWANT, extras) + } + internal fun getContactSearchItem(info: ContactInfo): SearchTargetCompat { val id = "contact:${info.contactId}${info.number}" val contactUri = Uri.withAppendedPath( @@ -258,6 +272,10 @@ class GenerateSearchTarget(private val context: Context) { return "https://www.startpage.com/do/search?segment=startpage.lawnchair&query=$query&cat=web" } + private fun getQwantUrl(query: String): String { + return "https://www.qwant.com/?q=$query&t=web" + } + private fun resolveMarketSearchActivity(): ComponentKey? { val intent = PackageManagerHelper.getMarketSearchIntent(context, "") val resolveInfo = context.packageManager.resolveActivity(intent, 0) ?: return null diff --git a/lawnchair/src/app/lawnchair/search/LawnchairAppSearchAlgorithm.kt b/lawnchair/src/app/lawnchair/search/LawnchairAppSearchAlgorithm.kt index 48e6d901b8e..41e1fe162ab 100644 --- a/lawnchair/src/app/lawnchair/search/LawnchairAppSearchAlgorithm.kt +++ b/lawnchair/src/app/lawnchair/search/LawnchairAppSearchAlgorithm.kt @@ -146,7 +146,7 @@ class LawnchairAppSearchAlgorithm(context: Context) : LawnchairSearchAlgorithm(c } searchTargets.add(generateSearchTarget.getHeaderTarget(SPACE)) - searchTargets.add(generateSearchTarget.getStartPageSearchItem(query)) + searchTargets.add(generateSearchTarget.getQwantSearchItem(query)) generateSearchTarget.getMarketSearchItem(query)?.let { searchTargets.add(it) } val adapterItems = transformSearchResults(searchTargets) diff --git a/lawnchair/src/app/lawnchair/search/SearchTargetUtils.kt b/lawnchair/src/app/lawnchair/search/SearchTargetUtils.kt index 553802b7fc3..a56d7118270 100644 --- a/lawnchair/src/app/lawnchair/search/SearchTargetUtils.kt +++ b/lawnchair/src/app/lawnchair/search/SearchTargetUtils.kt @@ -92,6 +92,7 @@ fun createDividerTarget(): SearchTargetCompat { } const val START_PAGE = "startpage" +const val QWANT = "qwant" const val MARKET_STORE = "marketstore" const val SUGGESTION = "suggestion" const val HEADER = "header" diff --git a/res/drawable/ic_qwant.xml b/res/drawable/ic_qwant.xml new file mode 100644 index 00000000000..b01ab90bd00 --- /dev/null +++ b/res/drawable/ic_qwant.xml @@ -0,0 +1,9 @@ + + + + + + + + +