Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53d7ee42 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Fixing different bitmap sizes in different orientations 

> Using a single bitmap icon size
> Picking up appropriate density for satisfy the required icon size
> Fixing some icon size assumptions during icon animations

Bug: 19514688
Change-Id: Ia7a1d0d2c03a9d39ccc241fa4ae3eb8a0f374585
parent f4fe7fc5

res/values-sw600dp/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
-->



<resources>

    <dimen name="app_icon_size">64dp</dimen>



<!-- All Apps -->

    <dimen name="all_apps_container_inset">18dp</dimen>

    <dimen name="all_apps_grid_view_start_margin">0dp</dimen>

res/values-sw720dp/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
-->



<resources>

    <dimen name="app_icon_size">72dp</dimen>



<!-- All Apps -->

    <dimen name="all_apps_search_bar_height">54dp</dimen>

    <dimen name="all_apps_icon_top_bottom_padding">16dp</dimen>

res/values/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
-->



<resources>

    <dimen name="app_icon_size">48dp</dimen>



<!-- Dynamic Grid -->

    <dimen name="dynamic_grid_edge_margin">6dp</dimen>

    <dimen name="dynamic_grid_search_bar_max_width">500dp</dimen>

src/com/android/launcher3/BubbleTextView.java

+6 −5
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ public class BubbleTextView extends TextView { 
    private static final int DISPLAY_WORKSPACE = 0;

    private static final int DISPLAY_ALL_APPS = 1;



    private final Launcher mLauncher;

    private Drawable mIcon;

    private final Drawable mBackground;

    private final CheckLongPressHelper mLongPressHelper;
@@ -91,8 +92,8 @@ public class BubbleTextView extends TextView { 


    public BubbleTextView(Context context, AttributeSet attrs, int defStyle) {

        super(context, attrs, defStyle);

        LauncherAppState app = LauncherAppState.getInstance();

        DeviceProfile grid = ((Launcher) context).getDeviceProfile();

        mLauncher = (Launcher) context;

        DeviceProfile grid = mLauncher.getDeviceProfile();



        TypedArray a = context.obtainStyledAttributes(attrs,

                R.styleable.BubbleTextView, defStyle, 0);
@@ -142,7 +143,7 @@ public class BubbleTextView extends TextView { 
            boolean promiseStateChanged) {

        Bitmap b = info.getIcon(iconCache);



        FastBitmapDrawable iconDrawable = Utilities.createIconDrawable(b);

        FastBitmapDrawable iconDrawable = mLauncher.createIconDrawable(b);

        iconDrawable.setGhostModeEnabled(info.isDisabled != 0);



        setIcon(iconDrawable, mIconSize);
@@ -158,7 +159,7 @@ public class BubbleTextView extends TextView { 
    }



    public void applyFromApplicationInfo(AppInfo info) {

        setIcon(Utilities.createIconDrawable(info.iconBitmap), mIconSize);

        setIcon(mLauncher.createIconDrawable(info.iconBitmap), mIconSize);

        setText(info.title);

        if (info.contentDescription != null) {

            setContentDescription(info.contentDescription);
@@ -171,7 +172,7 @@ public class BubbleTextView extends TextView { 
    }



    public void applyFromPackageItemInfo(PackageItemInfo info) {

        setIcon(Utilities.createIconDrawable(info.iconBitmap), mIconSize);

        setIcon(mLauncher.createIconDrawable(info.iconBitmap), mIconSize);

        setText(info.title);

        if (info.contentDescription != null) {

            setContentDescription(info.contentDescription);

src/com/android/launcher3/FolderIcon.java

+4 −3
Original line number Diff line number Diff line
@@ -645,9 +645,10 @@ public class FolderIcon extends FrameLayout implements FolderListener { 
            final Runnable onCompleteRunnable) {

        final PreviewItemDrawingParams finalParams = computePreviewItemDrawingParams(0, null);



        final float scale0 = 1.0f;

        final float transX0 = (mAvailableSpaceInPreview - d.getIntrinsicWidth()) / 2;

        final float transY0 = (mAvailableSpaceInPreview - d.getIntrinsicHeight()) / 2 + getPaddingTop();

        float iconSize = mLauncher.getDeviceProfile().iconSizePx;

        final float scale0 = iconSize / d.getIntrinsicWidth() ;

        final float transX0 = (mAvailableSpaceInPreview - iconSize) / 2;

        final float transY0 = (mAvailableSpaceInPreview - iconSize) / 2 + getPaddingTop();

        mAnimParams.drawable = d;



        ValueAnimator va = LauncherAnimUtils.ofFloat(this, 0f, 1.0f);