Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Stop octopus animation when paused"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-23 22:21:43 +00:00
committed by Android (Google) Code Review
parent 7be7878769 e5d37d7115
commit de10727f3e
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/EasterEgg/src/com/android/egg/octo/Ocquarium.java
View File

@@ -26,6 +26,7 @@ import com.android.egg.R;
public class Ocquarium extends Activity {
ImageView mImageView;
private OctopusDrawable mOcto;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -43,10 +44,9 @@ public class Ocquarium extends Activity {
bg.addView(mImageView, new FrameLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
final OctopusDrawable octo = new OctopusDrawable(getApplicationContext());
octo.setSizePx((int) (OctopusDrawable.randfrange(40f,180f) * dp));
mImageView.setImageDrawable(octo);
octo.startDrift();
mOcto = new OctopusDrawable(getApplicationContext());
mOcto.setSizePx((int) (OctopusDrawable.randfrange(40f,180f) * dp));
mImageView.setImageDrawable(mOcto);
mImageView.setOnTouchListener(new View.OnTouchListener() {
boolean touching;
@@ -54,24 +54,36 @@ public class Ocquarium extends Activity {
public boolean onTouch(View view, MotionEvent motionEvent) {
switch (motionEvent.getActionMasked()) {
case MotionEvent.ACTION_DOWN:
if (octo.hitTest(motionEvent.getX(), motionEvent.getY())) {
if (mOcto.hitTest(motionEvent.getX(), motionEvent.getY())) {
touching = true;
octo.stopDrift();
mOcto.stopDrift();
}
break;
case MotionEvent.ACTION_MOVE:
if (touching) {
octo.moveTo(motionEvent.getX(), motionEvent.getY());
mOcto.moveTo(motionEvent.getX(), motionEvent.getY());
}
break;
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL:
touching = false;
octo.startDrift();
mOcto.startDrift();
break;
}
return true;
}
});
}
@Override
protected void onPause() {
mOcto.stopDrift();
super.onPause();
}
@Override
protected void onResume() {
super.onResume();
mOcto.startDrift();
}
}