diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-03-13 18:58:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-03-13 18:58:03 +0000 |
| commit | 4eaacc7485b85ec964c0ff384dda781f7f17ec74 (patch) | |
| tree | 2a76c577d5caca7127c07d46ccf6743f8c1b56b6 /src/com/android/launcher3/Launcher.java | |
| parent | 02a7624fc3e64aa1bd47bc06e4d9c434b8659402 (diff) | |
| parent | 9b29ca5add472b6bdebfa7936142b3aad6cbe3c5 (diff) | |
| download | android_packages_apps_Trebuchet-4eaacc7485b85ec964c0ff384dda781f7f17ec74.tar.gz android_packages_apps_Trebuchet-4eaacc7485b85ec964c0ff384dda781f7f17ec74.tar.bz2 android_packages_apps_Trebuchet-4eaacc7485b85ec964c0ff384dda781f7f17ec74.zip | |
Merge "Defining HomeScreenElementTheme for elements which appear on top of wallpaper" into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 0a0859758..a69f501d7 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -65,6 +65,7 @@ import android.view.HapticFeedbackConstants; import android.view.KeyEvent; import android.view.KeyboardShortcutGroup; import android.view.KeyboardShortcutInfo; +import android.view.LayoutInflater; import android.view.Menu; import android.view.MotionEvent; import android.view.View; @@ -1421,8 +1422,8 @@ public class Launcher extends BaseActivity * @return A View inflated from layoutResId. */ public View createShortcut(ViewGroup parent, ShortcutInfo info) { - BubbleTextView favorite = (BubbleTextView) getLayoutInflater().inflate(R.layout.app_icon, - parent, false); + BubbleTextView favorite = (BubbleTextView) LayoutInflater.from(parent.getContext()) + .inflate(R.layout.app_icon, parent, false); favorite.applyFromShortcutInfo(info); favorite.setCompoundDrawablePadding(mDeviceProfile.iconDrawablePaddingPx); favorite.setOnClickListener(this); |