diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2014-10-16 09:24:19 -0700 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2015-09-27 18:55:56 -0700 |
commit | 8d43f06829523a920904c958e6545648b0b0c200 (patch) | |
tree | 642c551460c3ef832525a71069ceb7d0e3ce90d1 /src/com/android/launcher3/Launcher.java | |
parent | 78e301e3cf00d6f57ec1d131979a47294d3b3668 (diff) | |
download | android_packages_apps_Trebuchet-8d43f06829523a920904c958e6545648b0b0c200.tar.gz android_packages_apps_Trebuchet-8d43f06829523a920904c958e6545648b0b0c200.tar.bz2 android_packages_apps_Trebuchet-8d43f06829523a920904c958e6545648b0b0c200.zip |
Updating backup restore logic
> Adding DeviceProfile information in the backup
> Removing SharedPreference backup
> Adding helper methods to abort backup in the middle
> Comparing keys against the backup journal during restore
to avoid restoring corrupt/lost entries
> Old backups are still compatible, but lost keys verification
will be ignored in that case.
Bug: 17937935
Bug: 17951775
Bug: 17260941
Change-Id: Iad48646cfdd69abaff5c163b2055f3b8a9b39b19
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index e47242271..75131cbdb 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -59,7 +59,6 @@ import android.database.ContentObserver; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Color; -import android.graphics.Point; import android.graphics.PorterDuff; import android.graphics.Rect; import android.graphics.drawable.ColorDrawable; @@ -82,7 +81,6 @@ import android.text.Selection; import android.text.SpannableStringBuilder; import android.text.TextUtils; import android.text.method.TextKeyListener; -import android.util.DisplayMetrics; import android.util.Log; import android.util.Pair; import android.view.Display; @@ -636,21 +634,8 @@ public class Launcher extends Activity SettingsProvider.SETTINGS_UI_DRAWER_TYPE, R.integer.preferences_interface_drawer_type_default)); - // Determine the dynamic grid properties - Point smallestSize = new Point(); - Point largestSize = new Point(); - Point realSize = new Point(); - Display display = getWindowManager().getDefaultDisplay(); - display.getCurrentSizeRange(smallestSize, largestSize); - display.getRealSize(realSize); - DisplayMetrics dm = new DisplayMetrics(); - display.getMetrics(dm); // Lazy-initialize the dynamic grid - mGrid = app.initDynamicGrid(this, - Math.min(smallestSize.x, smallestSize.y), - Math.min(largestSize.x, largestSize.y), - realSize.x, realSize.y, - dm.widthPixels, dm.heightPixels); + mGrid = app.initDynamicGrid(this); mModel = app.setLauncher(this); mIconCache = app.getIconCache(); |