PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unifying the workspace translation logic

Browse Source 
Change-Id: I82430734c222d43222763fc6edcadac33dc3e076
This commit is contained in:
Sunny Goyal
2016-06-09 12:08:22 -07:00
parent 05e4ba0d57
commit a92e0dfa0c
2 changed files with 55 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Workspace.java
+40 -12
View File
@@ -45,6 +45,7 @@ import android.os.IBinder;
import android.os.Parcelable;
import android.util.AttributeSet;
import android.util.Log;
import android.util.Property;
import android.util.SparseArray;
import android.view.MotionEvent;
import android.view.View;
@@ -1386,18 +1387,52 @@ public class Workspace extends PagedView
// TODO(adamcohen): figure out a final effect here. We may need to recommend
// different effects based on device performance. On at least one relatively high-end
// device I've tried, translating the launcher causes things to get quite laggy.
setTranslationAndAlpha(getPageIndicator(), transX, alpha);
setTranslationAndAlpha(getChildAt(getCurrentPage()), transX, alpha);
setTranslationAndAlpha(mLauncher.getHotseat(), transX, alpha);
setWorkspaceTranslation(TRANSLATION_X, transX, alpha);
setHotseatTranslation(TRANSLATION_X, transX, alpha);
}
/**
* Moves the workspace UI in the provided direction.
* @param direction either {@link #TRANSLATION_X} or {@link #TRANSLATION_Y}
* @param translation the amound of shift.
* @param alpha the alpha for the workspace page
*/
public void setWorkspaceTranslation(
Property<View, Float> direction, float translation, float alpha) {
View currentChild = getChildAt(getCurrentPage());
if (currentChild != null) {
direction.set(currentChild, translation);
currentChild.setAlpha(alpha);
}
// When the animation finishes, reset all pages, just in case we missed a page.
if (transX == 0) {
if (Float.compare(translation, 0) == 0) {
for (int i = getChildCount() - 1; i >= 0; i--) {
setTranslationAndAlpha(getChildAt(i), 0, alpha);
View child = getChildAt(i);
direction.set(child, translation);
child.setAlpha(alpha);
}
}
}
/**
* Moves the Hotseat UI in the provided direction.
* @param direction either {@link #TRANSLATION_X} or {@link #TRANSLATION_Y}
* @param translation the amound of shift.
* @param alpha the alpha for the hotseat page
*/
public void setHotseatTranslation(
Property<View, Float> direction, float translation, float alpha) {
View pageIndicator = getPageIndicator();
if (pageIndicator != null) {
direction.set(pageIndicator, translation);
pageIndicator.setAlpha(alpha);
}
direction.set(mLauncher.getHotseat(), translation);
mLauncher.getHotseat().setAlpha(alpha);
}
@Override
protected Matrix getPageShiftMatrix() {
if (Float.compare(mOverlayTranslation, 0) != 0) {
@@ -1410,13 +1445,6 @@ public class Workspace extends PagedView
return super.getPageShiftMatrix();
}
private void setTranslationAndAlpha(View v, float transX, float alpha) {
if (v != null) {
v.setTranslationX(transX);
v.setAlpha(alpha);
}
}
@Override
protected void getEdgeVerticalPostion(int[] pos) {
View child = getChildAt(getPageCount() - 1);