diff options
author | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2014-06-23 21:23:40 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-06-23 21:23:40 +0000 |
commit | 2f8b1730e98969459458baa32b5d50c67b2dc4bb (patch) | |
tree | ac7631dcab888b26796a6703cdcccb0d962fdf19 /src/com/android/launcher3/Launcher.java | |
parent | 07856ffe95a4332534adf7bc7cf06f512816b9f8 (diff) | |
parent | a5ee6730d45a4c5f6ccbce4d6332881f5f15d9b6 (diff) | |
download | android_packages_apps_Trebuchet-2f8b1730e98969459458baa32b5d50c67b2dc4bb.tar.gz android_packages_apps_Trebuchet-2f8b1730e98969459458baa32b5d50c67b2dc4bb.tar.bz2 android_packages_apps_Trebuchet-2f8b1730e98969459458baa32b5d50c67b2dc4bb.zip |
Merge "Customizeable Dynamic Grid:" into cm-11.0
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 49 |
1 files changed, 43 insertions, 6 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index a8f24ef38..a911e7a63 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -259,6 +259,7 @@ public class Launcher extends Activity private View mWeightWatcher; private TransitionEffectsFragment mTransitionEffectsFragment; + private DynamicGridSizeFragment mDynamicGridSizeFragment; private LauncherClings mLauncherClings; protected HiddenFolderFragment mHiddenFolderFragment; @@ -1160,6 +1161,12 @@ public class Launcher extends Activity if (f != null) { mTransitionEffectsFragment.setEffect(); } + f = getFragmentManager().findFragmentByTag( + DynamicGridSizeFragment.DYNAMIC_GRID_SIZE_FRAGMENT); + if (f != null) { + mDynamicGridSizeFragment.setSize(); + mWorkspace.hideOutlines(); + } Fragment f1 = getFragmentManager().findFragmentByTag( HiddenFolderFragment.HIDDEN_FOLDER_FRAGMENT); if (f1 != null && !mHiddenFolderAuth) { @@ -1271,6 +1278,38 @@ public class Launcher extends Activity popupMenu.show(); } + public void onClickDynamicGridSizeButton() { + FragmentManager fragmentManager = getFragmentManager(); + FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); + + mDynamicGridSizeFragment = new DynamicGridSizeFragment(); + fragmentTransaction.replace(R.id.launcher, mDynamicGridSizeFragment, + DynamicGridSizeFragment.DYNAMIC_GRID_SIZE_FRAGMENT); + fragmentTransaction.commit(); + } + + public void setDynamicGridSize(DeviceProfile.GridSize size) { + SettingsProvider.putInt(this, + SettingsProvider.SETTINGS_UI_DYNAMIC_GRID_SIZE, size.getValue()); + + updateDynamicGrid(); + + mOverviewSettingsPanel.notifyDataSetInvalidated(); + + FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); + fragmentTransaction + .setCustomAnimations(0, R.anim.exit_out_right); + fragmentTransaction + .remove(mDynamicGridSizeFragment).commit(); + + mDarkPanel.setVisibility(View.VISIBLE); + ObjectAnimator anim = ObjectAnimator.ofFloat( + mDarkPanel, "alpha", 0.3f, 0.0f); + anim.start(); + anim.addListener(mAnimatorListener); + + } + public void onClickTransitionEffectButton(View v, final boolean pageOrDrawer) { Bundle bundle = new Bundle(); bundle.putBoolean(TransitionEffectsFragment.PAGE_OR_DRAWER_SCROLL_SELECT, @@ -1278,7 +1317,6 @@ public class Launcher extends Activity FragmentManager fragmentManager = getFragmentManager(); FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); - mTransitionEffectsFragment = new TransitionEffectsFragment(); mTransitionEffectsFragment.setArguments(bundle); fragmentTransaction.setCustomAnimations(0, 0); @@ -1300,11 +1338,6 @@ public class Launcher extends Activity newTransitionEffect).commit(); TransitionEffect.setFromString(pagedView, newTransitionEffect); - // Reset Settings Changed - SharedPreferences.Editor editor = mSharedPrefs.edit(); - editor.putBoolean(SettingsProvider.SETTINGS_CHANGED, false); - editor.commit(); - mOverviewSettingsPanel.notifyDataSetInvalidated(); FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); @@ -2629,8 +2662,12 @@ public class Launcher extends Activity } else if (mWorkspace.isInOverviewMode()) { Fragment f = getFragmentManager().findFragmentByTag( TransitionEffectsFragment.TRANSITION_EFFECTS_FRAGMENT); + Fragment f2 = getFragmentManager().findFragmentByTag( + DynamicGridSizeFragment.DYNAMIC_GRID_SIZE_FRAGMENT); if (f != null) { mTransitionEffectsFragment.setEffect(); + } else if (f2 != null) { + mDynamicGridSizeFragment.setSize(); } else { mWorkspace.exitOverviewMode(true); } |