diff options
author | Michael Jurka <mikejurka@google.com> | 2013-08-02 10:37:34 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-02 10:37:35 +0000 |
commit | acdaf3cd63609da9fa944448d14fd526acc0248a (patch) | |
tree | c26d1fae57e5396fa184d267974bb89fc71bd7e0 /src | |
parent | 482a5b6ed389ef943990277e461444626c34ebf2 (diff) | |
parent | 24715c751513ea2b24058b8d1a1e5263f5c31607 (diff) | |
download | android_packages_apps_Trebuchet-acdaf3cd63609da9fa944448d14fd526acc0248a.tar.gz android_packages_apps_Trebuchet-acdaf3cd63609da9fa944448d14fd526acc0248a.tar.bz2 android_packages_apps_Trebuchet-acdaf3cd63609da9fa944448d14fd526acc0248a.zip |
Merge "Small code formatting changes" into jb-ub-gel-agar
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/DeleteDropTarget.java | 3 | ||||
-rw-r--r-- | src/com/android/launcher3/ShortcutInfo.java | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index 763ec3faa..c98f761f2 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java @@ -55,6 +55,8 @@ public class DeleteDropTarget extends ButtonDropTarget { private TransitionDrawable mRemoveDrawable; private TransitionDrawable mCurrentDrawable; + private boolean mWaitingForUninstall = false; + public DeleteDropTarget(Context context, AttributeSet attrs) { this(context, attrs, 0); } @@ -251,7 +253,6 @@ public class DeleteDropTarget extends ButtonDropTarget { return AppsCustomizePagedView.DISABLE_ALL_APPS && isWorkspaceOrFolderApplication(d); } - private boolean mWaitingForUninstall = false; private void completeDrop(final DragObject d) { ItemInfo item = (ItemInfo) d.dragInfo; boolean wasWaitingForUninstall = mWaitingForUninstall; diff --git a/src/com/android/launcher3/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java index b6139b79e..fcfafe3b1 100644 --- a/src/com/android/launcher3/ShortcutInfo.java +++ b/src/com/android/launcher3/ShortcutInfo.java @@ -79,7 +79,8 @@ class ShortcutInfo extends ItemInfo { } mIcon = info.mIcon; // TODO: should make a copy here. maybe we don't need this ctor at all customIcon = info.customIcon; - initFlagsAndFirstInstallTime(getPackageInfo(context, intent.getComponent().getPackageName())); + initFlagsAndFirstInstallTime( + getPackageInfo(context, intent.getComponent().getPackageName())); } /** TODO: Remove this. It's only called by ApplicationInfo.makeShortcut. */ @@ -137,7 +138,8 @@ class ShortcutInfo extends ItemInfo { intent.setComponent(className); intent.setFlags(launchFlags); itemType = LauncherSettings.BaseLauncherColumns.ITEM_TYPE_APPLICATION; - initFlagsAndFirstInstallTime(getPackageInfo(context, intent.getComponent().getPackageName())); + initFlagsAndFirstInstallTime( + getPackageInfo(context, intent.getComponent().getPackageName())); } @Override |