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 Dec 30, 2023
2 parents c55f65c + 4c997b2 commit 8cc4418
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,9 @@ dependencies {
withQuickstepImplementation projects.systemUnFold
withQuickstepImplementation projects.systemUIViewCapture
withQuickstepImplementation projects.systemUILog
withQuickstepImplementation projects.systemUIPlugin
withQuickstepCompileOnly projects.systemUIPlugin
withQuickstepImplementation projects.systemUIPluginCore
withQuickstepImplementation projects.systemUICommon
withQuickstepCompileOnly projects.systemUICommon

implementation fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'SystemUI-statsd-14.jar')

Expand Down Expand Up @@ -368,7 +368,7 @@ dependencies {
// Persian Date
implementation 'com.github.samanzamani:PersianDate:1.7.1'

implementation 'com.airbnb.android:lottie:6.2.0'
implementation 'com.airbnb.android:lottie:6.3.0'

// Smartspacer
implementation('com.kieronquinn.smartspacer:sdk-client:1.0.6') {
Expand Down
2 changes: 1 addition & 1 deletion lawnchair/res/values/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
<item name="config_default_home_icon_label_folder_size_factor" type="dimen" format="float">1.0</item>
<item name="config_default_drawer_icon_label_size_factor" type="dimen" format="float">1.0</item>
<item name="config_default_drawer_cell_height_factor" type="dimen" format="float">1.0</item>
<item name="config_default_drawer_left_right_factor" type="dimen" format="float">0.1</item>
<item name="config_default_drawer_left_right_factor" type="dimen" format="float">0.4</item>
<item name="config_default_search_max_result_count" type="dimen" format="integer">5</item>
<item name="config_default_files_max_result_count" type="dimen" format="integer">3</item>
<item name="config_default_people_max_result_count" type="dimen" format="integer">10</item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ fun AppDrawerPreferences() {
SliderPreference(
adapter = prefs2.drawerLeftRightMarginFactor.getAdapter(),
label = stringResource(id = R.string.app_drawer_indent_label),
valueRange = 0.0F..1.0F,
valueRange = 0.0F..2.0F,
step = 0.01F,
showAsPercentage = true,
)
Expand Down
6 changes: 3 additions & 3 deletions src/com/android/launcher3/DeviceProfile.java
Original file line number Diff line number Diff line change
Expand Up @@ -1313,9 +1313,9 @@ private void updateAllAppsContainerWidth() {
}
var allAppLeftRightMarginMultiplier = PreferenceExtensionsKt
.firstBlocking(preferenceManager2.getDrawerLeftRightMarginFactor());
var margin = pxFromDp(inv.allAppsCellSize[mTypeIndex].y, mMetrics, allAppLeftRightMarginMultiplier);
allAppsLeftRightMargin *= margin;
allAppsLeftRightPadding *= margin;
var marginMultiplier = allAppLeftRightMarginMultiplier * (!isTablet ? 100 : 2);
allAppsLeftRightMargin *= marginMultiplier;
allAppsLeftRightPadding *= marginMultiplier;
}

private void setupAllAppsStyle(Context context) {
Expand Down

0 comments on commit 8cc4418

Please sign in to comment.