Skip to content

Commit 367486d

Browse files
committed
removed startActivity() from PWatchFaceCanvas/GLES classes
Otherwise, it was overriding the parent's implementation
1 parent 1bff145 commit 367486d

File tree

3 files changed

+2
-19
lines changed

3 files changed

+2
-19
lines changed

core/src/processing/android/PWatchFaceCanvas.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
package processing.android;
2424

25-
import android.content.Intent;
2625
import android.graphics.Canvas;
2726
import android.graphics.Point;
2827
import android.os.Build;
@@ -32,7 +31,6 @@
3231
import android.support.wearable.watchface.WatchFaceService;
3332
import android.support.wearable.watchface.WatchFaceStyle;
3433
import android.util.DisplayMetrics;
35-
//import android.util.DisplayMetrics;
3634
import android.view.Display;
3735
import android.view.MotionEvent;
3836
import android.view.SurfaceHolder;
@@ -90,10 +88,6 @@ public int getKind() {
9088
return WATCHFACE;
9189
}
9290

93-
@Override
94-
public void startActivity(Intent intent) {
95-
}
96-
9791
public void setSketch(PApplet sketch) {
9892
this.sketch = sketch;
9993
}

core/src/processing/android/PWatchFaceGLES.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
package processing.android;
2424

25-
import android.content.Intent;
2625
import android.graphics.Point;
2726
import android.os.Build;
2827
import android.os.Bundle;
@@ -32,7 +31,6 @@
3231
import android.support.wearable.watchface.WatchFaceService;
3332
import android.support.wearable.watchface.WatchFaceStyle;
3433
import android.util.DisplayMetrics;
35-
//import android.util.DisplayMetrics;
3634
import android.view.MotionEvent;
3735
import android.view.SurfaceHolder;
3836
import android.view.WindowManager;
@@ -88,10 +86,6 @@ public int getKind() {
8886
return WATCHFACE;
8987
}
9088

91-
@Override
92-
public void startActivity(Intent intent) {
93-
}
94-
9589
public void setSketch(PApplet sketch) {
9690
this.sketch = sketch;
9791
}

libraries/cardboard/src/processing/cardboard/PCardboard.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ public int getDisplayWidth() {
6363
public int getDisplayHeight() {
6464
return metrics.heightPixels;
6565
}
66-
66+
6767
public float getDisplayDensity() {
6868
return metrics.density;
69-
}
69+
}
7070

7171
public int getKind() {
7272
return CARDBOARD;
@@ -111,11 +111,6 @@ public void init(PApplet sketch) {
111111
//
112112
// }
113113

114-
@Override
115-
public void startActivity(Intent intent) {
116-
// TODO Auto-generated method stub
117-
}
118-
119114
@Override
120115
public void onResume() {
121116
super.onResume();

0 commit comments

Comments
 (0)