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

3 files changed, 28 insertions, 20 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());
diff --git a/src/com/android/launcher3/TransitionEffectsFragment.java b/src/com/android/launcher3/TransitionEffectsFragment.java
index 88c6481d7..6340d9d2e 100644
--- a/src/com/android/launcher3/TransitionEffectsFragment.java
+++ b/src/com/android/launcher3/TransitionEffectsFragment.java
@@ -2,19 +2,13 @@ package com.android.launcher3;
 
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
-import android.animation.ValueAnimator;
 import android.app.Fragment;
 import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
 import android.content.res.TypedArray;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.drawable.AnimationDrawable;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -23,7 +17,6 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
-import android.widget.ScrollView;
 import android.widget.TextView;
 import com.android.launcher3.settings.SettingsProvider;
 
@@ -40,7 +33,7 @@ public class TransitionEffectsFragment extends Fragment {
     TypedArray mTransitionDrawables;
     String mCurrentState;
     int mCurrentPosition;
-    boolean mPageOrDrawer;
+    boolean mIsDrawer;
     String mSettingsProviderValue;
     int mPreferenceValue;
 
@@ -76,13 +69,21 @@ public class TransitionEffectsFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.settings_transitions_screen, container, false);
+        mListView = (ListView) v.findViewById(R.id.settings_transitions_list);
+
+        final Launcher launcher = (Launcher) getActivity();
+        LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams)
+                mListView.getLayoutParams();
+        lp.bottomMargin = ((FrameLayout.LayoutParams) launcher.getOverviewPanel()
+                .findViewById(R.id.settings_container).getLayoutParams()).bottomMargin;
+        mListView.setLayoutParams(lp);
 
-        mPageOrDrawer = getArguments().getBoolean(PAGE_OR_DRAWER_SCROLL_SELECT);
+        mIsDrawer = getArguments().getBoolean(PAGE_OR_DRAWER_SCROLL_SELECT);
 
-        mSettingsProviderValue = mPageOrDrawer ?
+        mSettingsProviderValue = mIsDrawer ?
                 SettingsProvider.SETTINGS_UI_DRAWER_SCROLLING_TRANSITION_EFFECT
                 : SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_TRANSITION_EFFECT;
-        mPreferenceValue = mPageOrDrawer ? R.string.preferences_interface_drawer_scrolling_transition_effect
+        mPreferenceValue = mIsDrawer ? R.string.preferences_interface_drawer_scrolling_transition_effect
                 : R.string.preferences_interface_homescreen_scrolling_transition_effect;
 
         mTransitionIcon = (ImageView) v.findViewById(R.id.settings_transition_image);
@@ -97,6 +98,13 @@ public class TransitionEffectsFragment extends Fragment {
                 setEffect();
             }
         });
+        View options = v.findViewById(R.id.transition_options_menu);
+        options.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                launcher.onClickTransitionEffectOverflowMenuButton(view, mIsDrawer);
+            }
+        });
 
         String[] titles = getResources().getStringArray(
                 R.array.transition_effect_entries);
@@ -118,7 +126,7 @@ public class TransitionEffectsFragment extends Fragment {
     }
 
     public void setEffect() {
-        ((Launcher) getActivity()).setTransitionEffect(mPageOrDrawer, mCurrentState);
+        ((Launcher) getActivity()).setTransitionEffect(mIsDrawer, mCurrentState);
     }
 
     private int mapEffectToPosition(String effect) {
diff --git a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
index 8399db6dd..5fcba7a4f 100644
--- a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
+++ b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
@@ -283,7 +283,7 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                             mLauncher.onClickTransitionEffectButton(v, true);
                             break;
                         case 1:
-                            onClickTransitionEffectButton();
+                            onClickSortButton();
                             break;
                         case 2:
                             onIconLabelsBooleanChanged(v,
@@ -351,7 +351,7 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
         ((TextView) v.findViewById(R.id.item_state)).setText(state);
     }
 
-    private void onClickTransitionEffectButton() {
+    private void onClickSortButton() {
         int sort = SettingsProvider.getIntCustomDefault(mLauncher,
                 SettingsProvider.SETTINGS_UI_DRAWER_SORT_MODE, 0);