Click on icons.
diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java
index d8ac50b..b9ec2cf 100644
--- a/src/com/android/launcher2/AllAppsView.java
+++ b/src/com/android/launcher2/AllAppsView.java
@@ -39,6 +39,7 @@
import android.database.DataSetObserver;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
+import android.graphics.BlurMaskFilter;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.drawable.BitmapDrawable;
@@ -53,37 +54,61 @@
import android.view.Surface;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
+import android.view.View;
import android.view.VelocityTracker;
import android.view.ViewConfiguration;
import android.graphics.PixelFormat;
-public class AllAppsView extends RSSurfaceView {
+public class AllAppsView extends RSSurfaceView
+ implements View.OnClickListener, View.OnLongClickListener {
private static final String TAG = "Launcher.AllAppsView";
+ private Launcher mLauncher;
+
private RenderScript mRS;
private RolloRS mRollo;
private ArrayList<ApplicationInfo> mAllAppsList;
private ViewConfiguration mConfig;
private int mPageCount;
+ private boolean mStartedScrolling;
private VelocityTracker mVelocity;
private int mLastScrollX;
private int mLastMotionX;
- private ApplicationsAdapter mAdapter;
private TouchHandler mTouchHandler;
private int mScrollHandleTop;
- class Defines {
+ static class Defines {
+ private static float farSize(float sizeAt0) {
+ return sizeAt0 * (Defines.RADIUS - Defines.CAMERA_Z) / -Defines.CAMERA_Z;
+ }
+
public static final int ALLOC_PARAMS = 0;
public static final int ALLOC_STATE = 1;
- public static final int ALLOC_SCRATCH = 2;
- public static final int ALLOC_ICON_IDS = 3;
- public static final int ALLOC_LABEL_IDS = 4;
+ public static final int ALLOC_ICON_IDS = 2;
+ public static final int ALLOC_LABEL_IDS = 3;
+ public static final int ALLOC_X_BORDERS = 4;
+ public static final int ALLOC_Y_BORDERS = 5;
public static final int COLUMNS_PER_PAGE = 4;
public static final int ROWS_PER_PAGE = 4;
+ public static final float RADIUS = 4.0f;
+
+ public static final int SCREEN_WIDTH_PX = 480;
+ public static final int SCREEN_HEIGHT_PX = 854;
+
+ public static final int ICON_WIDTH_PX = 64;
+ public static final int ICON_TEXTURE_WIDTH_PX = 128;
+
+ public static final int ICON_HEIGHT_PX = 64;
+ public static final int ICON_TEXTURE_HEIGHT_PX = 128;
+ public static final float ICON_TOP_OFFSET = 0.2f;
+
+ public static final float CAMERA_Z = -2;
+ public static final float FAR_ICON_SIZE
+ = farSize(2 * ICON_WIDTH_PX / (float)SCREEN_WIDTH_PX);
}
public AllAppsView(Context context, AttributeSet attrs) {
@@ -91,36 +116,38 @@
setFocusable(true);
getHolder().setFormat(PixelFormat.TRANSLUCENT);
mConfig = ViewConfiguration.get(context);
+ setOnClickListener(this);
+ setOnLongClickListener(this);
}
public AllAppsView(Context context, AttributeSet attrs, int defStyle) {
this(context, attrs);
}
- void setAdapter(ApplicationsAdapter adapter) {
- if (mAdapter != null) {
- mAdapter.unregisterDataSetObserver(mIconObserver);
- }
- mAdapter = adapter;
- if (adapter != null) {
- adapter.registerDataSetObserver(mIconObserver);
- }
+ public void setLauncher(Launcher launcher) {
+ mLauncher = launcher;
}
@Override
public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
super.surfaceChanged(holder, format, w, h);
+ long startTime = SystemClock.uptimeMillis();
+
mRS = createRenderScript(true);
mRollo = new RolloRS();
mRollo.init(getResources(), w, h);
if (mAllAppsList != null) {
mRollo.setApps(mAllAppsList);
+ Log.d(TAG, "surfaceChanged... calling mRollo.setApps");
}
Resources res = getContext().getResources();
int barHeight = (int)res.getDimension(R.dimen.button_bar_height);
mScrollHandleTop = h - barHeight;
+
+ long endTime = SystemClock.uptimeMillis();
+ Log.d(TAG, "surfaceChanged took " + (endTime-startTime) + "ms");
}
@Override
@@ -133,6 +160,8 @@
@Override
public boolean onTouchEvent(MotionEvent ev)
{
+ super.onTouchEvent(ev);
+
mTouchHandler = mFlingHandler;
/*
int action = ev.getAction();
@@ -144,7 +173,9 @@
}
}
*/
- return mTouchHandler.onTouchEvent(ev);
+ mTouchHandler.onTouchEvent(ev);
+
+ return true;
}
private abstract class TouchHandler {
@@ -161,22 +192,38 @@
case MotionEvent.ACTION_DOWN:
mLastMotionX = x;
mRollo.mState.read();
- mRollo.mState.scrollX = mLastScrollX = mRollo.mState.currentScrollX;
+ mRollo.mState.startScrollX = mRollo.mState.scrollX = mLastScrollX
+ = mRollo.mState.currentScrollX;
+ if (mRollo.mState.flingVelocityX != 0) {
+ mRollo.clearSelectedIcon();
+ } else {
+ mRollo.selectIcon(x, (int)ev.getY(), mRollo.mState.startScrollX,
+ (-mRollo.mState.startScrollX / Defines.SCREEN_WIDTH_PX));
+ }
mRollo.mState.flingVelocityX = 0;
mRollo.mState.adjustedDeceleration = 0;
mRollo.mState.save();
mVelocity = VelocityTracker.obtain();
mVelocity.addMovement(ev);
+ mStartedScrolling = false;
break;
case MotionEvent.ACTION_MOVE:
case MotionEvent.ACTION_OUTSIDE:
- deltaX = x - mLastMotionX;
- mVelocity.addMovement(ev);
- mRollo.mState.currentScrollX = mLastScrollX;
- mLastScrollX += deltaX;
- mRollo.mState.scrollX = mLastScrollX;
- mRollo.mState.save();
- mLastMotionX = x;
+ int slop = Math.abs(x - mLastMotionX);
+ if (!mStartedScrolling && slop < mConfig.getScaledTouchSlop()) {
+ // don't update mLastMotionX so slop is right and when we do start scrolling
+ // below, we get the right delta.
+ } else {
+ mStartedScrolling = true;
+ mRollo.clearSelectedIcon();
+ deltaX = x - mLastMotionX;
+ mVelocity.addMovement(ev);
+ mRollo.mState.currentScrollX = mLastScrollX;
+ mLastScrollX += deltaX;
+ mRollo.mState.scrollX = mLastScrollX;
+ mRollo.mState.save();
+ mLastMotionX = x;
+ }
break;
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL:
@@ -184,6 +231,7 @@
mConfig.getScaledMaximumFlingVelocity());
mRollo.mState.flingTimeMs = (int)SystemClock.uptimeMillis(); // TODO: use long
mRollo.mState.flingVelocityX = (int)mVelocity.getXVelocity();
+ mRollo.clearSelectedIcon();
mRollo.mState.save();
mLastMotionX = -10000;
mVelocity.recycle();
@@ -194,6 +242,20 @@
}
};
+ public void onClick(View v) {
+ int index = mRollo.mState.selectedIconIndex;
+ if (mRollo.mState.flingVelocityX == 0 && index >= 0 && index < mAllAppsList.size()) {
+ ApplicationInfo app = mAllAppsList.get(index);
+ mLauncher.startActivitySafely(app.intent);
+ }
+ }
+
+ public boolean onLongClick(View v) {
+ Log.d(TAG, "long click! velocity=" + mRollo.mState.flingVelocityX + " index="
+ + mRollo.mState.selectedIconIndex);
+ return true;
+ }
+
/*
private TouchHandler mScrollHandler = new TouchHandler() {
@Override
@@ -229,18 +291,17 @@
return true;
}
- DataSetObserver mIconObserver = new DataSetObserver() {
- public void onChanged() {
- Log.d(TAG, "new icons arrived! now have " + mAdapter.getCount());
- }
- };
-
public void setApps(ArrayList<ApplicationInfo> list) {
mAllAppsList = list;
if (mRollo != null) {
mRollo.setApps(list);
}
mPageCount = countPages(list.size());
+ Log.d(TAG, "setApps mRollo=" + mRollo + " list=" + list);
+ }
+
+ private void invokeIcon(int index) {
+ Log.d(TAG, "launch it!!!! index=" + index);
}
private static int countPages(int iconCount) {
@@ -276,15 +337,20 @@
private Allocation mScrollHandle;
private Allocation[] mIcons;
- private int[] mAllocIconIDBuf;
+ private int[] mIconIds;
private Allocation mAllocIconID;
private Allocation[] mLabels;
- private int[] mAllocLabelIDBuf;
+ private int[] mLabelIds;
private Allocation mAllocLabelID;
+ private Allocation mSelectedIcon;
- private int[] mAllocScratchBuf;
- private Allocation mAllocScratch;
+ private int[] mTouchYBorders;
+ private Allocation mAllocTouchYBorders;
+ private int[] mTouchXBorders;
+ private Allocation mAllocTouchXBorders;
+
+ private Bitmap mSelectionBitmap;
Params mParams;
State mState;
@@ -314,7 +380,9 @@
@AllocationIndex(5) public int currentScrollX;
@AllocationIndex(6) public int flingDuration;
@AllocationIndex(7) public int flingEndPos;
- @AllocationIndex(8) public int scrollHandlePos;
+ @AllocationIndex(8) public int startScrollX;
+ @AllocationIndex(9) public int selectedIconIndex = -1;
+ @AllocationIndex(10) public int selectedIconTexture;
}
public RolloRS() {
@@ -326,6 +394,7 @@
mHeight = height;
initGl();
initData();
+ initTouchState();
initRs();
}
@@ -353,7 +422,8 @@
mPFImages.bindSampler(mSampler, 0);
bf.setTexEnvMode(ProgramFragment.EnvMode.MODULATE, 0);
- mPFText = bf.create();
+ //mPFText = bf.create();
+ mPFText = (new ProgramFragment.Builder(mRS, null, null)).create();
mPFText.setName("PFText");
mPFText.bindSampler(mSamplerText, 0);
@@ -391,9 +461,15 @@
mRS.contextBindProgramVertex(mPV);
- mAllocScratchBuf = new int[32];
- mAllocScratch = Allocation.createSized(mRS, Element.USER_I32, mAllocScratchBuf.length);
- mAllocScratch.data(mAllocScratchBuf);
+ mTouchXBorders = new int[Defines.COLUMNS_PER_PAGE+1];
+ mAllocTouchXBorders = Allocation.createSized(mRS, Element.USER_I32,
+ mTouchXBorders.length);
+ mAllocTouchXBorders.data(mTouchXBorders);
+
+ mTouchYBorders = new int[Defines.ROWS_PER_PAGE+1];
+ mAllocTouchYBorders = Allocation.createSized(mRS, Element.USER_I32,
+ mTouchYBorders.length);
+ mAllocTouchYBorders.data(mTouchYBorders);
Log.e("rs", "Done loading named");
}
@@ -410,17 +486,33 @@
mParams.bubbleBitmapHeight = bubble.getBitmapHeight();
mScrollHandle = Allocation.createFromBitmapResource(mRS, mRes,
- R.drawable.all_apps_button_pow2, Element.RGBA_8888, true);
+ R.drawable.all_apps_button_pow2, Element.RGBA_8888, false);
mScrollHandle.uploadToTexture(0);
mParams.scrollHandleId = mScrollHandle.getID();
Log.d(TAG, "mParams.scrollHandleId=" + mParams.scrollHandleId);
mParams.scrollHandleTextureWidth = 128;
mParams.scrollHandleTextureHeight = 128;
- mState.scrollHandlePos = 0;
+
mParams.save();
mState.save();
+ mSelectionBitmap = Bitmap.createBitmap(Defines.ICON_WIDTH_PX, Defines.ICON_HEIGHT_PX,
+ Bitmap.Config.ARGB_8888);
+ Bitmap selectionBitmap = mSelectionBitmap;
+ Paint paint = new Paint();
+ float radius = 12 * getContext().getResources().getDisplayMetrics().density;
+ //paint.setMaskFilter(new BlurMaskFilter(radius, BlurMaskFilter.Blur.OUTER));
+ Canvas canvas = new Canvas(selectionBitmap);
+ canvas.drawColor(0xffff0000);
+
+ mSelectedIcon = Allocation.createFromBitmap(mRS, selectionBitmap,
+ Element.RGBA_8888, false);
+ mSelectedIcon.uploadToTexture(0);
+
+ mState.selectedIconTexture = mSelectedIcon.getID();
+
+ Log.d(TAG, "initData calling mRollo.setApps");
setApps(null);
}
@@ -435,8 +527,9 @@
mScript.bindAllocation(mParams.getAllocation(), Defines.ALLOC_PARAMS);
mScript.bindAllocation(mState.getAllocation(), Defines.ALLOC_STATE);
mScript.bindAllocation(mAllocIconID, Defines.ALLOC_ICON_IDS);
- mScript.bindAllocation(mAllocScratch, Defines.ALLOC_SCRATCH);
mScript.bindAllocation(mAllocLabelID, Defines.ALLOC_LABEL_IDS);
+ mScript.bindAllocation(mAllocTouchXBorders, Defines.ALLOC_X_BORDERS);
+ mScript.bindAllocation(mAllocTouchYBorders, Defines.ALLOC_Y_BORDERS);
mRS.contextBindRootScript(mScript);
}
@@ -444,11 +537,11 @@
private void setApps(ArrayList<ApplicationInfo> list) {
final int count = list != null ? list.size() : 0;
mIcons = new Allocation[count];
- mAllocIconIDBuf = new int[count];
+ mIconIds = new int[count];
mAllocIconID = Allocation.createSized(mRS, Element.USER_I32, count);
mLabels = new Allocation[count];
- mAllocLabelIDBuf = new int[count];
+ mLabelIds = new int[count];
mAllocLabelID = Allocation.createSized(mRS, Element.USER_I32, count);
Element ie8888 = Element.RGBA_8888;
@@ -459,19 +552,19 @@
final ApplicationInfo item = list.get(i);
mIcons[i] = Allocation.createFromBitmap(mRS, item.iconBitmap,
- Element.RGBA_8888, true);
+ Element.RGBA_8888, false);
mLabels[i] = Allocation.createFromBitmap(mRS, item.titleBitmap,
- Element.RGBA_8888, true);
+ Element.RGBA_8888, false);
mIcons[i].uploadToTexture(0);
mLabels[i].uploadToTexture(0);
- mAllocIconIDBuf[i] = mIcons[i].getID();
- mAllocLabelIDBuf[i] = mLabels[i].getID();
+ mIconIds[i] = mIcons[i].getID();
+ mLabelIds[i] = mLabels[i].getID();
}
- mAllocIconID.data(mAllocIconIDBuf);
- mAllocLabelID.data(mAllocLabelIDBuf);
+ mAllocIconID.data(mIconIds);
+ mAllocLabelID.data(mLabelIds);
mState.iconCount = count;
@@ -484,6 +577,84 @@
mState.save();
}
+
+ void initTouchState() {
+ int width = getWidth();
+ int height = getHeight();
+
+ int iconsSize;
+ if (width < height) {
+ iconsSize = width;
+ } else {
+ iconsSize = height;
+ }
+ int cellHeight = iconsSize / Defines.ROWS_PER_PAGE;
+ int cellWidth = iconsSize / Defines.COLUMNS_PER_PAGE;
+
+ int centerY = (height / 2) - (int)(cellHeight * 0.35f);
+ mTouchYBorders[0] = centerY - (int)(2.4f * cellHeight);
+ mTouchYBorders[1] = centerY - (int)(1.15f * cellHeight);
+ mTouchYBorders[2] = centerY;
+ mTouchYBorders[3] = centerY + (int)(1.15f * cellHeight);;
+ mTouchYBorders[4] = centerY + (int)(2.4f * cellHeight);
+
+ mAllocTouchYBorders.data(mTouchYBorders);
+
+ int centerX = (width / 2);
+ mTouchXBorders[0] = centerX - (2 * cellWidth);
+ mTouchXBorders[1] = centerX - (int)(0.83f * cellWidth);;
+ mTouchXBorders[2] = centerX;
+ mTouchXBorders[3] = centerX + (int)(0.83f * cellWidth);;
+ mTouchXBorders[4] = centerX + (2 * cellWidth);
+
+ mAllocTouchXBorders.data(mTouchXBorders);
+ }
+
+ int chooseTappedIcon(int x, int y, int scrollX, int currentPage) {
+ int col = -1;
+ int row = -1;
+
+ for (int i=0; i<Defines.COLUMNS_PER_PAGE; i++) {
+ if (x >= mTouchXBorders[i] && x < mTouchXBorders[i+1]) {
+ col = i;
+ break;
+ }
+ }
+ for (int i=0; i<Defines.ROWS_PER_PAGE; i++) {
+ if (y >= mTouchYBorders[i] && y < mTouchYBorders[i+1]) {
+ row = i;
+ break;
+ }
+ }
+
+ if (row < 0 || col < 0) {
+ return -1;
+ }
+
+ return (currentPage * Defines.ROWS_PER_PAGE * Defines.COLUMNS_PER_PAGE)
+ + (row * Defines.ROWS_PER_PAGE) + col;
+ }
+
+ /**
+ * You need to call save() on mState on your own after calling this.
+ */
+ void selectIcon(int x, int y, int scrollX, int currentPage) {
+ int iconCount = mAllAppsList.size();
+ int index = chooseTappedIcon(x, y, scrollX, currentPage);
+ if (index < 0 || index >= iconCount) {
+ mState.selectedIconIndex = -1;
+ return;
+ } else {
+ mState.selectedIconIndex = index;
+ }
+ }
+
+ /**
+ * You need to call save() on mState on your own after calling this.
+ */
+ void clearSelectedIcon() {
+ mState.selectedIconIndex = -1;
+ }
}
}