diff options
| author | Raj Yengisetty <rajesh@cyngn.com> | 2014-09-09 22:26:43 -0700 |
|---|---|---|
| committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2014-09-11 00:09:55 +0000 |
| commit | 97fcaba272915d3c9399337363c16433d0fe4b3a (patch) | |
| tree | d01f33b333ab4c58138a1adc083a38d6645f9572 /src/com/android/launcher3/Launcher.java | |
| parent | 41af711d1355ae8c08aff9a2e367c7a0893fd110 (diff) | |
| download | android_packages_apps_Trebuchet-97fcaba272915d3c9399337363c16433d0fe4b3a.tar.gz android_packages_apps_Trebuchet-97fcaba272915d3c9399337363c16433d0fe4b3a.tar.bz2 android_packages_apps_Trebuchet-97fcaba272915d3c9399337363c16433d0fe4b3a.zip | |
Re-add Fade side pages and Page outline options.
Change-Id: Iaab1dbd980d065e631d8f3cfe363f3a0b5897f86
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 2ddb5271c..17ddb7e7e 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1450,7 +1450,7 @@ public class Launcher extends Activity anim.addListener(mAnimatorListener); } - public void onClickTransitionEffectOverflowMenuButton(View v) { + public void onClickTransitionEffectOverflowMenuButton(View v, final boolean drawer) { final PopupMenu popupMenu = new PopupMenu(this, v); final Menu menu = popupMenu.getMenu(); @@ -1458,22 +1458,22 @@ public class Launcher extends Activity MenuItem pageOutlines = menu.findItem(R.id.scrolling_page_outlines); MenuItem fadeAdjacent = menu.findItem(R.id.scrolling_fade_adjacent); - pageOutlines.setVisible(!isAllAppsVisible()); + pageOutlines.setVisible(!drawer); pageOutlines.setChecked(SettingsProvider.getBoolean(this, SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_PAGE_OUTLINES, R.bool.preferences_interface_homescreen_scrolling_page_outlines_default )); fadeAdjacent.setChecked(SettingsProvider.getBoolean(this, - !isAllAppsVisible() ? + !drawer ? SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_FADE_ADJACENT : SettingsProvider.SETTINGS_UI_DRAWER_SCROLLING_FADE_ADJACENT, - !isAllAppsVisible() ? + !drawer ? R.bool.preferences_interface_homescreen_scrolling_fade_adjacent_default : R.bool.preferences_interface_drawer_scrolling_fade_adjacent_default )); - final PagedView pagedView = !isAllAppsVisible() ? mWorkspace : mAppsCustomizeContent; + final PagedView pagedView = !drawer ? mWorkspace : mAppsCustomizeContent; popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { @Override @@ -1486,7 +1486,7 @@ public class Launcher extends Activity break; case R.id.scrolling_fade_adjacent: SettingsProvider.get(Launcher.this).edit() - .putBoolean(!isAllAppsVisible() ? + .putBoolean(!drawer ? SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_FADE_ADJACENT : SettingsProvider.SETTINGS_UI_DRAWER_SCROLLING_FADE_ADJACENT, !item.isChecked()).commit(); pagedView.setFadeInAdjacentScreens(!item.isChecked()); |