diff options
author | Brint E. Kriebel <bekit@cyngn.com> | 2014-10-01 00:05:19 -0700 |
---|---|---|
committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-10-01 00:05:19 -0700 |
commit | 4e90e2adf167eaa7bfba5d609ed5524832f09f79 (patch) | |
tree | 166a7e71912bb31e642400de669b44f7d4ac1543 /src | |
parent | 21df17fb62e8499c43018eb239d9cfef85bac51a (diff) | |
parent | c1277923cb0bbac372960dd5db0fc7516aa31c66 (diff) | |
download | android_packages_apps_Trebuchet-4e90e2adf167eaa7bfba5d609ed5524832f09f79.tar.gz android_packages_apps_Trebuchet-4e90e2adf167eaa7bfba5d609ed5524832f09f79.tar.bz2 android_packages_apps_Trebuchet-4e90e2adf167eaa7bfba5d609ed5524832f09f79.zip |
Merge branch 'cm-11.0' into stable/cm-11.0
Diffstat (limited to 'src')
4 files changed, 33 insertions, 29 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 2223a5c1e..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()); @@ -3474,9 +3474,6 @@ public class Launcher extends Activity setPivotsForZoom(toView, scale); - // Shrink workspaces away if going to AppsCustomize from workspace - Animator workspaceAnim = - mWorkspace.getChangeStateAnimation(Workspace.State.SMALL, animated); if (!LauncherAppState.isDisableAllApps() || contentType == AppsCustomizePagedView.ContentType.Widgets) { // Set the content type for the all apps/widgets space @@ -3538,15 +3535,19 @@ public class Launcher extends Activity } }); + dispatchOnLauncherTransitionPrepare(fromView, animated, false); + dispatchOnLauncherTransitionPrepare(toView, animated, false); + + // Shrink workspaces away if going to AppsCustomize from workspace + Animator workspaceAnim = + mWorkspace.getChangeStateAnimation(Workspace.State.SMALL, animated); + if (workspaceAnim != null) { mStateAnimation.play(workspaceAnim); } boolean delayAnim = false; - dispatchOnLauncherTransitionPrepare(fromView, animated, false); - dispatchOnLauncherTransitionPrepare(toView, animated, false); - // If any of the objects being animated haven't been measured/laid out // yet, delay the animation until we get a layout pass if ((((LauncherTransitionable) toView).getContent().getMeasuredWidth() == 0) || diff --git a/src/com/android/launcher3/TransitionEffectsFragment.java b/src/com/android/launcher3/TransitionEffectsFragment.java index bb7c5abf2..8f51e2435 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; @@ -24,7 +18,6 @@ import android.widget.FrameLayout; 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; @@ -78,19 +71,19 @@ public class TransitionEffectsFragment extends Fragment { View v = inflater.inflate(R.layout.settings_transitions_screen, container, false); mListView = (ListView) v.findViewById(R.id.settings_transitions_list); - Launcher launcher = (Launcher) getActivity(); + 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); @@ -103,6 +96,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); @@ -124,7 +124,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/Workspace.java b/src/com/android/launcher3/Workspace.java index c6c320df0..e935c99af 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -437,8 +437,6 @@ public class Workspace extends SmoothPagedView InstallShortcutReceiver.disableAndFlushInstallQueue(getContext()); UninstallShortcutReceiver.disableAndFlushUninstallQueue(getContext()); - removeExtraEmptyScreen(false, null); - mDragSourceInternal = null; mLauncher.onInteractionEnd(); } @@ -4336,6 +4334,11 @@ public class Workspace extends SmoothPagedView && mDragInfo.cell != null) { mDragInfo.cell.setVisibility(VISIBLE); } + + if (target instanceof InfoDropTarget) { + removeExtraEmptyScreen(false, null); + } + mDragOutline = null; mDragInfo = null; } diff --git a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java index b09d1d716..35949e049 100644 --- a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java +++ b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java @@ -312,7 +312,7 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter { mLauncher.onClickTransitionEffectButton(v, true); break; case 1: - onClickTransitionEffectButton(); + onClickSortButton(); break; case 2: onIconLabelsBooleanChanged(v, @@ -380,7 +380,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); |