diff options
author | Tony Wickham <twickham@google.com> | 2017-04-11 17:26:50 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2017-04-11 17:26:50 -0700 |
commit | bb3c1f8f7c4331a50e57cf1e243a318d8bc82172 (patch) | |
tree | d736721f562fa5f56064e445e89574c50144553d /src/com/android/launcher3/shortcuts | |
parent | 7fc94d7aacddb12e6d50401314fdc029d20939a6 (diff) | |
parent | ce44516dd869dff1d6a744e26625a662d9567a10 (diff) | |
download | android_packages_apps_Trebuchet-bb3c1f8f7c4331a50e57cf1e243a318d8bc82172.tar.gz android_packages_apps_Trebuchet-bb3c1f8f7c4331a50e57cf1e243a318d8bc82172.tar.bz2 android_packages_apps_Trebuchet-bb3c1f8f7c4331a50e57cf1e243a318d8bc82172.zip |
resolve merge conflicts of ce44516dd to ub-launcher3-master
Change-Id: I6f4455c1d4bedf778850acbb1e1c7372d532e13a
Diffstat (limited to 'src/com/android/launcher3/shortcuts')
-rw-r--r-- | src/com/android/launcher3/shortcuts/DeepShortcutTextView.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/shortcuts/ShortcutsItemView.java | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutTextView.java b/src/com/android/launcher3/shortcuts/DeepShortcutTextView.java index 42086fcb5..1a5297dc7 100644 --- a/src/com/android/launcher3/shortcuts/DeepShortcutTextView.java +++ b/src/com/android/launcher3/shortcuts/DeepShortcutTextView.java @@ -47,7 +47,7 @@ public class DeepShortcutTextView extends BubbleTextView { super(context, attrs, defStyle); Resources resources = getResources(); - mDragHandleWidth = resources.getDimensionPixelSize(R.dimen.deep_shortcut_padding_end) + mDragHandleWidth = resources.getDimensionPixelSize(R.dimen.popup_padding_end) + resources.getDimensionPixelSize(R.dimen.deep_shortcut_drag_handle_size) + resources.getDimensionPixelSize(R.dimen.deep_shortcut_drawable_padding) / 2; } diff --git a/src/com/android/launcher3/shortcuts/ShortcutsItemView.java b/src/com/android/launcher3/shortcuts/ShortcutsItemView.java index 2255007d3..ef6365b63 100644 --- a/src/com/android/launcher3/shortcuts/ShortcutsItemView.java +++ b/src/com/android/launcher3/shortcuts/ShortcutsItemView.java @@ -118,8 +118,7 @@ public class ShortcutsItemView extends PopupItemView implements View.OnLongClick return false; } - public void addShortcutView(View shortcutView, PopupPopulator.Item shortcutType, - boolean isAboveIcon) { + public void addShortcutView(View shortcutView, PopupPopulator.Item shortcutType) { if (shortcutType == PopupPopulator.Item.SHORTCUT) { mDeepShortcutViews.add((DeepShortcutView) shortcutView); } else { @@ -130,11 +129,7 @@ public class ShortcutsItemView extends PopupItemView implements View.OnLongClick if (mSystemShortcutIcons == null) { mSystemShortcutIcons = (LinearLayout) mLauncher.getLayoutInflater().inflate( R.layout.system_shortcut_icons, mShortcutsLayout, false); - if (isAboveIcon) { - mShortcutsLayout.addView(mSystemShortcutIcons, 0); - } else { - mShortcutsLayout.addView(mSystemShortcutIcons); - } + mShortcutsLayout.addView(mSystemShortcutIcons, 0); } mSystemShortcutIcons.addView(shortcutView); } else { |