resolved conflicts for merge of 0ad33066 to ub-launcher3-master (2a87fe8c) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/DeviceProfile.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import android.graphics.Paint.FontMetrics;
		import android.graphics.Point;
		import android.graphics.Rect;
		import android.util.DisplayMetrics;
		import android.util.Size;
		import android.view.Gravity;
		import android.view.View;
		import android.view.ViewGroup;
		@@ -385,7 +384,7 @@ public class DeviceProfile {
		final boolean isLayoutRtl = Utilities.isRtl(launcher.getResources());

		// Layout the search bar space
		View searchBar = launcher.getSearchBar();
		View searchBar = launcher.getSearchDropTargetBar();
		lp = (FrameLayout.LayoutParams) searchBar.getLayoutParams();
		if (hasVerticalBarLayout) {
		// Vertical search bar space -- The search bar is fixed in the layout to be on the left

src/com/android/launcher3/DragLayer.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ public class DragLayer extends InsettableFrameLayout {
		}

		private boolean isEventOverDropTargetBar(MotionEvent ev) {
		getDescendantRectRelativeToSelf(mLauncher.getSearchBar(), mHitRect);
		getDescendantRectRelativeToSelf(mLauncher.getSearchDropTargetBar(), mHitRect);
		if (mHitRect.contains((int) ev.getX(), (int) ev.getY())) {
		return true;
		}
		@@ -322,7 +322,7 @@ public class DragLayer extends InsettableFrameLayout {
		childrenForAccessibility.add(currentFolder);

		if (isInAccessibleDrag()) {
		childrenForAccessibility.add(mLauncher.getSearchBar());
		childrenForAccessibility.add(mLauncher.getSearchDropTargetBar());
		}
		} else {
		super.addChildrenForAccessibility(childrenForAccessibility);

src/com/android/launcher3/Folder.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -275,7 +275,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList

		@Override
		public void enableAccessibleDrag(boolean enable) {
		mLauncher.getSearchBar().enableAccessibleDrag(enable);
		mLauncher.getSearchDropTargetBar().enableAccessibleDrag(enable);
		for (int i = 0; i < mContent.getChildCount(); i++) {
		mContent.getPageAt(i).enableAccessibleDrag(enable, CellLayout.FOLDER_ACCESSIBILITY_DRAG);
		}

src/com/android/launcher3/Launcher.java

+19 −32

Original line number	Diff line number	Diff line
		@@ -132,8 +132,7 @@ import java.util.concurrent.atomic.AtomicInteger;
		*/
		public class Launcher extends Activity
		implements View.OnClickListener, OnLongClickListener, LauncherModel.Callbacks,
		View.OnTouchListener, PageSwitchListener, LauncherProviderChangeListener,
		LauncherStateTransitionAnimation.Callbacks {
		View.OnTouchListener, PageSwitchListener, LauncherProviderChangeListener {
		static final String TAG = "Launcher";
		static final boolean LOGD = false;

		@@ -448,7 +447,7 @@ public class Launcher extends Activity

		mDragController = new DragController(this);
		mInflater = getLayoutInflater();
		mStateTransitionAnimation = new LauncherStateTransitionAnimation(this, this);
		mStateTransitionAnimation = new LauncherStateTransitionAnimation(this);

		mStats = new Stats(this);

		@@ -1816,7 +1815,7 @@ public class Launcher extends Activity
		return mOverviewPanel;
		}

		public SearchDropTargetBar getSearchBar() {
		public SearchDropTargetBar getSearchDropTargetBar() {
		return mSearchDropTargetBar;
		}

		@@ -3228,14 +3227,6 @@ public class Launcher extends Activity
		}
		}

		@Override
		public void onStateTransitionHideSearchBar() {
		// Hide the search bar
		if (mSearchDropTargetBar != null) {
		mSearchDropTargetBar.hideSearchBar(false /* animated */);
		}
		}

		public void showWorkspace(boolean animated) {
		showWorkspace(animated, null);
		}
		@@ -3244,16 +3235,9 @@ public class Launcher extends Activity
		boolean changed = mState != State.WORKSPACE \|\|
		mWorkspace.getState() != Workspace.State.NORMAL;
		if (changed) {
		boolean wasInSpringLoadedMode = (mState != State.WORKSPACE);
		mWorkspace.setVisibility(View.VISIBLE);
		mStateTransitionAnimation.startAnimationToWorkspace(mState, Workspace.State.NORMAL,
		animated, onCompleteRunnable);

		// Show the search bar (only animate if we were showing the drop target bar in spring
		// loaded mode)
		if (mSearchDropTargetBar != null) {
		mSearchDropTargetBar.showSearchBar(animated && wasInSpringLoadedMode);
		}
		mStateTransitionAnimation.startAnimationToWorkspace(mState, mWorkspace.getState(),
		Workspace.State.NORMAL, animated, onCompleteRunnable);

		// Set focus to the AppsCustomize button
		if (mAllAppsButton != null) {
		@@ -3277,8 +3261,8 @@ public class Launcher extends Activity

		void showOverviewMode(boolean animated) {
		mWorkspace.setVisibility(View.VISIBLE);
		mStateTransitionAnimation.startAnimationToWorkspace(mState, Workspace.State.OVERVIEW,
		animated, null /* onCompleteRunnable */);
		mStateTransitionAnimation.startAnimationToWorkspace(mState, mWorkspace.getState(),
		Workspace.State.OVERVIEW, animated, null /* onCompleteRunnable */);
		mState = State.WORKSPACE;
		}

		@@ -3331,9 +3315,10 @@ public class Launcher extends Activity
		}

		if (toState == State.APPS) {
		mStateTransitionAnimation.startAnimationToAllApps(animated, focusSearchBar);
		mStateTransitionAnimation.startAnimationToAllApps(mWorkspace.getState(), animated,
		focusSearchBar);
		} else {
		mStateTransitionAnimation.startAnimationToWidgets(animated);
		mStateTransitionAnimation.startAnimationToWidgets(mWorkspace.getState(), animated);
		}

		// Change the state after we've called all the transition code
		@@ -3355,10 +3340,9 @@ public class Launcher extends Activity
		* new state.
		*/
		public Animator startWorkspaceStateChangeAnimation(Workspace.State toState,
		boolean animated, boolean hasOverlaySearchBar, HashMap<View, Integer> layerViews) {
		boolean animated, HashMap<View, Integer> layerViews) {
		Workspace.State fromState = mWorkspace.getState();
		Animator anim = mWorkspace.setStateWithAnimation(
		toState, animated, hasOverlaySearchBar, layerViews);
		Animator anim = mWorkspace.setStateWithAnimation(toState, animated, layerViews);
		updateInteraction(fromState, toState);
		return anim;
		}
		@@ -3382,8 +3366,9 @@ public class Launcher extends Activity
		return;
		}

		mStateTransitionAnimation.startAnimationToWorkspace(mState, Workspace.State.SPRING_LOADED,
		true /* animated /, null / onCompleteRunnable */);
		mStateTransitionAnimation.startAnimationToWorkspace(mState, mWorkspace.getState(),
		Workspace.State.SPRING_LOADED, true /* animated */,
		null /* onCompleteRunnable */);
		mState = isAppsViewVisible() ? State.APPS_SPRING_LOADED : State.WIDGETS_SPRING_LOADED;
		}

		@@ -4480,14 +4465,16 @@ public class Launcher extends Activity
		if (mWorkspace != null) mWorkspace.setAlpha(1f);
		if (mHotseat != null) mHotseat.setAlpha(1f);
		if (mPageIndicators != null) mPageIndicators.setAlpha(1f);
		if (mSearchDropTargetBar != null) mSearchDropTargetBar.showSearchBar(false);
		if (mSearchDropTargetBar != null) mSearchDropTargetBar.animateToState(
		SearchDropTargetBar.State.SEARCH_BAR, 0);
		}

		void hideWorkspaceSearchAndHotseat() {
		if (mWorkspace != null) mWorkspace.setAlpha(0f);
		if (mHotseat != null) mHotseat.setAlpha(0f);
		if (mPageIndicators != null) mPageIndicators.setAlpha(0f);
		if (mSearchDropTargetBar != null) mSearchDropTargetBar.hideSearchBar(false);
		if (mSearchDropTargetBar != null) mSearchDropTargetBar.animateToState(
		SearchDropTargetBar.State.INVISIBLE, 0);
		}

		// TODO: These method should be a part of LauncherSearchCallback

src/com/android/launcher3/LauncherStateTransitionAnimation.java

+130 −90

File changed.

Preview size limit exceeded, changes collapsed.