commit 43f3eae779252b422d31ec046cd7dff4dea3b0f4
author Winson Chung <winsonc@google.com> Fri Feb 14 20:51:26 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:51:26 2014 +0000
tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 6332d95722452ba38903eb6ca8eaafc14f07b8a6
parent 5a0499cee78bdc8b729d715944addc8c9f831228

am 5a0499ce: am 21501c01: am 78186d9b: am 38848ca3: Offsetting the CellLayout by the remainder space to center it. (Bug 11030678)

* commit '5a0499cee78bdc8b729d715944addc8c9f831228':

src/com/android/launcher3/LauncherBackupHelper.java

diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index 9b901ee..e42526d 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -188,7 +188,7 @@
             Log.e(TAG, "launcher backup has failed", e);
         }
 
-        out.key = keys.toArray(BackupProtos.Key.EMPTY_ARRAY);
+        out.key = keys.toArray(BackupProtos.Key.emptyArray());
         writeJournal(newState, out);
         Log.v(TAG, "onBackup: wrote " + out.bytes + "b in " + out.rows + " rows.");
     }
@@ -260,7 +260,7 @@
         // will catch any changes the restore process might have made
         Journal out = new Journal();
         out.t = 0;
-        out.key = mKeys.toArray(BackupProtos.Key.EMPTY_ARRAY);
+        out.key = mKeys.toArray(BackupProtos.Key.emptyArray());
         writeJournal(newState, out);
         Log.v(TAG, "onRestore: read " + mKeys.size() + " rows");
         mKeys.clear();