aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-05 18:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Reduces vertical padding of predicted apps in All Apps." into tm-qpr-dev am: a297508c15

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19937149

Change-Id: Iccb595edba64d451c43f211363e586525cdcc020
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Andy Wickham
2022-09-21 23:23:36 +00:00
committed by Automerger Merge Worker
parent 84959297d7 a297508c15
commit c6ed393aae
5 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
View File

@@ -33,6 +33,7 @@ import com.android.launcher3.DeviceProfile;
import com.android.launcher3.DeviceProfile.DeviceProfileListenable;
import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
import com.android.launcher3.R;
import com.android.launcher3.Utilities;
import com.android.launcher3.allapps.FloatingHeaderRow;
import com.android.launcher3.allapps.FloatingHeaderView;
import com.android.launcher3.anim.AlphaUpdateListener;
@@ -117,9 +118,14 @@ public class PredictionRowView<T extends Context & ActivityContext & DeviceProfi
@Override
public int getExpectedHeight() {
return getVisibility() == GONE ? 0
: mActivityContext.getDeviceProfile().allAppsCellHeightPx + getPaddingTop()
+ getPaddingBottom();
DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();
int iconHeight = deviceProfile.allAppsIconSizePx;
int iconPadding = deviceProfile.allAppsIconDrawablePaddingPx;
int textHeight = Utilities.calculateTextHeight(deviceProfile.allAppsIconTextSizePx);
int verticalPadding = getResources().getDimensionPixelSize(
R.dimen.all_apps_predicted_icon_vertical_padding);
int totalHeight = iconHeight + iconPadding + textHeight + verticalPadding * 2;
return getVisibility() == GONE ? 0 : totalHeight + getPaddingTop() + getPaddingBottom();
}
@Override

1
res/layout/all_apps_personal_work_tabs.xml
View File

@@ -22,6 +22,7 @@
android:layout_gravity="center_horizontal"
android:paddingTop="@dimen/all_apps_tabs_vertical_padding"
android:paddingBottom="@dimen/all_apps_tabs_vertical_padding"
android:layout_marginTop="@dimen/all_apps_tabs_margin_top"
android:orientation="horizontal"
style="@style/TextHeadline">

3
res/values/dimens.xml
View File

@@ -121,6 +121,7 @@
<dimen name="all_apps_work_profile_tab_footer_bottom_padding">20dp</dimen>
<dimen name="all_apps_tabs_button_horizontal_padding">4dp</dimen>
<dimen name="all_apps_tabs_vertical_padding">6dp</dimen>
<dimen name="all_apps_tabs_margin_top">8dp</dimen>
<dimen name="all_apps_divider_height">2dp</dimen>
<dimen name="all_apps_divider_width">128dp</dimen>
<dimen name="all_apps_content_fade_in_offset">150dp</dimen>
@@ -128,9 +129,9 @@
<dimen name="all_apps_height_extra">6dp</dimen>
<dimen name="all_apps_bottom_sheet_horizontal_padding">0dp</dimen>
<dimen name="all_apps_paged_view_top_padding">40dp</dimen>
<dimen name="all_apps_personal_work_tabs_vertical_margin">16dp</dimen>
<dimen name="all_apps_icon_drawable_padding">8dp</dimen>
<dimen name="all_apps_predicted_icon_vertical_padding">8dp</dimen>
<!-- The size of corner radius of the arrow in the arrow toast. -->
<dimen name="arrow_toast_corner_radius">2dp</dimen>
<dimen name="arrow_toast_elevation">2dp</dimen>

3
src/com/android/launcher3/allapps/FloatingHeaderView.java
View File

@@ -272,7 +272,8 @@ public class FloatingHeaderView extends LinearLayout implements
}
mMaxTranslation += mFloatingRowsHeight;
if (!mTabsHidden) {
mMaxTranslation += mTabsAdditionalPaddingBottom;
mMaxTranslation += mTabsAdditionalPaddingBottom
+ getResources().getDimensionPixelSize(R.dimen.all_apps_tabs_margin_top);
}
}

8
src/com/android/launcher3/allapps/SearchTransitionController.java
View File

@@ -35,6 +35,7 @@ import android.view.animation.Interpolator;
import com.android.launcher3.BubbleTextView;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherState;
import com.android.launcher3.R;
/** Coordinates the transition between Search and A-Z in All Apps. */
public class SearchTransitionController {
@@ -144,8 +145,11 @@ public class SearchTransitionController {
headerView.setAlpha(clampToProgress(searchToAzProgress, 0.8f, 1f));
// Account for the additional padding added for the tabs.
appsTranslationY -=
headerView.getPaddingTop() - headerView.getTabsAdditionalPaddingBottom();
appsTranslationY +=
headerView.getTabsAdditionalPaddingBottom()
+ mAllAppsContainerView.getResources().getDimensionPixelOffset(
R.dimen.all_apps_tabs_margin_top)
- headerView.getPaddingTop();
}
View appsContainer = mAllAppsContainerView.getAppsRecyclerViewContainer();