Cleanup

Change-Id: Ied69f285305dbc3e1bf62676f23c47d6c6969e0a

1 files changed, 7 insertions, 16 deletions

diff --git a/src/com/cyanogenmod/trebuchet/Folder.java b/src/com/cyanogenmod/trebuchet/Folder.java
index 465f32cad..d2a9dea1c 100644
--- a/src/com/cyanogenmod/trebuchet/Folder.java
+++ b/src/com/cyanogenmod/trebuchet/Folder.java
@@ -339,8 +339,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
     private void placeInReadingOrder(ArrayList<ShortcutInfo> items) {
         int maxX = 0;
         int count = items.size();
-        for (int i = 0; i < count; i++) {
-            ShortcutInfo item = items.get(i);
+        for (ShortcutInfo item : items) {
             if (item.cellX > maxX) {
                 maxX = item.cellX;
             }
@@ -365,8 +364,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
         setupContentForNumItems(children.size());
         placeInReadingOrder(children);
         int count = 0;
-        for (int i = 0; i < children.size(); i++) {
-            ShortcutInfo child = (ShortcutInfo) children.get(i);
+        for (ShortcutInfo child : children) {
             if (!createAndAddShortcut(child)) {
                 overflow.add(child);
             } else {
@@ -585,11 +583,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
     };
 
     boolean readingOrderGreaterThan(int[] v1, int[] v2) {
-        if (v1[1] > v2[1] || (v1[1] == v2[1] && v1[0] > v2[0])) {
-            return true;
-        } else {
-            return false;
-        }
+        return v1[1] > v2[1] || (v1[1] == v2[1] && v1[0] > v2[0]);
     }
 
     private void realTimeReorder(int[] empty, int[] target) {
@@ -750,11 +744,10 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
 
     private void updateItemLocationsInDatabase() {
         ArrayList<View> list = getItemsInReadingOrder();
-        for (int i = 0; i < list.size(); i++) {
-            View v = list.get(i);
+        for (View v : list) {
             ItemInfo info = (ItemInfo) v.getTag();
             LauncherModel.moveItemInDatabase(mLauncher, info, mInfo.id, 0,
-                        info.cellX, info.cellY);
+                    info.cellX, info.cellY);
         }
     }
 
@@ -902,8 +895,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
         }
         mContent.removeAllViews();
 
-        for (int i = 0; i < list.size(); i++) {
-            View v = list.get(i);
+        for (View v : list) {
             mContent.getVacantCell(vacant, 1, 1);
             CellLayout.LayoutParams lp = (CellLayout.LayoutParams) v.getLayoutParams();
             lp.cellX = vacant[0];
@@ -915,8 +907,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
                 LauncherModel.addOrMoveItemInDatabase(mLauncher, info, mInfo.id, 0,
                         info.cellX, info.cellY);
             }
-            boolean insert = false;
-            mContent.addViewToCellLayout(v, insert ? 0 : -1, (int)info.id, lp, true);
+            mContent.addViewToCellLayout(v, 0, (int) info.id, lp, true);
         }
         mItemsInvalidated = true;
     }