From 433f60dac7f0f53376426a320f0154654b4a2dea Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver.koc@ericsson.com>
Date: Tue, 29 Jul 2014 10:27:48 +0200
Subject: [PATCH] Fixed about screen

---
 app/src/main/AndroidManifest.xml                     |  2 +-
 app/src/main/assets/www/about.html                   |  2 +-
 .../com/ericsson/uecontrol/gui/AboutActivity.java    |  2 +-
 .../com/ericsson/uecontrol/gui/MainActivity.java     |  5 +++--
 .../com/ericsson/uecontrol/gui/SettingsActivity.java | 12 ++++++++++++
 app/src/main/res/xml/preferences.xml                 |  5 ++---
 6 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c3b92d1..889720a 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,5 +32,5 @@
         </activity>
     </application>
 
-    <uses-permission android:name="android.permission.INTERNET"></uses-permission>
+    <uses-permission android:name="android.permission.INTERNET" />
 </manifest>
diff --git a/app/src/main/assets/www/about.html b/app/src/main/assets/www/about.html
index ffe517a..a9bae57 100755
--- a/app/src/main/assets/www/about.html
+++ b/app/src/main/assets/www/about.html
@@ -2,7 +2,7 @@
 <body>
     <h1>About</h1>
     <hr />
-    This application was developed by Ziver Koc 2014 at Ericsson AB.
+    This application was developed by Ziver Koc (Ericsson AB).
     <br /><br />
     <h3>Attributions:</h3>
     <ul>
diff --git a/app/src/main/java/com/ericsson/uecontrol/gui/AboutActivity.java b/app/src/main/java/com/ericsson/uecontrol/gui/AboutActivity.java
index 4f3f34e..4a019d9 100755
--- a/app/src/main/java/com/ericsson/uecontrol/gui/AboutActivity.java
+++ b/app/src/main/java/com/ericsson/uecontrol/gui/AboutActivity.java
@@ -13,7 +13,7 @@ public class AboutActivity extends Activity{
         super.onCreate(savedInstanceState);
 
         WebView view = new WebView(this);
-        view.loadUrl("file://assets/www/about.html");
+        view.loadUrl("file:///android_asset/www/about.html");
         this.setContentView(view);
     }
 }
diff --git a/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java b/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java
index 0278ed9..ac07309 100755
--- a/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java
+++ b/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java
@@ -57,8 +57,8 @@ public class MainActivity extends FragmentActivity
         currentExecutor = 0;
 
         UeControlExecutor exec = new UeControlExecutor();
-        exec.addBehaviour(new UeBehaviourSleep(1000));
-        exec.addBehaviour(new UeBehaviourSurfing("http://google.com"));
+        exec.addBehaviour(new UeBehaviourSleep());
+        exec.addBehaviour(new UeBehaviourSurfing());
         exec.addBehaviour(new UeBehaviourSleep(4000));
         exec.setThroughputListener(statusFragment.getThroughputListener());
         executors.add(exec);
@@ -70,6 +70,7 @@ public class MainActivity extends FragmentActivity
         FragmentManager fragmentManager = getFragmentManager();
         fragmentManager.beginTransaction()
                 .replace(R.id.container, BehaviourListFragment.newInstance(position)).commit();
+        currentExecutor = position;
     }
 
     public void onSectionAttached(int number) {
diff --git a/app/src/main/java/com/ericsson/uecontrol/gui/SettingsActivity.java b/app/src/main/java/com/ericsson/uecontrol/gui/SettingsActivity.java
index ec73582..f5e8e26 100755
--- a/app/src/main/java/com/ericsson/uecontrol/gui/SettingsActivity.java
+++ b/app/src/main/java/com/ericsson/uecontrol/gui/SettingsActivity.java
@@ -1,7 +1,9 @@
 package com.ericsson.uecontrol.gui;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
+import android.preference.Preference;
 import android.preference.PreferenceFragment;
 
 import com.ericsson.uecontrol.R;
@@ -15,6 +17,7 @@ public class SettingsActivity extends Activity {
         getFragmentManager().beginTransaction()
                 .replace(android.R.id.content, new SettingsFragment())
                 .commit();
+
     }
 
 
@@ -25,6 +28,15 @@ public class SettingsActivity extends Activity {
 
             // Load the preferences from an XML resource
             addPreferencesFromResource(R.xml.preferences);
+
+            // Setup About intent
+            Preference aboutPreference = findPreference("about");
+            aboutPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener(){
+                public boolean onPreferenceClick(Preference preference) {
+                    startActivity(new Intent(getActivity(), AboutActivity.class));
+                    return true;
+                }
+            });
         }
     }
 }
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 6ec1f14..edadf9a 100755
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -20,12 +20,11 @@
         android:title="@string/pref_other_title"
         android:key="pref_key_storage_settings">
 
-        <PreferenceScreen
+        <Preference
             android:key="about"
             android:title="@string/pref_about"
             android:defaultValue="false">
-            <intent android:targetClass="com.ericsson.uecontrol.gui.AboutActivity" />
-        </PreferenceScreen>
+        </Preference>
 
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
