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

Commit 73b6fef9 authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge "Keyguard slice views - fix alignment"

parents b47991a1 c5abc773

packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java

+7 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.Context; 
import android.content.res.Resources;

import android.graphics.Color;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.InsetDrawable;

import android.graphics.text.LineBreaker;

import android.net.Uri;

import android.os.Trace;
@@ -239,6 +240,12 @@ public class KeyguardSliceView extends LinearLayout { 
                final int iconSize = mHasHeader ? mIconSizeWithHeader : mIconSize;

                iconDrawable = icon.getIcon().loadDrawable(mContext);

                if (iconDrawable != null) {

                    if ((iconDrawable instanceof InsetDrawable)

                            && mLockScreenMode == KeyguardUpdateMonitor.LOCK_SCREEN_MODE_LAYOUT_1) {

                        // System icons (DnD) use insets which are fine for centered slice content

                        // but will cause a slight indent for left/right-aligned slice views

                        iconDrawable = ((InsetDrawable) iconDrawable).getDrawable();

                    }

                    final int width = (int) (iconDrawable.getIntrinsicWidth()

                            / (float) iconDrawable.getIntrinsicHeight() * iconSize);

                    iconDrawable.setBounds(0, 0, Math.max(width, 1), iconSize);