mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-03-03 17:36:49 +00:00
Merge "Add transient taskbar UI" into tm-qpr-dev
This commit is contained in:
@@ -45,6 +45,7 @@ import com.android.launcher3.icons.ThemedIconDrawable;
|
||||
import com.android.launcher3.model.data.FolderInfo;
|
||||
import com.android.launcher3.model.data.ItemInfo;
|
||||
import com.android.launcher3.model.data.WorkspaceItemInfo;
|
||||
import com.android.launcher3.util.DisplayController;
|
||||
import com.android.launcher3.util.LauncherBindableItemsContainer;
|
||||
import com.android.launcher3.views.ActivityContext;
|
||||
import com.android.launcher3.views.DoubleShadowBubbleTextView;
|
||||
@@ -61,7 +62,7 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
|
||||
public int mThemeIconsBackground;
|
||||
|
||||
private final int[] mTempOutLocation = new int[2];
|
||||
private final Rect mIconLayoutBounds = new Rect();
|
||||
private final Rect mIconLayoutBounds;
|
||||
private final int mIconTouchSize;
|
||||
private final int mItemMarginLeftRight;
|
||||
private final int mItemPadding;
|
||||
@@ -107,11 +108,14 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
|
||||
int defStyleRes) {
|
||||
super(context, attrs, defStyleAttr, defStyleRes);
|
||||
mActivityContext = ActivityContext.lookupContext(context);
|
||||
mIconLayoutBounds = mActivityContext.getTransientTaskbarBounds();
|
||||
|
||||
Resources resources = getResources();
|
||||
mIconTouchSize = resources.getDimensionPixelSize(R.dimen.taskbar_icon_touch_size);
|
||||
|
||||
int actualMargin = resources.getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
|
||||
int actualMargin = DisplayController.isTransientTaskbar(mActivityContext)
|
||||
? resources.getDimensionPixelSize(R.dimen.transient_taskbar_icon_spacing)
|
||||
: resources.getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
|
||||
int actualIconSize = mActivityContext.getDeviceProfile().iconSizePx;
|
||||
|
||||
// We layout the icons to be of mIconTouchSize in width and height
|
||||
|
||||
Reference in New Issue
Block a user