diff options
author | Stephen Bird <sbird@cyngn.com> | 2015-05-21 11:00:44 -0700 |
---|---|---|
committer | Stephen Bird <sbird@cyngn.com> | 2015-06-05 01:07:05 +0000 |
commit | 416bb9198c56dec89e8d01cff3824d80094388a5 (patch) | |
tree | 9c16c994912ffefebe5f5e63d483b0e37669f1b1 /src/com/android/launcher3/Launcher.java | |
parent | 288ca2e698c935bfb3024341ca9709eaa8435877 (diff) | |
download | packages_apps_Trebuchet-416bb9198c56dec89e8d01cff3824d80094388a5.tar.gz packages_apps_Trebuchet-416bb9198c56dec89e8d01cff3824d80094388a5.tar.bz2 packages_apps_Trebuchet-416bb9198c56dec89e8d01cff3824d80094388a5.zip |
Move icons to fit within Dynamic grid upon resize.
If the dynamic grid is made smaller, currently icons will simply be
hidden from view. Instead, create extra screens and squeeze the icons in
so that they will all be visible upon resize.
In some cases, icons can end up creating screens when it's not necessary
we should revisit this at a later time and look into making these icons
show up in a more expected place.
Change-Id: I9a46f1ac45c1a04e252ed8943afcfe952df1392d
(cherry picked from commit e25ab7bd9525d7a2c67eb8a6d8e88d54940dba58)
(cherry picked from commit 641637f927e833cc2b50064d001aafd77de16508)
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 167251af8..a618150f0 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -472,7 +472,7 @@ public class Launcher extends Activity super.onCreate(savedInstanceState); - initializeDynamicGrid(); + initializeDynamicGrid(false); mHideIconLabels = SettingsProvider.getBoolean(this, SettingsProvider.SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS, R.bool.preferences_interface_homescreen_hide_icon_labels_default); @@ -557,8 +557,10 @@ public class Launcher extends Activity @Override public void onLauncherProviderChange() { } - private void initializeDynamicGrid() { - LauncherAppState.setApplicationContext(getApplicationContext()); + private void initializeDynamicGrid(boolean updateGrid) { + if (!updateGrid) { + LauncherAppState.setApplicationContext(getApplicationContext()); + } LauncherAppState app = LauncherAppState.getInstance(); mHideIconLabels = SettingsProvider.getBoolean(this, @@ -5021,6 +5023,9 @@ public class Launcher extends Activity PackageInstallerCompat.getInstance(this).onFinishBind(); mModel.recheckRestoredItems(this); mWorkspace.stripEmptyScreens(); + if (mWorkspace.isInOverviewMode()) { + mWorkspace.resetOverviewMode(); + } } private void sendLoadingCompleteBroadcastIfNecessary() { @@ -5655,7 +5660,7 @@ public class Launcher extends Activity public void updateDynamicGrid(int page) { mSearchDropTargetBar.setupQSB(Launcher.this); - initializeDynamicGrid(); + initializeDynamicGrid(true); mGrid.layout(Launcher.this); |