Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/upstream' into trunk
Browse files Browse the repository at this point in the history
// Conflicts:
//	README.md
  • Loading branch information
Goooler committed Oct 3, 2024
2 parents dbeaddb + 380f49a commit 2ecf999
Show file tree
Hide file tree
Showing 19 changed files with 688 additions and 687 deletions.
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
open_collective: lawnchair
github: LawnchairLauncher
2 changes: 1 addition & 1 deletion baseline-profile/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ dependencies {
implementation 'androidx.test.ext:junit:1.2.1'
implementation 'androidx.test.espresso:espresso-core:3.6.1'
implementation 'androidx.test.uiautomator:uiautomator:2.3.0'
implementation 'androidx.benchmark:benchmark-macro-junit4:1.3.1'
implementation 'androidx.benchmark:benchmark-macro-junit4:1.3.2'
}
16 changes: 8 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import com.android.build.gradle.api.AndroidBasePlugin
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id 'com.android.application' version "8.6.1"
id 'com.android.library' version "8.6.1" apply false
id 'com.android.test' version '8.6.1' apply false
id 'androidx.baselineprofile' version '1.3.1'
id 'com.android.application' version "8.7.0"
id 'com.android.library' version "8.7.0" apply false
id 'com.android.test' version '8.7.0' apply false
id 'androidx.baselineprofile' version '1.3.2'
id 'org.jetbrains.kotlin.android' version "2.0.20"
id 'org.jetbrains.kotlin.plugin.compose' version "2.0.20"
id 'org.jetbrains.kotlin.plugin.parcelize' version "2.0.20"
Expand Down Expand Up @@ -332,19 +332,19 @@ dependencies {

coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2'

implementation 'androidx.profileinstaller:profileinstaller:1.3.1'
implementation 'androidx.profileinstaller:profileinstaller:1.4.1'
baselineProfile projects.baselineProfile

implementation "androidx.dynamicanimation:dynamicanimation:1.0.0"
implementation "androidx.recyclerview:recyclerview:1.3.2"
implementation "androidx.preference:preference-ktx:1.2.1"

implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0'
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.2'
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3'
implementation 'com.github.ChickenHook:RestrictionBypass:2.2'
implementation 'dev.rikka.tools.refine:runtime:4.4.0'

implementation platform("androidx.compose:compose-bom:2024.09.02")
implementation platform("androidx.compose:compose-bom:2024.09.03")
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.ui:ui-util"
debugImplementation "androidx.compose.ui:ui-tooling"
Expand All @@ -358,7 +358,7 @@ dependencies {
implementation 'androidx.compose.material3:material3-window-size-class'
implementation "androidx.activity:activity-compose:1.9.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6"
implementation "androidx.navigation:navigation-compose:2.8.1"
implementation "androidx.navigation:navigation-compose:2.8.2"
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "androidx.palette:palette-ktx:1.0.0"
implementation "androidx.slice:slice-core:1.1.0-alpha02"
Expand Down
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=1541fa36599e12857140465f3c91a97409b4512501c26f9631fb113e392c5bd1
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
8 changes: 4 additions & 4 deletions lawnchair/res/values-ar-rSA/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<!-- Miscellaneous -->
<string name="what_to_show">ماذا يُعرض</string>
<!-- A11y description -->
<string name="accessibility_service_description">To lock your phone when performing a gesture, and to open Recents via 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 Recents, Lawnchair uses the performGlobalAction Accessibility service.</string>
<string name="accessibility_service_description">لقفل هاتفك عند تنفيذ إيماءة، ولفتح التطبيقات الحديثة عبر الإيماءة، يحتاج Lawnchair إلى الوصول إلى خدمات الوصول. لا يراقب Lawnchair أي إجراء من المستخدم، على الرغم من أن هذه الصلاحية مطلوبة لجميع خدمات الوصول. يتجاهل Lawnchair أي حدث يتم إرساله من النظام. لقفل هاتفك، أو لفتح التطبيقات الحديثة، يستخدم Lawnchair خدمة الوصول performGlobalAction.</string>
<string name="x_by_y">18. %1$d x %2$d</string>
<string name="x_and_y">%1$s &amp; %2$s</string>
<!--
Expand Down Expand Up @@ -339,7 +339,7 @@
<string name="gesture_back_tap">زر العودة</string>
<string name="gesture_handler_no_op">لا تفعل شيئاً</string>
<string name="gesture_handler_sleep">السكون</string>
<string name="gesture_handler_recents">Open Recents</string>
<string name="gesture_handler_recents">فتح التطبيقات الحديثة</string>
<string name="gesture_handler_open_notifications">فتح لوحة الإشعارات</string>
<string name="gesture_handler_open_app_option">فتح التطبيق</string>
<string name="gesture_handler_open_app_config">فتح %1$s</string>
Expand All @@ -351,9 +351,9 @@
<string name="dt2s_admin_hint">لاستخدام النقرة المزدوجة لإطفاء الشاشة، عيّن Lawnchair كتطبيق مشرف للجهاز. انقر على فتح الإعدادات، ثم انقر على \"فعِّل التطبيق كمشرف على الجهاز.\"</string>
<string name="dt2s_admin_warning">سيتم إيقاف تشغيل الضغط المزدوج للسكون.</string>
<string name="d2ts_recents_a11y_hint_title">تشغيل خدمة الوصول</string>
<string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"\n\nLawnchair uses Accessibility\'s `performGlobalAction` method to perform this action. This is a sensitive permission that allows monitoring other apps. However, Lawnchair is not configured for that functionality and receives no events.</string>
<string name="dt2s_a11y_hint">لاستخدام ميزة النقر المزدوج للسكون، قم بتفعيل خدمة الوصول الخاصة بـ Lawnchair. اضغط على \"فتح الإعدادات\"، ثم اختر \"Lawnchair\" وقم بتفعيل \"استخدام Lawnchair\". يستخدم Lawnchair طريقة performGlobalAction من خدمات الوصول لتنفيذ هذا الإجراء. هذه إذن حساس يسمح بمراقبة التطبيقات الأخرى. ومع ذلك، لم يتم تكوين Lawnchair لهذه الوظيفة ولا يستقبل أي أحداث.</string>
<string name="dt2s_recents_warning_open_settings">فتح الإعدادات</string>
<string name="recents_a11y_hint">To use Open Recents, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"\n\nLawnchair uses Accessibility\'s `performGlobalAction` method to perform this action. This is a sensitive permission that allows monitoring other apps. However, Lawnchair is not configured for that functionality and receives no events.</string>
<string name="recents_a11y_hint">لاستخدام فتح التطبيقات الحديثة، قم بتفعيل خدمة الوصول الخاصة بـ Lawnchair. اضغط على \"فتح الإعدادات\"، ثم اختر \"Lawnchair\" وقم بتفعيل \"استخدام Lawnchair\". يستخدم Lawnchair طريقة performGlobalAction من خدمات الوصول لتنفيذ هذا الإجراء. هذا إذن حساس يسمح بمراقبة التطبيقات الأخرى. ومع ذلك، لم يتم تكوين Lawnchair لهذه الوظيفة ولا يستقبل أي أحداث.</string>
<!--
Bug reporting
Expand Down
Loading

0 comments on commit 2ecf999

Please sign in to comment.