Skip to content

Commit

Permalink
Merge branch 'LawnchairLauncher:14-dev' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
Goooler authored Jul 15, 2024
2 parents 39448d6 + 9572494 commit a1edf80
Show file tree
Hide file tree
Showing 76 changed files with 1,175 additions and 498 deletions.
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ import com.android.build.gradle.api.AndroidBasePlugin
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id 'com.android.application' version "8.5.0"
id 'com.android.library' version "8.5.0" apply false
id 'com.android.test' version '8.5.0' apply false
id 'com.android.application' version "8.5.1"
id 'com.android.library' version "8.5.1" apply false
id 'com.android.test' version '8.5.1' apply false
id 'androidx.baselineprofile' version '1.2.4'
id 'org.jetbrains.kotlin.android' version "2.0.0"
id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0"
id 'org.jetbrains.kotlin.plugin.parcelize' version "2.0.0"
id 'org.jetbrains.kotlin.plugin.serialization' version "2.0.0"
id "com.google.devtools.ksp" version "2.0.0-1.0.22"
id "com.google.devtools.ksp" version "2.0.0-1.0.23"
id 'com.google.protobuf' version "0.9.4"
id 'app.cash.licensee' version "1.11.0"
id 'dev.rikka.tools.refine' version "4.4.0"
Expand Down Expand Up @@ -356,7 +356,7 @@ dependencies {
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "androidx.activity:activity-compose:1.9.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.3"
implementation "androidx.navigation:navigation-compose:2.8.0-beta04"
implementation "androidx.navigation:navigation-compose:2.8.0-beta05"
implementation "androidx.palette:palette-ktx:1.0.0"
implementation "androidx.slice:slice-core:1.1.0-alpha02"
def accompanistVersion = '0.34.0'
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
53 changes: 43 additions & 10 deletions lawnchair/res/layout/search_container_all_apps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

<app.lawnchair.allapps.AllAppsSearchInput xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/search_container_all_apps"
android:layout_width="match_parent"
android:layout_height="@dimen/search_box_container_height"
Expand Down Expand Up @@ -73,21 +74,53 @@
android:layout_height="@dimen/search_box_height"
android:layout_gravity="bottom|center|start"
android:background="@drawable/pill_ripple"
android:layout_marginEnd="6dp"
android:clickable="true"
android:contentDescription="@string/search_bar_label"
android:scaleType="center"
android:src="@drawable/ic_allapps_search"
app:tint="?android:textColorSecondary" />

<ImageButton
android:id="@+id/action_btn"
android:layout_width="@dimen/search_box_height"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="@dimen/search_box_height"
android:layout_gravity="bottom|center|end"
android:background="@drawable/pill_ripple"
android:clickable="true"
android:contentDescription="@string/search_input_action_clear_results"
android:scaleType="center"
android:src="@drawable/ic_remove_no_shadow"
app:tint="?android:textColorSecondary" />
android:layout_gravity="bottom|end|center"
android:clipToPadding="false"
android:orientation="horizontal"
tools:ignore="RtlSymmetry">

<app.lawnchair.qsb.AssistantIconView
android:id="@+id/mic_btn"
android:layout_width="@dimen/search_box_height"
android:layout_height="@dimen/search_box_height"
android:background="@drawable/pill_ripple"
android:clickable="true"
android:contentDescription="@string/label_voice_search"
android:scaleType="center"
android:src="@drawable/ic_remove_no_shadow"
app:tint="?android:textColorSecondary" />

<ImageButton
android:id="@+id/lens_btn"
android:layout_width="@dimen/search_box_height"
android:layout_height="@dimen/search_box_height"
android:background="@drawable/pill_ripple"
android:clickable="true"
android:contentDescription="@string/label_lens"
android:scaleType="center"
android:src="@drawable/ic_remove_no_shadow"
app:tint="?android:textColorSecondary" />

<ImageButton
android:id="@+id/action_btn"
android:layout_width="@dimen/search_box_height"
android:layout_height="@dimen/search_box_height"
android:background="@drawable/pill_ripple"
android:clickable="true"
android:contentDescription="@string/search_input_action_clear_results"
android:scaleType="center"
android:src="@drawable/ic_remove_no_shadow"
app:tint="?android:textColorSecondary" />
</LinearLayout>

</app.lawnchair.allapps.AllAppsSearchInput>
1 change: 1 addition & 0 deletions lawnchair/res/values-af-rZA/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -524,4 +524,5 @@
<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">Show web suggestion provider icon in search bar</string>
<string name="allapps_match_qsb_style_label">Match dock search bar style</string>
</resources>
1 change: 1 addition & 0 deletions lawnchair/res/values-am-rET/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -524,4 +524,5 @@
<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">Show web suggestion provider icon in search bar</string>
<string name="allapps_match_qsb_style_label">Match dock search bar style</string>
</resources>
1 change: 1 addition & 0 deletions lawnchair/res/values-ar-rSA/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -528,4 +528,5 @@
<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">Show web suggestion provider icon in search bar</string>
<string name="allapps_match_qsb_style_label">Match dock search bar style</string>
</resources>
1 change: 1 addition & 0 deletions lawnchair/res/values-az-rAZ/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -524,4 +524,5 @@
<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">Show web suggestion provider icon in search bar</string>
<string name="allapps_match_qsb_style_label">Match dock search bar style</string>
</resources>
1 change: 1 addition & 0 deletions lawnchair/res/values-b+sr+Latn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -525,4 +525,5 @@
<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">Show web suggestion provider icon in search bar</string>
<string name="allapps_match_qsb_style_label">Match dock search bar style</string>
</resources>
41 changes: 21 additions & 20 deletions lawnchair/res/values-bn-rBD/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,27 @@
-->
<string name="preview_label">প্রিভিউ</string>
<string name="action_create">তৈরি করুন</string>
<string name="action_backup">Backup</string>
<string name="action_backup">ব্যাকআপ</string>
<string name="action_restore">উদ্ধার</string>
<string name="action_delete">মুছে ফেলুন</string>
<string name="action_reset">রিসেট</string>
<string name="action_unlock">Unlock</string>
<string name="action_lock">Lock</string>
<string name="action_unlock">আনলক</string>
<string name="action_lock">লক</string>
<string name="action_apply">সম্পূর্ণ করুন</string>
<string name="action_customize">কাস্টমাইজ করুন</string>
<string name="always_choice">Always</string>
<string name="never_choice">Never</string>
<string name="always_choice">সবসময়</string>
<string name="never_choice">কখনো না</string>
<string name="clipboard">ক্লিপবোর্ড</string>
<string name="action_copy_link">Copy link</string>
<string name="action_copy_link">লিঙ্ক কপি করুন</string>
<string name="action_copy">কপি</string>
<string name="action_paste">পোস্ট</string>
<string name="loading">লোড হচ্ছে…</string>
<string name="managed_by_lawnchair">Lawnchair দ্বারা পরিচালিত করা হবে</string>
<!-- When mentioning settings UI -->
<string name="smartspace_preferences">পছন্দ-সমুহ</string>
<string name="settings_button_text">Home settings</string>
<string name="system_settings">System settings</string>
<string name="title_change_settings">Change settings</string>
<string name="settings_button_text">হোম সেটিংস</string>
<string name="system_settings">সিস্টেম সেটিংস</string>
<string name="title_change_settings">সেটিংস পরিবর্তন করুন</string>
<!--
General "words" used throughout Lawnchair
Expand All @@ -53,7 +53,7 @@
<string name="dynamic">পরিবর্তনশীল</string>
<string name="presets">পূর্বনির্ধারিত অবস্থাগুলো</string>
<string name="custom">পছন্দসই</string>
<string name="feed_default">Default</string>
<string name="feed_default">ডিফল্ট</string>
<string name="system">সিস্টেম</string>
<!-- Relating to the Launcher ui -->
<string name="columns">কলাম</string>
Expand All @@ -64,14 +64,14 @@
<string name="layout">গঠন</string>
<!-- Generic styling options -->
<string name="wallpaper">ওয়ালপেপার</string>
<string name="background_opacity">Background opacity</string>
<string name="background_opacity">ব্যাকগ্রাউন্ডের অস্বচ্ছতা</string>
<!-- Toast text and tips -->
<string name="copied_toast">Copied to clipboard</string>
<string name="item_removed">Item removed</string>
<string name="copied_toast">ক্লিপবোর্ডের অস্বচ্ছতা</string>
<string name="item_removed">আইটেম রিমুভ করা হয়েছে</string>
<!-- Miscellaneous -->
<string name="what_to_show">What to show</string>
<string name="what_to_show">যা দেখাবে</string>
<!-- A11y description -->
<string name="accessibility_service_description">To lock 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, Lawnchair uses the performGlobalAction Accessibility service.</string>
<string name="accessibility_service_description">জেসচারের মাধ্যমে ফোন লক করার জন্য Lawnchair এর এক্সেসিবিলিটি এক্সেস প্রয়োজন।\n\nLawnchair ব্যবহারকারীদের কর্মকান্ডে কোন নজরদারি করে না, যদিও এক্সেসিবিলিটি সার্ভিসের জন্য এই ক্ষমতা প্রয়োজন। সিস্টেম কর্তৃক পাঠানো যেকোন কিছু Lawnchair সংরক্ষণ করবে না।\n\nLawnchair ফোন লক করার জন্য performGlobalAction এক্সেসিবিলিটি সার্ভিস ব্যবহার করে।</string>
<string name="x_by_y">%1$d x %2$d</string>
<string name="x_and_y">%s &amp; %s</string>
<!--
Expand All @@ -81,12 +81,12 @@
-->
<string name="settings">সেটিংস</string>
<string name="general_label">সাধারণ</string>
<string name="general_description">Colors, icon packs, notification dots</string>
<string name="home_screen_label">Home screen</string>
<string name="home_screen_description">Feed, grid, icons</string>
<string name="general_description">কালারস, আইকন প্যাকস ও নোটিফিকেশন ডটস</string>
<string name="home_screen_label">হোম স্ক্রিন</string>
<string name="home_screen_description">ফিড, গ্রিডস, আইকনস</string>
<string name="dock_label">ডক</string>
<string name="dock_description">Search bar, icon count</string>
<string name="app_drawer_label">App drawer</string>
<string name="dock_description">অনুসন্ধান বার, আইকন সংখ্যা</string>
<string name="app_drawer_label">অ্যাপ ড্রয়ার</string>
<string name="app_drawer_description">Hidden apps, column count, icons</string>
<string name="drawer_search_label">Drawer search</string>
<string name="drawer_search_description">Web suggestions, global search</string>
Expand Down Expand Up @@ -524,4 +524,5 @@
<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">Show web suggestion provider icon in search bar</string>
<string name="allapps_match_qsb_style_label">Match dock search bar style</string>
</resources>
1 change: 1 addition & 0 deletions lawnchair/res/values-bs-rBA/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -525,4 +525,5 @@
<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">Show web suggestion provider icon in search bar</string>
<string name="allapps_match_qsb_style_label">Match dock search bar style</string>
</resources>
1 change: 1 addition & 0 deletions lawnchair/res/values-ca-rES/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -524,4 +524,5 @@
<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">Show web suggestion provider icon in search bar</string>
<string name="allapps_match_qsb_style_label">Match dock search bar style</string>
</resources>
Loading

0 comments on commit a1edf80

Please sign in to comment.