diff options
author | Tony <twickham@google.com> | 2017-07-05 12:32:16 -0700 |
---|---|---|
committer | Tony <twickham@google.com> | 2017-07-05 12:32:16 -0700 |
commit | 45cdfa78d4f39db1d18514c4cab0e0e8442b5202 (patch) | |
tree | 4acfb54fe6c5b06fcc16a147d32648e77828211d /src/com/android/launcher3/shortcuts | |
parent | f593fb916e1da8f218b265ba4a752b31cf3b2fb6 (diff) | |
download | android_packages_apps_Trebuchet-45cdfa78d4f39db1d18514c4cab0e0e8442b5202.tar.gz android_packages_apps_Trebuchet-45cdfa78d4f39db1d18514c4cab0e0e8442b5202.tar.bz2 android_packages_apps_Trebuchet-45cdfa78d4f39db1d18514c4cab0e0e8442b5202.zip |
Polish popup
- Remove divider between system shortcut header and shortcuts
- Slightly reduce padding between popup and icon
- Fix gravity to center in drag layer using x and y calculations since
we use the y value to position the popup when removing notifications
Change-Id: I1cb10ed953d11cc0924d8ee70881a434cb748317
Diffstat (limited to 'src/com/android/launcher3/shortcuts')
-rw-r--r-- | src/com/android/launcher3/shortcuts/ShortcutsItemView.java | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/com/android/launcher3/shortcuts/ShortcutsItemView.java b/src/com/android/launcher3/shortcuts/ShortcutsItemView.java index f6fffe00b..b4fa04e42 100644 --- a/src/com/android/launcher3/shortcuts/ShortcutsItemView.java +++ b/src/com/android/launcher3/shortcuts/ShortcutsItemView.java @@ -24,7 +24,6 @@ import android.graphics.Point; import android.graphics.Rect; import android.util.AttributeSet; import android.util.Log; -import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.widget.LinearLayout; @@ -145,18 +144,8 @@ public class ShortcutsItemView extends PopupItemView implements View.OnLongClick if (mSystemShortcutIcons == null) { mSystemShortcutIcons = (LinearLayout) mLauncher.getLayoutInflater().inflate( R.layout.system_shortcut_icons, mContent, false); - - View divider = LayoutInflater.from(getContext()).inflate( - R.layout.horizontal_divider, this, false); - boolean iconsAreBelowShortcuts = mShortcutsLayout.getChildCount() > 0; - if (iconsAreBelowShortcuts) { - mContent.addView(divider); - mContent.addView(mSystemShortcutIcons); - } else { - mContent.addView(divider, 0); - mContent.addView(mSystemShortcutIcons, 0); - } + mContent.addView(mSystemShortcutIcons, iconsAreBelowShortcuts ? -1 : 0); } mSystemShortcutIcons.addView(shortcutView, index); } else { |