commit caeba72b506fe926c493663ce2d73f6b8e983a52
author Hyunyoung Song <hyunyoungs@google.com> Thu Apr 30 22:56:08 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 30 22:56:08 2015 +0000
tree e5197912a1c6bb8292a007494028c86c0e0815ea
parent 17d3485757eaa99be96ea71d5f15901211547e62
parent 111c83579a165fe9d8f915cda4e08de47e16c056

am 111c8357: Removes code that is incompatible with google3, Velvet build rules.

* commit '111c83579a165fe9d8f915cda4e08de47e16c056':
  Removes code that is incompatible with google3, Velvet build rules.

src/com/android/launcher3/FolderInfo.java

diff --git a/src/com/android/launcher3/FolderInfo.java b/src/com/android/launcher3/FolderInfo.java
index 69b2ae7..80b1564 100644
--- a/src/com/android/launcher3/FolderInfo.java
+++ b/src/com/android/launcher3/FolderInfo.java
@@ -33,7 +33,6 @@
 
     /**
      * The folder is locked in sorted mode
-     * @deprecated
      */
     public static final int FLAG_ITEMS_SORTED = 0x00000001;
 

src/com/android/launcher3/widget/WidgetsListAdapter.java

diff --git a/src/com/android/launcher3/widget/WidgetsListAdapter.java b/src/com/android/launcher3/widget/WidgetsListAdapter.java
index 051a3ab..a7728a1 100644
--- a/src/com/android/launcher3/widget/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/WidgetsListAdapter.java
@@ -161,10 +161,6 @@
 
     @Override
     public void onViewRecycled(WidgetsRowViewHolder holder) {
-        if (DEBUG) {
-            Log.v(TAG, String.format("onViewDetachedFromWindow, [pos=%d]",
-                    holder.getAdapterPosition()));
-        }
         ViewGroup row = ((ViewGroup) holder.getContent().findViewById(R.id.widgets_cell_list));
 
         for (int i = 0; i < row.getChildCount(); i++) {