Re-add Fade side pages and Page outline options.

Conflicts:
	res/layout/settings_transitions_screen.xml
	src/com/android/launcher3/TransitionEffectsFragment.java

Change-Id: Iaab1dbd980d065e631d8f3cfe363f3a0b5897f86

1 files changed, 6 insertions, 6 deletions

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 34a4533a0..15874a058 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1332,7 +1332,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();
@@ -1340,22 +1340,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
@@ -1368,7 +1368,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());