fixed merge conflicts

src/de/tudarmstadt/informatik/hostage/ui2/activity/MainActivity.java

@@ -6,6 +6,7 @@ import android.app.ActionBar;
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.FragmentManager;
+import android.app.FragmentTransaction;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -17,6 +18,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
+
 import de.tudarmstadt.informatik.hostage.R;
 import de.tudarmstadt.informatik.hostage.ui.LogFilter;
 import de.tudarmstadt.informatik.hostage.ui.ViewLogTable;
@@ -69,20 +71,14 @@ public class MainActivity extends Activity {
 		mDrawerList = (ListView) findViewById(R.id.left_drawer);
 
 		drawerItems = new ArrayList<DrawerListItem>();
-		drawerItems.add(new DrawerListItem(R.string.drawer_overview,
-				R.drawable.ic_menu_home));
-		drawerItems.add(new DrawerListItem(R.string.drawer_threat_map,
-				R.drawable.ic_menu_mapmode));
-		drawerItems.add(new DrawerListItem(R.string.drawer_records,
-				R.drawable.ic_menu_gallery));
-		drawerItems.add(new DrawerListItem(R.string.drawer_services,
-				R.drawable.ic_menu_set_as));
-		drawerItems.add(new DrawerListItem(R.string.drawer_profile_manager,
-				R.drawable.ic_menu_set_as));
-		drawerItems.add(new DrawerListItem(R.string.drawer_settings,
-				R.drawable.ic_menu_preferences));
-		drawerItems.add(new DrawerListItem(R.string.drawer_app_info,
-				R.drawable.ic_menu_info_details));
+		drawerItems.add(new DrawerListItem(R.string.drawer_overview, R.drawable.ic_menu_home));
+		drawerItems.add(new DrawerListItem(R.string.drawer_threat_map, R.drawable.ic_menu_mapmode));
+		drawerItems.add(new DrawerListItem(R.string.drawer_records, R.drawable.ic_menu_gallery));
+		drawerItems.add(new DrawerListItem(R.string.drawer_services, R.drawable.ic_menu_set_as));
+		drawerItems.add(new DrawerListItem(R.string.drawer_profile_manager, R.drawable.ic_menu_set_as));
+		drawerItems.add(new DrawerListItem(R.string.drawer_settings, R.drawable.ic_menu_preferences));
+		drawerItems.add(new DrawerListItem(R.string.drawer_app_info, R.drawable.ic_menu_info_details));
+
 
 		DrawerListAdapter listAdapter = new DrawerListAdapter(this, drawerItems);
 
@@ -92,25 +88,21 @@ public class MainActivity extends Activity {
 		getActionBar().setDisplayHomeAsUpEnabled(true);
 		getActionBar().setHomeButtonEnabled(true);
 
-		mDrawerToggle = new ActionBarDrawerToggle(this, /* host Activity */
-		mDrawerLayout, /* DrawerLayout object */
-		R.drawable.ic_navigation_drawer, /*
-										 * nav drawer image to replace 'Up'
-										 * caret
-										 */
-		R.string.drawer_open, /* "open drawer" description for accessibility */
-		R.string.drawer_close /* "close drawer" description for accessibility */
+		mDrawerToggle = new ActionBarDrawerToggle(
+				this,                  /* host Activity */
+				mDrawerLayout,         /* DrawerLayout object */
+				R.drawable.ic_navigation_drawer,  /* nav drawer image to replace 'Up' caret */
+				R.string.drawer_open,  /* "open drawer" description for accessibility */
+				R.string.drawer_close  /* "close drawer" description for accessibility */
 		) {
 			public void onDrawerClosed(View view) {
 				getActionBar().setTitle(mTitle);
-				invalidateOptionsMenu(); // creates call to
-											// onPrepareOptionsMenu()
+				invalidateOptionsMenu(); // creates call to onPrepareOptionsMenu()
 			}
 
 			public void onDrawerOpened(View drawerView) {
 				getActionBar().setTitle(mDrawerTitle);
-				invalidateOptionsMenu(); // creates call to
-											// onPrepareOptionsMenu()
+				invalidateOptionsMenu(); // creates call to onPrepareOptionsMenu()
 			}
 		};
 		mDrawerLayout.setDrawerListener(mDrawerToggle);
@@ -160,29 +152,31 @@ public class MainActivity extends Activity {
 		// update the main content by replacing fragments
 		Fragment fragment = null;
 		switch (position) {
-		case 0:
-			fragment = new HomeFragment();
-			break;
-		case 2:
-			// LogFilter filter = new LogFilter();
-			Intent intent = this.getIntent(); // new Intent(this,
-												// ViewLogTable.class);
-			intent.removeExtra(LogFilter.LOG_FILTER_INTENT_KEY);
-			// intent.putExtra(LogFilter.LOG_FILTER_INTENT_KEY, null);
-			fragment = new RecordOverviewFragment();
-			break;
-		case 4:
-			fragment = new ProfileManagerFragment();
-			break;
-		default:
-			break;
+			case 0:
+				fragment = new HomeFragment();
+				break;
+			case 2:
+				//LogFilter filter = new LogFilter();
+				Intent intent = this.getIntent(); //new Intent(this, ViewLogTable.class);
+				intent.removeExtra(LogFilter.LOG_FILTER_INTENT_KEY);
+				//intent.putExtra(LogFilter.LOG_FILTER_INTENT_KEY, null);
+				fragment = new RecordOverviewFragment();
+				break;
+			case 4:
+				fragment = new ProfileManagerFragment();
+				break;
+			default:
+				break;
 		}
 
 		if (fragment != null) {
 			this.displayedFragment = fragment;
 			FragmentManager fragmentManager = getFragmentManager();
-			fragmentManager.beginTransaction()
-					.replace(R.id.content_frame, fragment).commit();
+
+			FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+			fragmentTransaction.replace(R.id.content_frame, fragment, fragment.getTag());
+			fragmentTransaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
+			fragmentTransaction.commit();
 
 			// update selected item and title, then close the drawer
 			mDrawerList.setItemChecked(position, true);
@@ -192,10 +186,9 @@ public class MainActivity extends Activity {
 		}
 	}
 
-	private class DrawerItemClickListener implements
-			ListView.OnItemClickListener {
-		public void onItemClick(AdapterView<?> parent, View view, int position,
-				long id) {
+
+	private class DrawerItemClickListener implements ListView.OnItemClickListener {
+		public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 			displayView(position);
 		}
 	}

src/de/tudarmstadt/informatik/hostage/ui2/fragment/opengl/HomeGLSurfaceView.java

@@ -1,7 +1,7 @@
 package de.tudarmstadt.informatik.hostage.ui2.fragment.opengl;
 
 import android.content.Context;
-//import android.graphics.PixelFormat;
+import android.graphics.PixelFormat;
 import android.opengl.GLSurfaceView;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -15,10 +15,9 @@ public class HomeGLSurfaceView extends GLSurfaceView {
 	public HomeGLSurfaceView(Context context, AttributeSet attrs) { // will be called
 		super(context, attrs);
 		setEGLContextClientVersion(2); // OpenGL ES 2.0
-		//setZOrderOnTop(true);
-		// transparency
-		//setEGLConfigChooser(8, 8, 8, 8, 16, 0);
-		//getHolder().setFormat(PixelFormat.RGBA_8888);
-        setRenderer(new ThreatIndicatorGLRenderer());
+		setZOrderOnTop(true);
+		setEGLConfigChooser(8, 8, 8, 8, 16, 0);
+		getHolder().setFormat(PixelFormat.RGBA_8888);
+		setRenderer(new ThreatIndicatorGLRenderer());
 	}
 }

src/de/tudarmstadt/informatik/hostage/ui2/fragment/opengl/ThreatIndicatorGLRenderer.java

@@ -52,8 +52,6 @@ public class ThreatIndicatorGLRenderer implements Renderer {
 	
 	public void onSurfaceCreated(GL10 arg0, EGLConfig arg1) {
 		//GLES20.glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
-		GLES20.glClearColor(backgroundColor[0], backgroundColor[1], backgroundColor[2], 1.0f);
-		// GLES20.glClearColor(0.3f, 0.3f, 0.3f, 1.0f); // dark background
 		GLES20.glEnable(GLES20.GL_DEPTH_TEST);
 		GLES20.glEnable(GLES20.GL_CULL_FACE);
 		GLES20.glEnable(GLES20.GL_TEXTURE_2D);