diff options
author | Raj Yengisetty <rajesh@cyngn.com> | 2014-11-10 10:35:01 -0800 |
---|---|---|
committer | Adnan <adnan@cyngn.com> | 2014-11-19 15:53:57 -0800 |
commit | ec033982ef151a1e226ce452f64518879bd5a696 (patch) | |
tree | 89386ed54a7c65946afdf31abb9a98f3fb2549b6 /src/com/android/launcher3/TransitionEffectsFragment.java | |
parent | ae6b7551e4c92fa942b11788f401842aedc24d91 (diff) | |
download | android_packages_apps_Trebuchet-ec033982ef151a1e226ce452f64518879bd5a696.tar.gz android_packages_apps_Trebuchet-ec033982ef151a1e226ce452f64518879bd5a696.tar.bz2 android_packages_apps_Trebuchet-ec033982ef151a1e226ce452f64518879bd5a696.zip |
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
Diffstat (limited to 'src/com/android/launcher3/TransitionEffectsFragment.java')
-rw-r--r-- | src/com/android/launcher3/TransitionEffectsFragment.java | 32 |
1 files changed, 20 insertions, 12 deletions
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) { |