Commit b91efdfc authored by Thomas Krex's avatar Thomas Krex

minor changes

parent 5966d320
......@@ -38,7 +38,7 @@
android:paddingLeft="5dip" >
</ScrollView>
<ImageView
<SurfaceView
android:id="@+id/playerView_extended"
android:layout_width="0dp"
android:layout_height="match_parent"
......
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/black"
android:orientation="horizontal"
android:weightSum="3" >
<ScrollView
android:id="@+id/indexScrollView"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:fillViewport="false"
android:paddingLeft="5dip" >
</ScrollView>
<SurfaceView
android:id="@+id/playerView_extended"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="2"
android:background="@drawable/my_border"
android:padding="10dip"
android:scaleType="centerInside"
android:src="@drawable/ic_launcher" />
</LinearLayout>
......@@ -67,6 +67,8 @@ public class PlayerActivity extends SherlockActivity implements
// default fullscreen
surfaceView= (SurfaceView) findViewById(R.id.playerView_fullscreen);
surfaceView.setZOrderOnTop(false);
fileName = getIntent().getStringExtra(DownloadService.FILE_NAME);
setTitle(fileName);
......@@ -336,7 +338,7 @@ public class PlayerActivity extends SherlockActivity implements
// switch to fullscreen
if (mode == LAYOUT_MODE_FULL) {
// imgV = (ImageView) findViewById(R.id.playerView_fullscreen);
surfaceView = (SurfaceView) findViewById(R.id.playerView_fullscreen);
// recording.graphicsContext().setImageView(imgV);
recording.graphicsContext().updateView(true);
switcher.setDisplayedChild(LAYOUT_MODE_FULL);
......@@ -345,7 +347,7 @@ public class PlayerActivity extends SherlockActivity implements
// switch to extended View
if (mode == LAYOUT_MODE_EXTENDED) {
// imgV = (ImageView) findViewById(R.id.playerView_extended);
surfaceView= (SurfaceView) findViewById(R.id.playerView_extended);
// recording.graphicsContext().setImageView(imgV);
recording.graphicsContext().updateView(true);
switcher.setDisplayedChild(LAYOUT_MODE_EXTENDED);
......
......@@ -14,8 +14,7 @@ import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
import android.widget.ImageView;
/**
* paint the messages to the bitmap. Bitmap shown in imageview. Annotations and
......@@ -41,6 +40,7 @@ public class GraphicsContext implements MessageConsumer {
public GraphicsContext(SurfaceHolder holder, Recording record) {
this.holder=holder;
holder.setSizeFromLayout();
this.producer = record;
this.recording = record;
producer.addMessageConsumer(this);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment