diff options
author | Tony Wickham <twickham@google.com> | 2015-10-15 11:18:26 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2015-10-15 11:18:26 -0700 |
commit | 9ccb94b6e4613ee717550416db2b456d9f17702e (patch) | |
tree | 139221ae53676b8e3a76e71391c23853e39bb76e /src/com/android/launcher3/widget/WidgetsContainerView.java | |
parent | 9a9765924fcc1171b447f2bb689db5cd888df7e3 (diff) | |
parent | a8709ddbbf6338d71625ee1eef96e42bee042b31 (diff) | |
download | android_packages_apps_Trebuchet-9ccb94b6e4613ee717550416db2b456d9f17702e.tar.gz android_packages_apps_Trebuchet-9ccb94b6e4613ee717550416db2b456d9f17702e.tar.bz2 android_packages_apps_Trebuchet-9ccb94b6e4613ee717550416db2b456d9f17702e.zip |
resolved conflicts for a8709ddb to ub-launcher3-master
Change-Id: I172395e6e172914627b6dec721070a66520557b1
Diffstat (limited to 'src/com/android/launcher3/widget/WidgetsContainerView.java')
-rw-r--r-- | src/com/android/launcher3/widget/WidgetsContainerView.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/com/android/launcher3/widget/WidgetsContainerView.java b/src/com/android/launcher3/widget/WidgetsContainerView.java index 143f98988..a1472cc9f 100644 --- a/src/com/android/launcher3/widget/WidgetsContainerView.java +++ b/src/com/android/launcher3/widget/WidgetsContainerView.java @@ -52,10 +52,9 @@ import com.android.launcher3.util.Thunk; * The widgets list view container. */ public class WidgetsContainerView extends BaseContainerView - implements View.OnLongClickListener, View.OnClickListener, DragSource{ - + implements View.OnLongClickListener, View.OnClickListener, DragSource { private static final String TAG = "WidgetsContainerView"; - private static final boolean DEBUG = false; + private static final boolean LOGD = false; /* Coefficient multiplied to the screen height for preloading widgets. */ private static final int PRELOAD_SCREEN_HEIGHT_MULTIPLE = 1; @@ -92,13 +91,14 @@ public class WidgetsContainerView extends BaseContainerView mDragController = mLauncher.getDragController(); mAdapter = new WidgetsListAdapter(this, this, mLauncher); mIconCache = (LauncherAppState.getInstance()).getIconCache(); - if (DEBUG) { + if (LOGD) { Log.d(TAG, "WidgetsContainerView constructor"); } } @Override protected void onFinishInflate() { + super.onFinishInflate(); mContent = findViewById(R.id.content); mView = (WidgetsRecyclerView) findViewById(R.id.widgets_list_view); mView.setAdapter(mAdapter); @@ -158,7 +158,7 @@ public class WidgetsContainerView extends BaseContainerView @Override public boolean onLongClick(View v) { - if (DEBUG) { + if (LOGD) { Log.d(TAG, String.format("onLonglick [v=%s]", v)); } // Return early if this is not initiated from a touch @@ -173,7 +173,7 @@ public class WidgetsContainerView extends BaseContainerView if (status && v.getTag() instanceof PendingAddWidgetInfo) { WidgetHostViewLoader hostLoader = new WidgetHostViewLoader(mLauncher, v); boolean preloadStatus = hostLoader.preloadWidget(); - if (DEBUG) { + if (LOGD) { Log.d(TAG, String.format("preloading widget [status=%s]", preloadStatus)); } mLauncher.getDragController().addDragListener(hostLoader); @@ -304,6 +304,9 @@ public class WidgetsContainerView extends BaseContainerView @Override public void onDropCompleted(View target, DragObject d, boolean isFlingToDelete, boolean success) { + if (LOGD) { + Log.d(TAG, "onDropCompleted"); + } if (isFlingToDelete || !success || (target != mLauncher.getWorkspace() && !(target instanceof DeleteDropTarget) && !(target instanceof Folder))) { // Exit spring loaded mode if we have not successfully dropped or have not handled the |