sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: Finish basic overlay controller implementation

Browse Source
This commit is contained in:
Connor McLaughlin
2019-12-09 21:42:07 +10:00
parent 5d91c011a6
commit 35bbde6d71
16 changed files with 468 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java
View File

@ -85,20 +85,6 @@ public class EmulationActivity extends AppCompatActivity implements SurfaceHolde
hide();
}
};
/**
* Touch listener to use for in-layout UI controls to delay hiding the
* system UI. This is to prevent the jarring behavior of controls going away
* while interacting with activity UI.
*/
private final View.OnTouchListener mDelayHideTouchListener = new View.OnTouchListener() {
@Override
public boolean onTouch(View view, MotionEvent motionEvent) {
if (AUTO_HIDE) {
delayedHide(AUTO_HIDE_DELAY_MILLIS);
}
return false;
}
};
@Override
public void surfaceCreated(SurfaceHolder holder) {
@ -143,16 +129,13 @@ public class EmulationActivity extends AppCompatActivity implements SurfaceHolde
}
mVisible = true;
mContentView = (SurfaceView) findViewById(R.id.fullscreen_content);
Log.e("EmulationActivity", "adding callback");
mContentView = findViewById(R.id.fullscreen_content);
mContentView.getHolder().addCallback(this);
// Set up the user interaction to manually show or hide the system UI.
mContentView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
toggle();
if (mVisible)
hide();
}
});
@ -188,12 +171,14 @@ public class EmulationActivity extends AppCompatActivity implements SurfaceHolde
return super.onOptionsItemSelected(item);
}
private void toggle() {
@Override
public void onBackPressed() {
if (mVisible) {
hide();
} else {
show();
finish();
return;
}
show();
}
private void hide() {

6
android/app/src/main/java/com/github/stenzek/duckstation/TouchscreenControllerView.java
View File

@ -44,10 +44,16 @@ public class TouchscreenControllerView extends FrameLayout implements Touchscree
linkButton(view, R.id.controller_button_right, "Right");
linkButton(view, R.id.controller_button_down, "Down");
linkButton(view, R.id.controller_button_left, "Left");
linkButton(view, R.id.controller_button_l1, "L1");
linkButton(view, R.id.controller_button_l2, "L2");
linkButton(view, R.id.controller_button_select, "Select");
linkButton(view, R.id.controller_button_start, "Start");
linkButton(view, R.id.controller_button_triangle, "Triangle");
linkButton(view, R.id.controller_button_circle, "Circle");
linkButton(view, R.id.controller_button_cross, "Cross");
linkButton(view, R.id.controller_button_square, "Square");
linkButton(view, R.id.controller_button_r1, "R1");
linkButton(view, R.id.controller_button_r2, "R2");
}
private void linkButton(View view, int id, String buttonName)