summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/raw/rollo3.c26
-rw-r--r--src/com/android/launcher2/AllAppsView.java107
2 files changed, 122 insertions, 11 deletions
diff --git a/res/raw/rollo3.c b/res/raw/rollo3.c
index 77db74a69..af186ff58 100644
--- a/res/raw/rollo3.c
+++ b/res/raw/rollo3.c
@@ -85,7 +85,7 @@ void init() {
g_SpecialHWWar = 1;
g_MoveToTime = 0;
g_MoveToOldPos = 0;
- g_MoveToTotalTime = 0.5f;
+ g_MoveToTotalTime = 0.2f; // Duration of scrolling 1 line
}
void resetHWWar() {
@@ -112,6 +112,8 @@ void moveTo() {
g_MoveToTime = g_MoveToTotalTime;
g_PosVelocity = 0;
g_MoveToOldPos = g_PosPage;
+
+ // debugF("======= moveTo", state->targetPos);
}
void fling() {
@@ -144,6 +146,17 @@ modf(float x, float y)
return x-(y*floorf(x/y));
}
+
+/*
+ * Interpolates values in the range 0..1 to a curve that eases in
+ * and out.
+ */
+float
+getInterpolation(float input) {
+ return (cosf((input + 1) * PI) / 2.0f) + 0.5f;
+}
+
+
void updatePos() {
if (g_LastTouchDown) {
return;
@@ -160,6 +173,8 @@ void updatePos() {
float friction = 4.f * g_DT;
if (g_MoveToTime) {
+
+ /*
float a = 2.f * (state->targetPos - g_MoveToOldPos) /
(g_MoveToTotalTime * g_MoveToTotalTime);
if (g_MoveToTime > (g_MoveToTotalTime * 0.5f)) {
@@ -170,6 +185,11 @@ void updatePos() {
float t = g_MoveToTotalTime - g_MoveToTime;
g_PosPage = g_MoveToOldPos + 0.5f * a * (t * t);
}
+ */
+
+ // New position is old posiition + (total distance) * (interpolated time)
+ g_PosPage = g_MoveToOldPos + (state->targetPos - g_MoveToOldPos) * getInterpolation((g_MoveToTotalTime - g_MoveToTime) / g_MoveToTotalTime);
+
g_MoveToTime -= g_DT;
if (g_MoveToTime <= 0) {
g_MoveToTime = 0;
@@ -409,7 +429,7 @@ main(int launchID)
int newTime = uptimeMillis();
g_DT = (newTime - g_LastTime) / 1000.f;
g_LastTime = newTime;
-
+
if (!g_DrawLastFrame) {
// If we stopped rendering we cannot use DT.
// assume 30fps in this case.
@@ -495,6 +515,6 @@ main(int launchID)
// Bug workaround where the last frame is not always displayed
// So we keep rendering until the bug is fixed.
- return lastFrame((g_PosVelocity != 0) || fracf(g_PosPage) || g_Zoom != state->zoomTarget);
+ return lastFrame((g_PosVelocity != 0) || fracf(g_PosPage) || g_Zoom != state->zoomTarget || (g_MoveToTime != 0));
}
diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java
index 305f4041c..9c73a01be 100644
--- a/src/com/android/launcher2/AllAppsView.java
+++ b/src/com/android/launcher2/AllAppsView.java
@@ -45,6 +45,7 @@ import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Paint;
+import android.graphics.Rect;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.Message;
@@ -87,7 +88,12 @@ public class AllAppsView extends RSSurfaceView
private RenderScript mRS;
private RolloRS mRollo;
private ArrayList<ApplicationInfo> mAllAppsList;
-
+
+ /**
+ * True when we are using arrow keys or trackball to drive navigation
+ */
+ private boolean mArrowNavigation = false;
+
private int mPageCount;
private boolean mStartedScrolling;
private VelocityTracker mVelocity;
@@ -175,12 +181,93 @@ public class AllAppsView extends RSSurfaceView
long endTime = SystemClock.uptimeMillis();
Log.d(TAG, "surfaceChanged took " + (endTime-startTime) + "ms");
}
+
@Override
- public boolean onKeyDown(int keyCode, KeyEvent event)
- {
- // this method doesn't work when 'extends View' include 'extends ScrollView'.
- return super.onKeyDown(keyCode, event);
+ protected void onFocusChanged(boolean gainFocus, int direction, Rect previouslyFocusedRect) {
+ super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
+ if (gainFocus) {
+ if (!mArrowNavigation && mRollo.mState.iconCount > 0) {
+ // Select the first icon when we gain keyboard focus
+ mArrowNavigation = true;
+ mRollo.selectIcon(Math.round(mRollo.mMessageProc.mPosX) * Defines.COLUMNS_PER_PAGE);
+ mRollo.mState.save();
+ }
+ } else {
+ if (mArrowNavigation) {
+ // Clear selection when we lose focus
+ mRollo.clearSelectedIcon();
+ mRollo.mState.save();
+ mArrowNavigation = false;
+ }
+ }
+ }
+
+ @Override
+ public boolean onKeyDown(int keyCode, KeyEvent event) {
+
+ if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER) {
+ if (mArrowNavigation) {
+ int whichApp = mRollo.mState.selectedIconIndex;
+ if (whichApp >= 0) {
+ ApplicationInfo app = mAllAppsList.get(whichApp);
+ mLauncher.startActivitySafely(app.intent);
+ }
+ }
+ }
+
+ if (mArrowNavigation && mRollo.mState.iconCount > 0) {
+ mArrowNavigation = true;
+
+ int currentSelection = mRollo.mState.selectedIconIndex;
+ int currentTopRow = (int) mRollo.mMessageProc.mPosX;
+
+ // The column of the current selection, in the range 0..COLUMNS_PER_PAGE-1
+ int currentPageCol = currentSelection % Defines.COLUMNS_PER_PAGE;
+
+ // The row of the current selection, in the range 0..ROWS_PER_PAGE-1
+ int currentPageRow = (currentSelection - (currentTopRow * Defines.COLUMNS_PER_PAGE))
+ / Defines.ROWS_PER_PAGE;
+
+ int newSelection = currentSelection;
+
+ switch (keyCode) {
+ case KeyEvent.KEYCODE_DPAD_UP:
+ if (currentPageRow > 0) {
+ newSelection = currentSelection - Defines.COLUMNS_PER_PAGE;
+ } else if (currentTopRow > 0) {
+ mRollo.moveTo(currentTopRow - 1);
+ newSelection = currentSelection - Defines.COLUMNS_PER_PAGE;
+ }
+ break;
+ case KeyEvent.KEYCODE_DPAD_DOWN:
+ if (currentSelection < mRollo.mState.iconCount - Defines.COLUMNS_PER_PAGE) {
+ if (currentPageRow < Defines.ROWS_PER_PAGE - 1) {
+ newSelection = currentSelection + Defines.COLUMNS_PER_PAGE;
+ } else {
+ mRollo.moveTo(currentTopRow + 1);
+ newSelection = currentSelection + Defines.COLUMNS_PER_PAGE;
+ }
+ }
+ break;
+ case KeyEvent.KEYCODE_DPAD_LEFT:
+ if (currentPageCol > 0) {
+ newSelection = currentSelection - 1;
+ }
+ break;
+ case KeyEvent.KEYCODE_DPAD_RIGHT:
+ if ((currentPageCol < Defines.COLUMNS_PER_PAGE - 1) &&
+ (currentSelection < mRollo.mState.iconCount - 1)) {
+ newSelection = currentSelection + 1;
+ }
+ break;
+ }
+ if (newSelection != currentSelection) {
+ mRollo.selectIcon(newSelection);
+ mRollo.mState.save();
+ }
+ }
+ return true;
}
private int mRSMode = 0;
@@ -188,6 +275,8 @@ public class AllAppsView extends RSSurfaceView
@Override
public boolean onTouchEvent(MotionEvent ev)
{
+ mArrowNavigation = false;
+
if (!isVisible()) {
return true;
}
@@ -208,13 +297,14 @@ public class AllAppsView extends RSSurfaceView
mTouchTracking = TRACKING_HOME;
mRollo.setHomeSelected(true);
mRollo.mState.save();
+ mCurrentIconIndex = -1;
} else {
mTouchTracking = TRACKING_FLING;
mMotionDownRawX = (int)ev.getRawX();
mMotionDownRawY = (int)ev.getRawY();
- mRollo.mState.newPositionX = ev.getRawY() / getWidth();
+ mRollo.mState.newPositionX = ev.getRawY() / getHeight();
mRollo.mState.newTouchDown = 1;
if (!mRollo.checkClickOK()) {
@@ -260,7 +350,7 @@ public class AllAppsView extends RSSurfaceView
cancelLongPress();
mCurrentIconIndex = -1;
}
- mRollo.mState.newPositionX = ev.getRawY() / getWidth();
+ mRollo.mState.newPositionX = ev.getRawY() / getHeight();
mRollo.mState.newTouchDown = 1;
mRollo.move();
@@ -281,9 +371,10 @@ public class AllAppsView extends RSSurfaceView
mRollo.setHomeSelected(false);
mRollo.mState.save();
}
+ mCurrentIconIndex = -1;
} else if (mTouchTracking == TRACKING_FLING) {
mRollo.mState.newTouchDown = 0;
- mRollo.mState.newPositionX = ev.getRawY() / getWidth();
+ mRollo.mState.newPositionX = ev.getRawY() / getHeight();
mVelocity.computeCurrentVelocity(1000 /* px/sec */, mMaxFlingVelocity);
mRollo.mState.flingVelocity = mVelocity.getYVelocity() / getHeight();
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 18:59:47 +0000