Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/trunk' into get-rid…
Browse files Browse the repository at this point in the history
…-of-app-compat
  • Loading branch information
Goooler committed Jul 9, 2024
2 parents a625964 + 39448d6 commit 1e5f85c
Show file tree
Hide file tree
Showing 60 changed files with 496 additions and 499 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ dependencies {
implementation 'androidx.compose.material3:material3-window-size-class:1.3.0-beta04'
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "androidx.activity:activity-compose:1.9.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.3"
implementation "androidx.navigation:navigation-compose:2.8.0-beta04"
implementation "androidx.palette:palette-ktx:1.0.0"
implementation "androidx.slice:slice-core:1.1.0-alpha02"
Expand Down Expand Up @@ -389,7 +389,7 @@ dependencies {
implementation 'com.airbnb.android:lottie:6.4.1'

// Smartspacer
implementation('com.kieronquinn.smartspacer:sdk-client:1.0.10') {
implementation('com.kieronquinn.smartspacer:sdk-client:1.0.11') {
exclude group: "com.github.skydoves", module: "balloon"
}
}
Expand All @@ -409,7 +409,7 @@ spotless {
kotlin {
target("lawnchair/src/**/*.kt")
ktlint().customRuleSets([
"io.nlopez.compose.rules:ktlint:0.4.4",
"io.nlopez.compose.rules:ktlint:0.4.5",
]).editorConfigOverride([
"ktlint_compose_compositionlocal-allowlist": "disabled",
])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@ public ActivityOptionsCompat getActivityOptionsCompat() {
@NonNull
@Override
public RemoteTransitionCompat getRemoteTransitionCompat() {
try {
return this::createRemoteTransition;
} catch (Throwable t) {
return super.getRemoteTransitionCompat();
}
return this::createRemoteTransition;
}

// TODO remove this as it causing glitches on first launch opening/closing app
Expand All @@ -51,7 +47,8 @@ private RemoteTransition createRemoteTransition(
| InstantiationException
| InvocationTargetException
| NoSuchMethodException e) {
throw new RuntimeException("Error creating RemoteTransitionCompat" + debugName, e);
return super.getRemoteTransitionCompat()
.getRemoteTransition(remoteTransition, appThread, debugName);
}
}
}
2 changes: 1 addition & 1 deletion lawnchair/res/values-af-rZA/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -523,5 +523,5 @@
<string name="grant_requested_permissions">Grant permissions</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (compose)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-am-rET/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -523,5 +523,5 @@
<string name="grant_requested_permissions">Grant permissions</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (compose)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-ar-rSA/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -527,5 +527,5 @@
<string name="grant_requested_permissions">Grant permissions</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (compose)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-az-rAZ/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -523,5 +523,5 @@
<string name="grant_requested_permissions">Grant permissions</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (compose)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-b+sr+Latn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -524,5 +524,5 @@
<string name="grant_requested_permissions">Dodeli dozvole</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (sastavljeno)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-bn-rBD/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -523,5 +523,5 @@
<string name="grant_requested_permissions">Grant permissions</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (compose)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-bs-rBA/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -524,5 +524,5 @@
<string name="grant_requested_permissions">Grant permissions</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (compose)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-ca-rES/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -523,5 +523,5 @@
<string name="grant_requested_permissions">Grant permissions</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (compose)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-cs-rCZ/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -525,5 +525,5 @@
<string name="grant_requested_permissions">Grant permissions</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (compose)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-da-rDK/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -523,5 +523,5 @@
<string name="grant_requested_permissions">Grant permissions</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (compose)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
12 changes: 6 additions & 6 deletions lawnchair/res/values-el-rGR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,8 @@
<string name="fontBodyMedium">Σώμα (μεσαίου πάχους)</string>
<string name="font_variant_italic">Πλάγια γραμματοσειρά</string>
<string name="font_weight_thin">Λεπτή γραμματοσειρά</string>
<string name="font_weight_extra_light">Εξαιρετικά ελαφριά γραμματοσειρά</string>
<string name="font_weight_light">Ελαφριά γραμματοσειρά</string>
<string name="font_weight_extra_light">Εξαιρετικά φωτεινό</string>
<string name="font_weight_light">Φωτεινό</string>
<string name="font_weight_regular">Κανονική γραμματοσειρά</string>
<string name="font_weight_medium">Μεσαία γραμματοσειρά</string>
<string name="font_weight_semi_bold">Ημιέντονη γραμματοσειρά</string>
Expand Down Expand Up @@ -467,7 +467,7 @@
-->
<!-- Launcher strings used -->
<string name="all_apps_device_search_hint">Αναζήτηση</string>
<string name="all_apps_search_bar_hint">Αναζήτηση Εφαρμογών</string>
<string name="all_apps_search_bar_hint">Αναζήτηση εφαρμογών</string>
<string name="all_apps_no_search_results">Δεν βρέθηκαν εφαρμογές που να ταιριάζουν “<xliff:g example="Android" id="query">%1$s</xliff:g>”</string>
<string name="all_apps_search_result_suggestions">Από το διαδίκτυο</string>
<string name="all_apps_search_result_contacts_from_device">Επαφές από τη συσκευή</string>
Expand All @@ -492,8 +492,8 @@
<string name="hidden_apps_show_name_typed">Εάν πληκτρολογηθεί το πλήρες όνομα</string>
<string name="app_search_algorithm">Αλγόριθμος αναζήτησης</string>
<string name="search_algorithm_app_search">Αναζήτηση Εφαρμογής</string>
<string name="search_algorithm_global_search_on_device">Γενική Αναζήτηση (Στην συσκευή)</string>
<string name="search_algorithm_global_search_via_asi">Γενική Αναζήτηση (μέσω ASI)</string>
<string name="search_algorithm_global_search_on_device">Γενική αναζήτηση (στην συσκευή)</string>
<string name="search_algorithm_global_search_via_asi">Γενική αναζήτηση (μέσω ASI)</string>
<!-- Labels of each search result types -->
<string name="show_search_result_types">Εμφάνιση στα αποτελέσματα αναζήτησης</string>
<string name="search_pref_result_apps_and_shortcuts_title">Εφαρμογές &amp; Συντομεύσεις</string>
Expand Down Expand Up @@ -523,5 +523,5 @@
<string name="grant_requested_permissions">Εκχώρηση δικαιωμάτων</string>
<string name="hotseat_mode_lawnchair_compose">Εκκινητής Lawnchair (σύνθεση)</string>
<string name="allapps_web_suggestion_provider_label">Πάροχος προτάσεων ιστού</string>
<string name="allapps_use_web_suggestion_icon_label">Χρήση εικονιδίου παρόχου προτάσεων ιστού στη μπάρα αναζήτησης</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-en-rCA/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -523,5 +523,5 @@
<string name="grant_requested_permissions">Grant permissions</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (compose)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-es-rES/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -523,5 +523,5 @@
<string name="grant_requested_permissions">Grant permissions</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (compose)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-et-rEE/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -523,5 +523,5 @@
<string name="grant_requested_permissions">Grant permissions</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (compose)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-fa-rIR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -523,5 +523,5 @@
<string name="grant_requested_permissions">Grant permissions</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (compose)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-fi-rFI/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -523,5 +523,5 @@
<string name="grant_requested_permissions">Grant permissions</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (compose)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-fil-rPH/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -523,5 +523,5 @@
<string name="grant_requested_permissions">Grant permissions</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (compose)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
6 changes: 3 additions & 3 deletions lawnchair/res/values-fr-rFR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@
<string name="all_apps_search_result_files">Fichiers de l\'appareil</string>
<string name="all_apps_search_result_settings_entry_from_device">Paramètres de l\'appareil</string>
<string name="all_apps_search_market_message">Rechercher plus d\'applications</string>
<string name="all_apps_search_on_web_message">Search on <xliff:g example="Startpage" id="web_search_provider">%1$s</xliff:g></string>
<string name="all_apps_search_on_web_message">Rechercher avec <xliff:g example="Startpage" id="web_search_provider">%1$s</xliff:g></string>
<string name="error_no_market_or_browser_installed">Aucun magasin d\'applications ni navigateur installé</string>
<string name="clear_history">Effacer l\'historique des recherches</string>
<string name="search_input_action_clear_results">Effacer la barre de recherche</string>
Expand Down Expand Up @@ -522,6 +522,6 @@
<string name="warn_files_permission_content">Pour rechercher des fichiers, autorisez Lawnchair à accéder au stockage.</string>
<string name="grant_requested_permissions">Accorder les autorisations</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (composition)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_web_suggestion_provider_label">Fournisseur de suggestions Web</string>
<string name="allapps_use_web_suggestion_icon_label">Afficher l\'icône du fournisseur de suggestions Web dans la barre de recherche</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-gl-rES/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -523,5 +523,5 @@
<string name="grant_requested_permissions">Grant permissions</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (compose)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-hi-rIN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -523,5 +523,5 @@
<string name="grant_requested_permissions">Grant permissions</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (compose)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-hr-rHR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -524,5 +524,5 @@
<string name="grant_requested_permissions">Grant permissions</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (compose)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-hu-rHU/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -523,5 +523,5 @@
<string name="grant_requested_permissions">Grant permissions</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (compose)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-in-rID/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -522,5 +522,5 @@
<string name="grant_requested_permissions">Berikan izin</string>
<string name="hotseat_mode_lawnchair_compose">Lawnchair (compose)</string>
<string name="allapps_web_suggestion_provider_label">Web suggestion provider</string>
<string name="allapps_use_web_suggestion_icon_label">Use web suggestion provider icon in search bar</string>
<string name="allapps_use_web_suggestion_icon_label">Show web suggestion provider icon in search bar</string>
</resources>
Loading

0 comments on commit 1e5f85c

Please sign in to comment.