AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use title buttons to switch slides

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1975723004

Review-Url: https://codereview.chromium.org/1975723004
This commit is contained in:
liyuqian 2016-05-13 06:45:21 -07:00 committed by Commit bot
parent c2e4bb39d4
commit 6ce4b003a2
2 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
platform_tools/android/apps/viewer/src/main/java/org/skia/viewer/ViewerActivity.java
View File

@ -12,6 +12,9 @@ import android.os.Bundle;
import android.util.Log;
import android.view.GestureDetector;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.Surface;
import android.view.SurfaceHolder;
@ -24,33 +27,30 @@ public class ViewerActivity
private SurfaceView mView;
private ViewerApplication mApplication;
private GestureDetector mGestureDetector;
private native void onSurfaceCreated(long handle, Surface surface);
private native void onSurfaceChanged(long handle, Surface surface);
private native void onSurfaceDestroyed(long handle);
private native void onKeyPressed(long handle, int keycode);
private class GestureListener extends GestureDetector.SimpleOnGestureListener {
@Override
public boolean onDown(MotionEvent e) {
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.title, menu);
return true;
}
@Override
public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
if (Math.abs(velocityX) > Math.abs(velocityY)
&& Math.abs(velocityX) > FLING_VELOCITY_THRESHOLD) {
if (velocityX > 0) {
// Fling right
onKeyPressed(mApplication.getNativeHandle(), KeyEvent.KEYCODE_SOFT_RIGHT);
} else {
// Fling left
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_left:
onKeyPressed(mApplication.getNativeHandle(), KeyEvent.KEYCODE_SOFT_LEFT);
}
return true;
}
return false;
case R.id.action_right:
onKeyPressed(mApplication.getNativeHandle(), KeyEvent.KEYCODE_SOFT_RIGHT);
return true;
default:
return super.onOptionsItemSelected(item);
}
}
@ -63,7 +63,6 @@ public class ViewerActivity
mView = (SurfaceView) findViewById(R.id.surfaceView);
mView.getHolder().addCallback(this);
mGestureDetector = new GestureDetector(getApplicationContext(), new GestureListener());
mView.setOnTouchListener(this);
}
@ -90,6 +89,6 @@ public class ViewerActivity
@Override
public boolean onTouch(View v, MotionEvent event) {
return mGestureDetector.onTouchEvent(event);
return false; // TODO pass the touch event to native code
}
}

12
platform_tools/android/apps/viewer/src/main/res/menu/title.xml Normal file
View File

@ -0,0 +1,12 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/action_left"
android:icon="@android:drawable/ic_media_previous"
android:showAsAction="always"/>
<item android:id="@+id/action_right"
android:icon="@android:drawable/ic_media_next"
android:showAsAction="always"/>
</menu>