diff options
| author | Winson Chung <winsonc@google.com> | 2013-08-26 22:08:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-26 22:08:09 +0000 |
| commit | 6c15a644cb72df32edb62489f272c4aefe711e8a (patch) | |
| tree | e3b7b40300ff757ad23c1b2f621d06d191b4414a /src/com/android/launcher3/Launcher.java | |
| parent | cc07e7a9c6e383f35a8de717be71201f666b01a8 (diff) | |
| parent | 892c74d460ad98c6306420e1127c9aa3e505ba25 (diff) | |
| download | android_packages_apps_Trebuchet-6c15a644cb72df32edb62489f272c4aefe711e8a.tar.gz android_packages_apps_Trebuchet-6c15a644cb72df32edb62489f272c4aefe711e8a.tar.bz2 android_packages_apps_Trebuchet-6c15a644cb72df32edb62489f272c4aefe711e8a.zip | |
Merge "Fixing folders to always show in view, removing old assets and references to LauncherModel count." into jb-ub-gel-agar
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 70727c9c0..8240356a8 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -68,6 +68,7 @@ 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.view.Display; import android.view.Gravity; @@ -377,11 +378,14 @@ public class Launcher extends Activity Display display = getWindowManager().getDefaultDisplay(); display.getCurrentSizeRange(smallestSize, largestSize); display.getRealSize(realSize); + DisplayMetrics dm = new DisplayMetrics(); + display.getMetrics(dm); // Lazy-initialize the dynamic grid DeviceProfile grid = app.initDynamicGrid(this, Math.min(smallestSize.x, smallestSize.y), Math.min(largestSize.x, largestSize.y), - realSize.x, realSize.y); + realSize.x, realSize.y, + dm.widthPixels, dm.heightPixels); // the LauncherApplication should call this, but in case of Instrumentation it might not be present yet mSharedPrefs = getSharedPreferences(LauncherAppState.getSharedPreferencesKey(), |