Commiting stuff the IDE did not
This commit is contained in:
parent
73a3de5eb8
commit
ff7138bf9d
52 changed files with 3887 additions and 3887 deletions
|
|
@ -1,39 +1,39 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.ericsson.uecontrol" >
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
android:icon="@drawable/ic_launcher"
|
||||
android:label="@string/app_name"
|
||||
android:theme="@style/AppTheme" >
|
||||
<activity
|
||||
android:name=".gui.MainActivity"
|
||||
android:label="@string/app_name" >
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".gui.SettingsActivity"
|
||||
android:label="@string/app_name" >
|
||||
<meta-data
|
||||
android:name="android.support.PARENT_ACTIVITY"
|
||||
android:value=".gui.MainActivity" />
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".gui.EditActivity"
|
||||
android:label="@string/title_activity_edit" >
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".gui.AboutActivity"
|
||||
android:label="@string/title_activity_about" >
|
||||
</activity>
|
||||
</application>
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||
</manifest>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.ericsson.uecontrol" >
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
android:icon="@drawable/ic_launcher"
|
||||
android:label="@string/app_name"
|
||||
android:theme="@style/AppTheme" >
|
||||
<activity
|
||||
android:name=".gui.MainActivity"
|
||||
android:label="@string/app_name" >
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".gui.SettingsActivity"
|
||||
android:label="@string/app_name" >
|
||||
<meta-data
|
||||
android:name="android.support.PARENT_ACTIVITY"
|
||||
android:value=".gui.MainActivity" />
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".gui.EditActivity"
|
||||
android:label="@string/title_activity_edit" >
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".gui.AboutActivity"
|
||||
android:label="@string/title_activity_about" >
|
||||
</activity>
|
||||
</application>
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||
</manifest>
|
||||
|
|
|
|||
|
|
@ -1,110 +1,110 @@
|
|||
package com.ericsson.uecontrol.core;
|
||||
|
||||
/**
|
||||
* Base class for Ue behaviours that can be used by the executor
|
||||
*
|
||||
* Created by ezivkoc on 2014-07-15.
|
||||
*/
|
||||
public abstract class UeBehaviour {
|
||||
private boolean running;
|
||||
private BehaviourExecutionListener execListener;
|
||||
private DataHandledListener datahandledListener;
|
||||
|
||||
/**
|
||||
* Starts to run the behaviour, this method will block until the execution is done
|
||||
*/
|
||||
public synchronized void run(){
|
||||
running = true;
|
||||
|
||||
if(execListener != null) execListener.executionStarted();
|
||||
try {
|
||||
setProgress(0);
|
||||
execute();
|
||||
} catch(Exception e){
|
||||
if(execListener != null) execListener.exception(e);
|
||||
e.printStackTrace();
|
||||
}
|
||||
if(execListener != null) execListener.executionStopped();
|
||||
}
|
||||
|
||||
/**
|
||||
* Will stop the currently running behaviour
|
||||
*/
|
||||
public synchronized void terminate(){
|
||||
running = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return if currently running behaviour should be terminated
|
||||
*/
|
||||
protected boolean stopExecution(){
|
||||
return !running;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return true is this behaviour is currently running
|
||||
*/
|
||||
public boolean isRunning(){
|
||||
return running;
|
||||
}
|
||||
|
||||
public void setExecutionListener(BehaviourExecutionListener l){
|
||||
execListener = l;
|
||||
}
|
||||
|
||||
protected void setProgress(float progress){
|
||||
if(execListener != null)
|
||||
execListener.progressChanged(progress);
|
||||
|
||||
// TODO: This is a dirty way of updating the throughput, should be changed
|
||||
if(datahandledListener != null)
|
||||
datahandledListener.handledIncomingData(0);
|
||||
}
|
||||
|
||||
public void setDataHandledListener(DataHandledListener listener) {
|
||||
datahandledListener = listener;
|
||||
}
|
||||
|
||||
protected void setHandledIncomingData(long size){
|
||||
if(datahandledListener != null)
|
||||
datahandledListener.handledIncomingData(size);
|
||||
}
|
||||
protected void setHandledOutgoingData(long size){
|
||||
if(datahandledListener != null)
|
||||
datahandledListener.handledOutgoingData(size);
|
||||
}
|
||||
|
||||
/**
|
||||
* Executes the behaviour, will block until behaviour has run to completion.
|
||||
*/
|
||||
protected abstract void execute() throws Exception;
|
||||
|
||||
/**
|
||||
* @return the short name of the behaviour
|
||||
*/
|
||||
public abstract String getName();
|
||||
|
||||
/**
|
||||
* @return a longer description of the behaviour
|
||||
*/
|
||||
//public abstract String getDescription();
|
||||
|
||||
/**
|
||||
* @return a nice String with the current settings
|
||||
*/
|
||||
public abstract String toString();
|
||||
|
||||
|
||||
|
||||
public static interface BehaviourExecutionListener {
|
||||
public void executionStarted();
|
||||
public void progressChanged(float progress);
|
||||
public void executionStopped();
|
||||
public void exception(Exception e);
|
||||
}
|
||||
|
||||
public static interface DataHandledListener {
|
||||
public void handledIncomingData(long size);
|
||||
public void handledOutgoingData(long size);
|
||||
}
|
||||
}
|
||||
package com.ericsson.uecontrol.core;
|
||||
|
||||
/**
|
||||
* Base class for Ue behaviours that can be used by the executor
|
||||
*
|
||||
* Created by ezivkoc on 2014-07-15.
|
||||
*/
|
||||
public abstract class UeBehaviour {
|
||||
private boolean running;
|
||||
private BehaviourExecutionListener execListener;
|
||||
private DataHandledListener datahandledListener;
|
||||
|
||||
/**
|
||||
* Starts to run the behaviour, this method will block until the execution is done
|
||||
*/
|
||||
public synchronized void run(){
|
||||
running = true;
|
||||
|
||||
if(execListener != null) execListener.executionStarted();
|
||||
try {
|
||||
setProgress(0);
|
||||
execute();
|
||||
} catch(Exception e){
|
||||
if(execListener != null) execListener.exception(e);
|
||||
e.printStackTrace();
|
||||
}
|
||||
if(execListener != null) execListener.executionStopped();
|
||||
}
|
||||
|
||||
/**
|
||||
* Will stop the currently running behaviour
|
||||
*/
|
||||
public synchronized void terminate(){
|
||||
running = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return if currently running behaviour should be terminated
|
||||
*/
|
||||
protected boolean stopExecution(){
|
||||
return !running;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return true is this behaviour is currently running
|
||||
*/
|
||||
public boolean isRunning(){
|
||||
return running;
|
||||
}
|
||||
|
||||
public void setExecutionListener(BehaviourExecutionListener l){
|
||||
execListener = l;
|
||||
}
|
||||
|
||||
protected void setProgress(float progress){
|
||||
if(execListener != null)
|
||||
execListener.progressChanged(progress);
|
||||
|
||||
// TODO: This is a dirty way of updating the throughput, should be changed
|
||||
if(datahandledListener != null)
|
||||
datahandledListener.handledIncomingData(0);
|
||||
}
|
||||
|
||||
public void setDataHandledListener(DataHandledListener listener) {
|
||||
datahandledListener = listener;
|
||||
}
|
||||
|
||||
protected void setHandledIncomingData(long size){
|
||||
if(datahandledListener != null)
|
||||
datahandledListener.handledIncomingData(size);
|
||||
}
|
||||
protected void setHandledOutgoingData(long size){
|
||||
if(datahandledListener != null)
|
||||
datahandledListener.handledOutgoingData(size);
|
||||
}
|
||||
|
||||
/**
|
||||
* Executes the behaviour, will block until behaviour has run to completion.
|
||||
*/
|
||||
protected abstract void execute() throws Exception;
|
||||
|
||||
/**
|
||||
* @return the short name of the behaviour
|
||||
*/
|
||||
public abstract String getName();
|
||||
|
||||
/**
|
||||
* @return a longer description of the behaviour
|
||||
*/
|
||||
//public abstract String getDescription();
|
||||
|
||||
/**
|
||||
* @return a nice String with the current settings
|
||||
*/
|
||||
public abstract String toString();
|
||||
|
||||
|
||||
|
||||
public static interface BehaviourExecutionListener {
|
||||
public void executionStarted();
|
||||
public void progressChanged(float progress);
|
||||
public void executionStopped();
|
||||
public void exception(Exception e);
|
||||
}
|
||||
|
||||
public static interface DataHandledListener {
|
||||
public void handledIncomingData(long size);
|
||||
public void handledOutgoingData(long size);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,109 +1,109 @@
|
|||
package com.ericsson.uecontrol.core;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
import com.ericsson.uecontrol.core.util.ThroughputCalculator;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Created by ezivkoc on 2014-07-15.
|
||||
*/
|
||||
public class UeControlExecutor implements Runnable, UeBehaviour.DataHandledListener {
|
||||
private static final String TAG = "UeControlExecutor";
|
||||
|
||||
private List<UeBehaviour> behaviours;
|
||||
private UeBehaviour currentlyActive;
|
||||
private boolean terminate;
|
||||
private Thread thread;
|
||||
|
||||
private ThroughputCalculator downloadSpeed;
|
||||
private ThroughputCalculator uploadSpeed;
|
||||
private ThroughputListener throughputListener;
|
||||
|
||||
|
||||
public UeControlExecutor(){
|
||||
behaviours = new ArrayList<UeBehaviour>();
|
||||
downloadSpeed = new ThroughputCalculator();
|
||||
uploadSpeed = new ThroughputCalculator();
|
||||
}
|
||||
|
||||
public void addBehaviour(UeBehaviour b){
|
||||
behaviours.add(b);
|
||||
b.setDataHandledListener(this);
|
||||
}
|
||||
|
||||
|
||||
public void execute(){
|
||||
if(thread == null || !thread.isAlive()) {
|
||||
terminate = false;
|
||||
thread = new Thread(this);
|
||||
thread.start();
|
||||
}
|
||||
}
|
||||
|
||||
public void terminate(){
|
||||
terminate = true;
|
||||
if(currentlyActive != null);
|
||||
currentlyActive.terminate();
|
||||
}
|
||||
|
||||
public boolean isRunning(){
|
||||
if(currentlyActive == null)
|
||||
return false;
|
||||
return currentlyActive.isRunning();
|
||||
}
|
||||
|
||||
public void run(){
|
||||
while(!terminate) {
|
||||
if(behaviours.isEmpty()) {
|
||||
terminate();
|
||||
break;
|
||||
}
|
||||
else if (currentlyActive == null)
|
||||
currentlyActive = behaviours.get(0);
|
||||
|
||||
Log.v(TAG, "Running behaviour: " + currentlyActive.getName());
|
||||
currentlyActive.run();
|
||||
|
||||
int index = behaviours.indexOf(currentlyActive) +1;
|
||||
if(index < behaviours.size())
|
||||
currentlyActive = behaviours.get(index);
|
||||
else
|
||||
currentlyActive = null;
|
||||
}
|
||||
Log.v(TAG, "Execution completed");
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void handledIncomingData(long size) {
|
||||
downloadSpeed.setHandledData(size);
|
||||
if(throughputListener != null && downloadSpeed.isUpdated())
|
||||
throughputListener.throughputUpdate(downloadSpeed.getBitThroughput(), uploadSpeed.getBitThroughput());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handledOutgoingData(long size) {
|
||||
uploadSpeed.setHandledData(size);
|
||||
if(throughputListener != null && uploadSpeed.isUpdated())
|
||||
throughputListener.throughputUpdate(downloadSpeed.getBitThroughput(), uploadSpeed.getBitThroughput());
|
||||
}
|
||||
|
||||
public void setThroughputListener(ThroughputListener listener){
|
||||
throughputListener = listener;
|
||||
}
|
||||
|
||||
public List<UeBehaviour> getBehaviourList() {
|
||||
return behaviours;
|
||||
}
|
||||
|
||||
public UeBehaviour getRunningBehaviour(){
|
||||
return currentlyActive;
|
||||
}
|
||||
|
||||
public static interface ThroughputListener{
|
||||
public void throughputUpdate(double downThroughput, double upThroughput);
|
||||
}
|
||||
}
|
||||
package com.ericsson.uecontrol.core;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
import com.ericsson.uecontrol.core.util.ThroughputCalculator;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Created by ezivkoc on 2014-07-15.
|
||||
*/
|
||||
public class UeControlExecutor implements Runnable, UeBehaviour.DataHandledListener {
|
||||
private static final String TAG = "UeControlExecutor";
|
||||
|
||||
private List<UeBehaviour> behaviours;
|
||||
private UeBehaviour currentlyActive;
|
||||
private boolean terminate;
|
||||
private Thread thread;
|
||||
|
||||
private ThroughputCalculator downloadSpeed;
|
||||
private ThroughputCalculator uploadSpeed;
|
||||
private ThroughputListener throughputListener;
|
||||
|
||||
|
||||
public UeControlExecutor(){
|
||||
behaviours = new ArrayList<UeBehaviour>();
|
||||
downloadSpeed = new ThroughputCalculator();
|
||||
uploadSpeed = new ThroughputCalculator();
|
||||
}
|
||||
|
||||
public void addBehaviour(UeBehaviour b){
|
||||
behaviours.add(b);
|
||||
b.setDataHandledListener(this);
|
||||
}
|
||||
|
||||
|
||||
public void execute(){
|
||||
if(thread == null || !thread.isAlive()) {
|
||||
terminate = false;
|
||||
thread = new Thread(this);
|
||||
thread.start();
|
||||
}
|
||||
}
|
||||
|
||||
public void terminate(){
|
||||
terminate = true;
|
||||
if(currentlyActive != null);
|
||||
currentlyActive.terminate();
|
||||
}
|
||||
|
||||
public boolean isRunning(){
|
||||
if(currentlyActive == null)
|
||||
return false;
|
||||
return currentlyActive.isRunning();
|
||||
}
|
||||
|
||||
public void run(){
|
||||
while(!terminate) {
|
||||
if(behaviours.isEmpty()) {
|
||||
terminate();
|
||||
break;
|
||||
}
|
||||
else if (currentlyActive == null)
|
||||
currentlyActive = behaviours.get(0);
|
||||
|
||||
Log.v(TAG, "Running behaviour: " + currentlyActive.getName());
|
||||
currentlyActive.run();
|
||||
|
||||
int index = behaviours.indexOf(currentlyActive) +1;
|
||||
if(index < behaviours.size())
|
||||
currentlyActive = behaviours.get(index);
|
||||
else
|
||||
currentlyActive = null;
|
||||
}
|
||||
Log.v(TAG, "Execution completed");
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void handledIncomingData(long size) {
|
||||
downloadSpeed.setHandledData(size);
|
||||
if(throughputListener != null && downloadSpeed.isUpdated())
|
||||
throughputListener.throughputUpdate(downloadSpeed.getBitThroughput(), uploadSpeed.getBitThroughput());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handledOutgoingData(long size) {
|
||||
uploadSpeed.setHandledData(size);
|
||||
if(throughputListener != null && uploadSpeed.isUpdated())
|
||||
throughputListener.throughputUpdate(downloadSpeed.getBitThroughput(), uploadSpeed.getBitThroughput());
|
||||
}
|
||||
|
||||
public void setThroughputListener(ThroughputListener listener){
|
||||
throughputListener = listener;
|
||||
}
|
||||
|
||||
public List<UeBehaviour> getBehaviourList() {
|
||||
return behaviours;
|
||||
}
|
||||
|
||||
public UeBehaviour getRunningBehaviour(){
|
||||
return currentlyActive;
|
||||
}
|
||||
|
||||
public static interface ThroughputListener{
|
||||
public void throughputUpdate(double downThroughput, double upThroughput);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,44 +1,44 @@
|
|||
package com.ericsson.uecontrol.core.behaviour;
|
||||
|
||||
import com.ericsson.uecontrol.core.UeBehaviour;
|
||||
import com.ericsson.uecontrol.gui.util.Configurator.Configurable;
|
||||
|
||||
/**
|
||||
* This behaviour simulates an idle period for the device.
|
||||
*
|
||||
* Created by ezivkoc on 2014-07-15.
|
||||
*/
|
||||
public class UeBehaviourSleep extends UeBehaviour{
|
||||
private static final int SLEEP_PERIOD = 100;
|
||||
|
||||
@Configurable("Sleep(millisec)")
|
||||
private int time;
|
||||
|
||||
public UeBehaviourSleep(){
|
||||
this(2000);
|
||||
}
|
||||
public UeBehaviourSleep(int milliseconds){
|
||||
time = milliseconds;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void execute() throws InterruptedException {
|
||||
int elapsedTime = 0;
|
||||
while(elapsedTime < time){
|
||||
super.setProgress((float)elapsedTime/time);
|
||||
if(super.stopExecution()) break;
|
||||
Thread.sleep(SLEEP_PERIOD);
|
||||
elapsedTime += SLEEP_PERIOD;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return "Sleep";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Will sleep for "+(time/1000)+" seconds";
|
||||
}
|
||||
}
|
||||
package com.ericsson.uecontrol.core.behaviour;
|
||||
|
||||
import com.ericsson.uecontrol.core.UeBehaviour;
|
||||
import com.ericsson.uecontrol.gui.util.Configurator.Configurable;
|
||||
|
||||
/**
|
||||
* This behaviour simulates an idle period for the device.
|
||||
*
|
||||
* Created by ezivkoc on 2014-07-15.
|
||||
*/
|
||||
public class UeBehaviourSleep extends UeBehaviour{
|
||||
private static final int SLEEP_PERIOD = 100;
|
||||
|
||||
@Configurable("Sleep(millisec)")
|
||||
private int time;
|
||||
|
||||
public UeBehaviourSleep(){
|
||||
this(2000);
|
||||
}
|
||||
public UeBehaviourSleep(int milliseconds){
|
||||
time = milliseconds;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void execute() throws InterruptedException {
|
||||
int elapsedTime = 0;
|
||||
while(elapsedTime < time){
|
||||
super.setProgress((float)elapsedTime/time);
|
||||
if(super.stopExecution()) break;
|
||||
Thread.sleep(SLEEP_PERIOD);
|
||||
elapsedTime += SLEEP_PERIOD;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return "Sleep";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Will sleep for "+(time/1000)+" seconds";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,123 +1,123 @@
|
|||
package com.ericsson.uecontrol.core.behaviour;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
import com.ericsson.uecontrol.core.UeBehaviour;
|
||||
import com.ericsson.uecontrol.gui.util.Configurator.Configurable;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.MalformedURLException;
|
||||
import java.net.URL;
|
||||
import java.net.URLConnection;
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Queue;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/**
|
||||
* This behaviour simulates visiting a website
|
||||
*
|
||||
* Created by ezivkoc on 2014-07-15.
|
||||
*/
|
||||
public class UeBehaviourSurfing extends UeBehaviour {
|
||||
|
||||
@Configurable("Web Address")
|
||||
private String rootUrl;
|
||||
|
||||
private long estimatedDataLength = -1;
|
||||
|
||||
public UeBehaviourSurfing(){
|
||||
this("http://google.com");
|
||||
}
|
||||
public UeBehaviourSurfing(String url){
|
||||
rootUrl = url;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void execute() throws IOException {
|
||||
if(!rootUrl.startsWith("http://"))
|
||||
rootUrl = "http://"+ rootUrl;
|
||||
|
||||
List<URL> urlList = new ArrayList<URL>();
|
||||
urlList.add(new URL(rootUrl));
|
||||
byte[] data = new byte[100];
|
||||
IOException retException = null;
|
||||
long totalRead = 0;
|
||||
|
||||
for(int i=0; i<urlList.size(); i++) {
|
||||
try {
|
||||
URL url = urlList.get(i);
|
||||
Log.v(getClass().getSimpleName(), "Downloading: " + url);
|
||||
|
||||
URLConnection connection = url.openConnection();
|
||||
connection.setUseCaches(false);
|
||||
connection.connect();
|
||||
InputStream in = connection.getInputStream();
|
||||
|
||||
if (estimatedDataLength < 0)
|
||||
estimatedDataLength = in.available();
|
||||
int read = 0;
|
||||
|
||||
StringBuilder content = new StringBuilder();
|
||||
while ((read = in.read(data)) != -1) {
|
||||
if(stopExecution())
|
||||
return;
|
||||
totalRead += read;
|
||||
super.setProgress((float) totalRead / estimatedDataLength);
|
||||
super.setHandledIncomingData(read);
|
||||
content.append(new String(data, 0, read));
|
||||
}
|
||||
getAdditionalContent(url, content.toString(), urlList);
|
||||
}catch(IOException e){
|
||||
e.printStackTrace();
|
||||
if(retException == null) retException = e;
|
||||
}
|
||||
}
|
||||
|
||||
estimatedDataLength = totalRead;
|
||||
if(retException != null)
|
||||
throw retException;
|
||||
}
|
||||
|
||||
private static final Pattern[] CONTENT_INCLUSION_PATTERNS = new Pattern[]{
|
||||
// [\w\/\.-]
|
||||
// HTML
|
||||
Pattern.compile("<img.* src=\"(.*?)\"", Pattern.CASE_INSENSITIVE),
|
||||
Pattern.compile("<iframe.* src=\"(.*?)\"", Pattern.CASE_INSENSITIVE),
|
||||
// CSS
|
||||
Pattern.compile("<link.*rel=\"stylesheet\".*href=\"(.*?)\".*>", Pattern.CASE_INSENSITIVE),
|
||||
Pattern.compile("@import [\"']?(.*?)[\"']?", Pattern.CASE_INSENSITIVE),
|
||||
Pattern.compile("(?:import|background)[\\W:]*url\\([\"']?(?![\"']?data:)(.*?)[\"']??\\)", Pattern.CASE_INSENSITIVE),
|
||||
// Javascript
|
||||
Pattern.compile("<script.* src=\"(.*?)\"", Pattern.CASE_INSENSITIVE)
|
||||
};
|
||||
private void getAdditionalContent(URL baseUrl, String data, List<URL> urlList){
|
||||
for(Pattern pattern : CONTENT_INCLUSION_PATTERNS){
|
||||
Matcher m = pattern.matcher(data);
|
||||
while(m.find()){
|
||||
try {
|
||||
String strUrl = m.group(1);
|
||||
URL url = new URL(baseUrl, strUrl);
|
||||
if(!urlList.contains(url))
|
||||
urlList.add(url);
|
||||
}catch(MalformedURLException e){
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return "Surfing";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Will visit "+ rootUrl;
|
||||
}
|
||||
}
|
||||
package com.ericsson.uecontrol.core.behaviour;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
import com.ericsson.uecontrol.core.UeBehaviour;
|
||||
import com.ericsson.uecontrol.gui.util.Configurator.Configurable;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.MalformedURLException;
|
||||
import java.net.URL;
|
||||
import java.net.URLConnection;
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Queue;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/**
|
||||
* This behaviour simulates visiting a website
|
||||
*
|
||||
* Created by ezivkoc on 2014-07-15.
|
||||
*/
|
||||
public class UeBehaviourSurfing extends UeBehaviour {
|
||||
|
||||
@Configurable("Web Address")
|
||||
private String rootUrl;
|
||||
|
||||
private long estimatedDataLength = -1;
|
||||
|
||||
public UeBehaviourSurfing(){
|
||||
this("http://google.com");
|
||||
}
|
||||
public UeBehaviourSurfing(String url){
|
||||
rootUrl = url;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void execute() throws IOException {
|
||||
if(!rootUrl.startsWith("http://"))
|
||||
rootUrl = "http://"+ rootUrl;
|
||||
|
||||
List<URL> urlList = new ArrayList<URL>();
|
||||
urlList.add(new URL(rootUrl));
|
||||
byte[] data = new byte[100];
|
||||
IOException retException = null;
|
||||
long totalRead = 0;
|
||||
|
||||
for(int i=0; i<urlList.size(); i++) {
|
||||
try {
|
||||
URL url = urlList.get(i);
|
||||
Log.v(getClass().getSimpleName(), "Downloading: " + url);
|
||||
|
||||
URLConnection connection = url.openConnection();
|
||||
connection.setUseCaches(false);
|
||||
connection.connect();
|
||||
InputStream in = connection.getInputStream();
|
||||
|
||||
if (estimatedDataLength < 0)
|
||||
estimatedDataLength = in.available();
|
||||
int read = 0;
|
||||
|
||||
StringBuilder content = new StringBuilder();
|
||||
while ((read = in.read(data)) != -1) {
|
||||
if(stopExecution())
|
||||
return;
|
||||
totalRead += read;
|
||||
super.setProgress((float) totalRead / estimatedDataLength);
|
||||
super.setHandledIncomingData(read);
|
||||
content.append(new String(data, 0, read));
|
||||
}
|
||||
getAdditionalContent(url, content.toString(), urlList);
|
||||
}catch(IOException e){
|
||||
e.printStackTrace();
|
||||
if(retException == null) retException = e;
|
||||
}
|
||||
}
|
||||
|
||||
estimatedDataLength = totalRead;
|
||||
if(retException != null)
|
||||
throw retException;
|
||||
}
|
||||
|
||||
private static final Pattern[] CONTENT_INCLUSION_PATTERNS = new Pattern[]{
|
||||
// [\w\/\.-]
|
||||
// HTML
|
||||
Pattern.compile("<img.* src=\"(.*?)\"", Pattern.CASE_INSENSITIVE),
|
||||
Pattern.compile("<iframe.* src=\"(.*?)\"", Pattern.CASE_INSENSITIVE),
|
||||
// CSS
|
||||
Pattern.compile("<link.*rel=\"stylesheet\".*href=\"(.*?)\".*>", Pattern.CASE_INSENSITIVE),
|
||||
Pattern.compile("@import [\"']?(.*?)[\"']?", Pattern.CASE_INSENSITIVE),
|
||||
Pattern.compile("(?:import|background)[\\W:]*url\\([\"']?(?![\"']?data:)(.*?)[\"']??\\)", Pattern.CASE_INSENSITIVE),
|
||||
// Javascript
|
||||
Pattern.compile("<script.* src=\"(.*?)\"", Pattern.CASE_INSENSITIVE)
|
||||
};
|
||||
private void getAdditionalContent(URL baseUrl, String data, List<URL> urlList){
|
||||
for(Pattern pattern : CONTENT_INCLUSION_PATTERNS){
|
||||
Matcher m = pattern.matcher(data);
|
||||
while(m.find()){
|
||||
try {
|
||||
String strUrl = m.group(1);
|
||||
URL url = new URL(baseUrl, strUrl);
|
||||
if(!urlList.contains(url))
|
||||
urlList.add(url);
|
||||
}catch(MalformedURLException e){
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return "Surfing";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Will visit "+ rootUrl;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,53 +1,53 @@
|
|||
package com.ericsson.uecontrol.core.util;
|
||||
|
||||
/**
|
||||
* Created by ezivkoc on 2014-07-22.
|
||||
*/
|
||||
public class ThroughputCalculator {
|
||||
public static final int UPDATES_PER_SEC = 2;
|
||||
public static final double NANOSEC_PER_SECOND = 1000000000.0;
|
||||
|
||||
private boolean updated;
|
||||
private double throughput;
|
||||
private long previousTimeStamp;
|
||||
private long data_amount;
|
||||
|
||||
|
||||
public void setHandledData(long bytes){
|
||||
long currentTimeStamp = System.nanoTime();
|
||||
data_amount += bytes;
|
||||
if(currentTimeStamp - (NANOSEC_PER_SECOND/UPDATES_PER_SEC) > previousTimeStamp) {
|
||||
throughput = data_amount / ((currentTimeStamp - previousTimeStamp) / (NANOSEC_PER_SECOND/UPDATES_PER_SEC));
|
||||
previousTimeStamp = currentTimeStamp;
|
||||
data_amount = 0;
|
||||
updated = true;
|
||||
}
|
||||
}
|
||||
|
||||
public double getByeThroughput(){
|
||||
setHandledData(0); // Update throughput
|
||||
updated = false;
|
||||
return throughput;
|
||||
}
|
||||
public double getBitThroughput(){
|
||||
return getByeThroughput()*8;
|
||||
}
|
||||
|
||||
public boolean isUpdated(){
|
||||
return updated;
|
||||
}
|
||||
|
||||
|
||||
private static final String[] DATA_SIZE = new String[]{"b/s", "kbit/s", "Mbit/s", "Gbit/s"};
|
||||
public static String getBitThroughputString(double bitsPerSec){
|
||||
int index = 0;
|
||||
double value = bitsPerSec;
|
||||
|
||||
for(; value > 1000 && index < DATA_SIZE.length ;index++) {
|
||||
value /= 1000;
|
||||
}
|
||||
|
||||
value = (int)(value*10) / 10.0;
|
||||
return value+" "+DATA_SIZE[index];
|
||||
}
|
||||
}
|
||||
package com.ericsson.uecontrol.core.util;
|
||||
|
||||
/**
|
||||
* Created by ezivkoc on 2014-07-22.
|
||||
*/
|
||||
public class ThroughputCalculator {
|
||||
public static final int UPDATES_PER_SEC = 2;
|
||||
public static final double NANOSEC_PER_SECOND = 1000000000.0;
|
||||
|
||||
private boolean updated;
|
||||
private double throughput;
|
||||
private long previousTimeStamp;
|
||||
private long data_amount;
|
||||
|
||||
|
||||
public void setHandledData(long bytes){
|
||||
long currentTimeStamp = System.nanoTime();
|
||||
data_amount += bytes;
|
||||
if(currentTimeStamp - (NANOSEC_PER_SECOND/UPDATES_PER_SEC) > previousTimeStamp) {
|
||||
throughput = data_amount / ((currentTimeStamp - previousTimeStamp) / (NANOSEC_PER_SECOND/UPDATES_PER_SEC));
|
||||
previousTimeStamp = currentTimeStamp;
|
||||
data_amount = 0;
|
||||
updated = true;
|
||||
}
|
||||
}
|
||||
|
||||
public double getByeThroughput(){
|
||||
setHandledData(0); // Update throughput
|
||||
updated = false;
|
||||
return throughput;
|
||||
}
|
||||
public double getBitThroughput(){
|
||||
return getByeThroughput()*8;
|
||||
}
|
||||
|
||||
public boolean isUpdated(){
|
||||
return updated;
|
||||
}
|
||||
|
||||
|
||||
private static final String[] DATA_SIZE = new String[]{"b/s", "kbit/s", "Mbit/s", "Gbit/s"};
|
||||
public static String getBitThroughputString(double bitsPerSec){
|
||||
int index = 0;
|
||||
double value = bitsPerSec;
|
||||
|
||||
for(; value > 1000 && index < DATA_SIZE.length ;index++) {
|
||||
value /= 1000;
|
||||
}
|
||||
|
||||
value = (int)(value*10) / 10.0;
|
||||
return value+" "+DATA_SIZE[index];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,88 +1,88 @@
|
|||
package com.ericsson.uecontrol.gui;
|
||||
|
||||
import android.app.ListActivity;
|
||||
import android.os.Bundle;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.ListView;
|
||||
|
||||
import com.ericsson.uecontrol.R;
|
||||
import com.ericsson.uecontrol.core.UeBehaviour;
|
||||
import com.ericsson.uecontrol.core.UeControlExecutor;
|
||||
import com.ericsson.uecontrol.gui.fragments.ConfigureDialog;
|
||||
import com.ericsson.uecontrol.gui.fragments.SelectBehaviourDialog;
|
||||
import com.ericsson.uecontrol.gui.util.BehaviourListAdapter;
|
||||
import com.ericsson.uecontrol.gui.util.Configurator;
|
||||
import com.ericsson.uecontrol.gui.util.DynamicListView;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class EditActivity extends ListActivity implements AdapterView.OnItemClickListener {
|
||||
private UeControlExecutor executor;
|
||||
private BehaviourListAdapter adapter;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_edit);
|
||||
|
||||
final List<UeBehaviour> list;
|
||||
executor = MainActivity.getExecutor();
|
||||
list = executor.getBehaviourList();
|
||||
|
||||
adapter = new BehaviourListAdapter(this, list);
|
||||
adapter.setEditable(true);
|
||||
DynamicListView listView = (DynamicListView) findViewById(android.R.id.list);
|
||||
listView.setAdapter(adapter);
|
||||
listView.setActionListener(adapter);
|
||||
listView.setOnItemClickListener(this);
|
||||
listView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean onCreateOptionsMenu(Menu menu) {
|
||||
// Inflate the menu; this adds items to the action bar if it is present.
|
||||
getMenuInflater().inflate(R.menu.edit, menu);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
// Handle action bar item clicks here. The action bar will
|
||||
// automatically handle clicks on the Home/Up button, so long
|
||||
// as you specify a parent activity in AndroidManifest.xml.
|
||||
int id = item.getItemId();
|
||||
if (id == R.id.action_add) {
|
||||
SelectBehaviourDialog selector = new SelectBehaviourDialog();
|
||||
selector.setSelectionCallback(new SelectBehaviourDialog.BehaviourSelectionCallback() {
|
||||
public void behaviourSelected(String name, Class<UeBehaviour> objClass) {
|
||||
try {
|
||||
UeBehaviour obj = objClass.newInstance();
|
||||
executor.addBehaviour(obj);
|
||||
adapter.generateIds();
|
||||
adapter.notifyDataSetChanged();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
});
|
||||
selector.show(getFragmentManager(), "behaviour_selector");
|
||||
return true;
|
||||
}
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
|
||||
UeBehaviour behaviour = executor.getBehaviourList().get(i);
|
||||
Configurator confer = new Configurator(behaviour);
|
||||
|
||||
ConfigureDialog dialog = new ConfigureDialog();
|
||||
dialog.setConfigurator(confer);
|
||||
dialog.show(getFragmentManager(), "behaviour_configurator");
|
||||
}
|
||||
}
|
||||
package com.ericsson.uecontrol.gui;
|
||||
|
||||
import android.app.ListActivity;
|
||||
import android.os.Bundle;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.ListView;
|
||||
|
||||
import com.ericsson.uecontrol.R;
|
||||
import com.ericsson.uecontrol.core.UeBehaviour;
|
||||
import com.ericsson.uecontrol.core.UeControlExecutor;
|
||||
import com.ericsson.uecontrol.gui.fragments.ConfigureDialog;
|
||||
import com.ericsson.uecontrol.gui.fragments.SelectBehaviourDialog;
|
||||
import com.ericsson.uecontrol.gui.util.BehaviourListAdapter;
|
||||
import com.ericsson.uecontrol.gui.util.Configurator;
|
||||
import com.ericsson.uecontrol.gui.util.DynamicListView;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class EditActivity extends ListActivity implements AdapterView.OnItemClickListener {
|
||||
private UeControlExecutor executor;
|
||||
private BehaviourListAdapter adapter;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_edit);
|
||||
|
||||
final List<UeBehaviour> list;
|
||||
executor = MainActivity.getExecutor();
|
||||
list = executor.getBehaviourList();
|
||||
|
||||
adapter = new BehaviourListAdapter(this, list);
|
||||
adapter.setEditable(true);
|
||||
DynamicListView listView = (DynamicListView) findViewById(android.R.id.list);
|
||||
listView.setAdapter(adapter);
|
||||
listView.setActionListener(adapter);
|
||||
listView.setOnItemClickListener(this);
|
||||
listView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean onCreateOptionsMenu(Menu menu) {
|
||||
// Inflate the menu; this adds items to the action bar if it is present.
|
||||
getMenuInflater().inflate(R.menu.edit, menu);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
// Handle action bar item clicks here. The action bar will
|
||||
// automatically handle clicks on the Home/Up button, so long
|
||||
// as you specify a parent activity in AndroidManifest.xml.
|
||||
int id = item.getItemId();
|
||||
if (id == R.id.action_add) {
|
||||
SelectBehaviourDialog selector = new SelectBehaviourDialog();
|
||||
selector.setSelectionCallback(new SelectBehaviourDialog.BehaviourSelectionCallback() {
|
||||
public void behaviourSelected(String name, Class<UeBehaviour> objClass) {
|
||||
try {
|
||||
UeBehaviour obj = objClass.newInstance();
|
||||
executor.addBehaviour(obj);
|
||||
adapter.generateIds();
|
||||
adapter.notifyDataSetChanged();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
});
|
||||
selector.show(getFragmentManager(), "behaviour_selector");
|
||||
return true;
|
||||
}
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
|
||||
UeBehaviour behaviour = executor.getBehaviourList().get(i);
|
||||
Configurator confer = new Configurator(behaviour);
|
||||
|
||||
ConfigureDialog dialog = new ConfigureDialog();
|
||||
dialog.setConfigurator(confer);
|
||||
dialog.show(getFragmentManager(), "behaviour_configurator");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,123 +1,123 @@
|
|||
package com.ericsson.uecontrol.gui;
|
||||
|
||||
import android.app.ActionBar;
|
||||
import android.app.FragmentManager;
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.os.Bundle;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.support.v4.app.FragmentActivity;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
|
||||
import com.ericsson.uecontrol.R;
|
||||
import com.ericsson.uecontrol.core.UeControlExecutor;
|
||||
import com.ericsson.uecontrol.core.behaviour.UeBehaviourFtp;
|
||||
import com.ericsson.uecontrol.core.behaviour.UeBehaviourSleep;
|
||||
import com.ericsson.uecontrol.core.behaviour.UeBehaviourSurfing;
|
||||
import com.ericsson.uecontrol.gui.fragments.BehaviourListFragment;
|
||||
import com.ericsson.uecontrol.gui.fragments.NavigationDrawerFragment;
|
||||
import com.ericsson.uecontrol.gui.fragments.StatusFragment;
|
||||
import com.ericsson.uecontrol.gui.util.CSVWriter;
|
||||
|
||||
|
||||
public class MainActivity extends FragmentActivity {
|
||||
|
||||
/**
|
||||
* Fragment managing the behaviors, interactions and presentation of the navigation drawer.
|
||||
*/
|
||||
private NavigationDrawerFragment navigationDrawerFragment;
|
||||
private StatusFragment statusFragment;
|
||||
|
||||
private static UeControlExecutor currentExecutor;
|
||||
private static CSVWriter logger;
|
||||
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_main);
|
||||
|
||||
//navigationDrawerFragment = (NavigationDrawerFragment)
|
||||
// getFragmentManager().findFragmentById(R.id.navigation_drawer);
|
||||
statusFragment = (StatusFragment)
|
||||
getFragmentManager().findFragmentById(R.id.status_fragment);
|
||||
getFragmentManager().beginTransaction()
|
||||
.replace(R.id.container, BehaviourListFragment.newInstance()).commit();
|
||||
|
||||
// Set up the drawer.
|
||||
//navigationDrawerFragment.setUp(
|
||||
// R.id.navigation_drawer,
|
||||
// (DrawerLayout) findViewById(R.id.drawer_layout));
|
||||
|
||||
currentExecutor = new UeControlExecutor();
|
||||
currentExecutor.addBehaviour(new UeBehaviourSleep());
|
||||
currentExecutor.addBehaviour(new UeBehaviourSurfing());
|
||||
currentExecutor.addBehaviour(new UeBehaviourSleep(4000));
|
||||
currentExecutor.setThroughputListener(statusFragment.getThroughputListener());
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean onCreateOptionsMenu(Menu menu) {
|
||||
if (navigationDrawerFragment == null || !navigationDrawerFragment.isDrawerOpen()) {
|
||||
// Only show items in the action bar relevant to this screen
|
||||
// if the drawer is not showing. Otherwise, let the drawer
|
||||
// decide what to show in the action bar.
|
||||
getMenuInflater().inflate(R.menu.main, menu);
|
||||
|
||||
ActionBar actionBar = getActionBar();
|
||||
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
|
||||
actionBar.setDisplayShowTitleEnabled(true);
|
||||
|
||||
return true;
|
||||
}
|
||||
return super.onCreateOptionsMenu(menu);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
// Handle action bar item clicks here. The action bar will
|
||||
// automatically handle clicks on the Home/Up button, so long
|
||||
// as you specify a parent activity in AndroidManifest.xml.
|
||||
int id = item.getItemId();
|
||||
if (id == R.id.action_execute) {
|
||||
if(currentExecutor.isRunning()){
|
||||
currentExecutor.terminate();
|
||||
item.setTitle(R.string.action_run);
|
||||
}
|
||||
else {
|
||||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
|
||||
if(prefs.getBoolean("logging", false))
|
||||
logger = new CSVWriter(this);
|
||||
else
|
||||
logger = null;
|
||||
currentExecutor.execute();
|
||||
item.setTitle(R.string.action_stop);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
if (id == R.id.action_edit) {
|
||||
Intent intent = new Intent(this, EditActivity.class);
|
||||
startActivity(intent);
|
||||
return true;
|
||||
}
|
||||
if (id == R.id.action_settings) {
|
||||
startActivity(new Intent(this, SettingsActivity.class));
|
||||
return true;
|
||||
}
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
|
||||
public static UeControlExecutor getExecutor() {
|
||||
return currentExecutor;
|
||||
}
|
||||
|
||||
public static void logThroughput(double downThroughput, double upThroughput) {
|
||||
if(logger == null || currentExecutor == null || currentExecutor.getRunningBehaviour() == null)
|
||||
return;
|
||||
|
||||
logger.write(currentExecutor.getRunningBehaviour().getName(), downThroughput, upThroughput);
|
||||
}
|
||||
}
|
||||
package com.ericsson.uecontrol.gui;
|
||||
|
||||
import android.app.ActionBar;
|
||||
import android.app.FragmentManager;
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.os.Bundle;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.support.v4.app.FragmentActivity;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
|
||||
import com.ericsson.uecontrol.R;
|
||||
import com.ericsson.uecontrol.core.UeControlExecutor;
|
||||
import com.ericsson.uecontrol.core.behaviour.UeBehaviourFtp;
|
||||
import com.ericsson.uecontrol.core.behaviour.UeBehaviourSleep;
|
||||
import com.ericsson.uecontrol.core.behaviour.UeBehaviourSurfing;
|
||||
import com.ericsson.uecontrol.gui.fragments.BehaviourListFragment;
|
||||
import com.ericsson.uecontrol.gui.fragments.NavigationDrawerFragment;
|
||||
import com.ericsson.uecontrol.gui.fragments.StatusFragment;
|
||||
import com.ericsson.uecontrol.gui.util.CSVWriter;
|
||||
|
||||
|
||||
public class MainActivity extends FragmentActivity {
|
||||
|
||||
/**
|
||||
* Fragment managing the behaviors, interactions and presentation of the navigation drawer.
|
||||
*/
|
||||
private NavigationDrawerFragment navigationDrawerFragment;
|
||||
private StatusFragment statusFragment;
|
||||
|
||||
private static UeControlExecutor currentExecutor;
|
||||
private static CSVWriter logger;
|
||||
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_main);
|
||||
|
||||
//navigationDrawerFragment = (NavigationDrawerFragment)
|
||||
// getFragmentManager().findFragmentById(R.id.navigation_drawer);
|
||||
statusFragment = (StatusFragment)
|
||||
getFragmentManager().findFragmentById(R.id.status_fragment);
|
||||
getFragmentManager().beginTransaction()
|
||||
.replace(R.id.container, BehaviourListFragment.newInstance()).commit();
|
||||
|
||||
// Set up the drawer.
|
||||
//navigationDrawerFragment.setUp(
|
||||
// R.id.navigation_drawer,
|
||||
// (DrawerLayout) findViewById(R.id.drawer_layout));
|
||||
|
||||
currentExecutor = new UeControlExecutor();
|
||||
currentExecutor.addBehaviour(new UeBehaviourSleep());
|
||||
currentExecutor.addBehaviour(new UeBehaviourSurfing());
|
||||
currentExecutor.addBehaviour(new UeBehaviourSleep(4000));
|
||||
currentExecutor.setThroughputListener(statusFragment.getThroughputListener());
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean onCreateOptionsMenu(Menu menu) {
|
||||
if (navigationDrawerFragment == null || !navigationDrawerFragment.isDrawerOpen()) {
|
||||
// Only show items in the action bar relevant to this screen
|
||||
// if the drawer is not showing. Otherwise, let the drawer
|
||||
// decide what to show in the action bar.
|
||||
getMenuInflater().inflate(R.menu.main, menu);
|
||||
|
||||
ActionBar actionBar = getActionBar();
|
||||
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
|
||||
actionBar.setDisplayShowTitleEnabled(true);
|
||||
|
||||
return true;
|
||||
}
|
||||
return super.onCreateOptionsMenu(menu);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
// Handle action bar item clicks here. The action bar will
|
||||
// automatically handle clicks on the Home/Up button, so long
|
||||
// as you specify a parent activity in AndroidManifest.xml.
|
||||
int id = item.getItemId();
|
||||
if (id == R.id.action_execute) {
|
||||
if(currentExecutor.isRunning()){
|
||||
currentExecutor.terminate();
|
||||
item.setTitle(R.string.action_run);
|
||||
}
|
||||
else {
|
||||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
|
||||
if(prefs.getBoolean("logging", false))
|
||||
logger = new CSVWriter(this);
|
||||
else
|
||||
logger = null;
|
||||
currentExecutor.execute();
|
||||
item.setTitle(R.string.action_stop);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
if (id == R.id.action_edit) {
|
||||
Intent intent = new Intent(this, EditActivity.class);
|
||||
startActivity(intent);
|
||||
return true;
|
||||
}
|
||||
if (id == R.id.action_settings) {
|
||||
startActivity(new Intent(this, SettingsActivity.class));
|
||||
return true;
|
||||
}
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
|
||||
public static UeControlExecutor getExecutor() {
|
||||
return currentExecutor;
|
||||
}
|
||||
|
||||
public static void logThroughput(double downThroughput, double upThroughput) {
|
||||
if(logger == null || currentExecutor == null || currentExecutor.getRunningBehaviour() == null)
|
||||
return;
|
||||
|
||||
logger.write(currentExecutor.getRunningBehaviour().getName(), downThroughput, upThroughput);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,43 +1,43 @@
|
|||
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;
|
||||
|
||||
public class SettingsActivity extends Activity {
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
// Display the fragment as the main content.
|
||||
getFragmentManager().beginTransaction()
|
||||
.replace(android.R.id.content, new SettingsFragment())
|
||||
.commit();
|
||||
|
||||
}
|
||||
|
||||
|
||||
public static class SettingsFragment extends PreferenceFragment {
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
// 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;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
public class SettingsActivity extends Activity {
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
// Display the fragment as the main content.
|
||||
getFragmentManager().beginTransaction()
|
||||
.replace(android.R.id.content, new SettingsFragment())
|
||||
.commit();
|
||||
|
||||
}
|
||||
|
||||
|
||||
public static class SettingsFragment extends PreferenceFragment {
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
// 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;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,92 +1,92 @@
|
|||
package com.ericsson.uecontrol.gui.fragments;
|
||||
|
||||
import android.app.Fragment;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.ericsson.uecontrol.R;
|
||||
import com.ericsson.uecontrol.core.UeControlExecutor;
|
||||
import com.ericsson.uecontrol.gui.MainActivity;
|
||||
import com.ericsson.uecontrol.gui.util.BehaviourListAdapter;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* This fragment will show a read only list of defined UeBehaviours
|
||||
*/
|
||||
public class BehaviourListFragment extends Fragment {
|
||||
|
||||
/**
|
||||
* The fragment's ListView/GridView.
|
||||
*/
|
||||
private AdapterView listView;
|
||||
|
||||
/**
|
||||
* The Adapter which will be used to populate the ListView/GridView with
|
||||
* Views.
|
||||
*/
|
||||
private BehaviourListAdapter adapter;
|
||||
private UeControlExecutor executor;
|
||||
|
||||
public static BehaviourListFragment newInstance() {
|
||||
BehaviourListFragment f = new BehaviourListFragment();
|
||||
// Supply index input as an argument.
|
||||
//Bundle args = new Bundle();
|
||||
//args.putInt("executor", index);
|
||||
//f.setArguments(args);
|
||||
return f;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
if(MainActivity.getExecutor() != null) {
|
||||
UeControlExecutor executor = MainActivity.getExecutor();
|
||||
adapter = new BehaviourListAdapter(getActivity(), executor.getBehaviourList());
|
||||
}
|
||||
else
|
||||
adapter = new BehaviourListAdapter(getActivity(), new ArrayList());
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
View view = inflater.inflate(R.layout.fragment_item, container, false);
|
||||
|
||||
// Set the adapter
|
||||
listView = (AdapterView) view.findViewById(android.R.id.list);
|
||||
listView.setAdapter(adapter);
|
||||
|
||||
setEmptyText("No Behaviours Defined");
|
||||
|
||||
return view;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResume() {
|
||||
adapter.generateIds();
|
||||
adapter.notifyDataSetChanged();
|
||||
super.onResume();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* The default content for this Fragment has a TextView that is shown when
|
||||
* the list is empty. If you would like to change the text, call this method
|
||||
* to supply the text it should use.
|
||||
*/
|
||||
public void setEmptyText(CharSequence emptyText) {
|
||||
View emptyView = listView.getEmptyView();
|
||||
|
||||
if (emptyText instanceof TextView) {
|
||||
((TextView) emptyView).setText(emptyText);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
package com.ericsson.uecontrol.gui.fragments;
|
||||
|
||||
import android.app.Fragment;
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.ericsson.uecontrol.R;
|
||||
import com.ericsson.uecontrol.core.UeControlExecutor;
|
||||
import com.ericsson.uecontrol.gui.MainActivity;
|
||||
import com.ericsson.uecontrol.gui.util.BehaviourListAdapter;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* This fragment will show a read only list of defined UeBehaviours
|
||||
*/
|
||||
public class BehaviourListFragment extends Fragment {
|
||||
|
||||
/**
|
||||
* The fragment's ListView/GridView.
|
||||
*/
|
||||
private AdapterView listView;
|
||||
|
||||
/**
|
||||
* The Adapter which will be used to populate the ListView/GridView with
|
||||
* Views.
|
||||
*/
|
||||
private BehaviourListAdapter adapter;
|
||||
private UeControlExecutor executor;
|
||||
|
||||
public static BehaviourListFragment newInstance() {
|
||||
BehaviourListFragment f = new BehaviourListFragment();
|
||||
// Supply index input as an argument.
|
||||
//Bundle args = new Bundle();
|
||||
//args.putInt("executor", index);
|
||||
//f.setArguments(args);
|
||||
return f;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
if(MainActivity.getExecutor() != null) {
|
||||
UeControlExecutor executor = MainActivity.getExecutor();
|
||||
adapter = new BehaviourListAdapter(getActivity(), executor.getBehaviourList());
|
||||
}
|
||||
else
|
||||
adapter = new BehaviourListAdapter(getActivity(), new ArrayList());
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
View view = inflater.inflate(R.layout.fragment_item, container, false);
|
||||
|
||||
// Set the adapter
|
||||
listView = (AdapterView) view.findViewById(android.R.id.list);
|
||||
listView.setAdapter(adapter);
|
||||
|
||||
setEmptyText("No Behaviours Defined");
|
||||
|
||||
return view;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResume() {
|
||||
adapter.generateIds();
|
||||
adapter.notifyDataSetChanged();
|
||||
super.onResume();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* The default content for this Fragment has a TextView that is shown when
|
||||
* the list is empty. If you would like to change the text, call this method
|
||||
* to supply the text it should use.
|
||||
*/
|
||||
public void setEmptyText(CharSequence emptyText) {
|
||||
View emptyView = listView.getEmptyView();
|
||||
|
||||
if (emptyText instanceof TextView) {
|
||||
((TextView) emptyView).setText(emptyText);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,283 +1,283 @@
|
|||
package com.ericsson.uecontrol.gui.fragments;
|
||||
|
||||
|
||||
import android.app.ActionBar;
|
||||
import android.app.Activity;
|
||||
import android.app.Fragment;
|
||||
import android.content.SharedPreferences;
|
||||
import android.content.res.Configuration;
|
||||
import android.os.Bundle;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.support.v4.app.ActionBarDrawerToggle;
|
||||
import android.support.v4.view.GravityCompat;
|
||||
import android.support.v4.widget.DrawerLayout;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuInflater;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.ListView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.ericsson.uecontrol.R;
|
||||
|
||||
/**
|
||||
* Fragment used for managing interactions for and presentation of a navigation drawer.
|
||||
* See the <a href="https://developer.android.com/design/patterns/navigation-drawer.html#Interaction">
|
||||
* design guidelines</a> for a complete explanation of the behaviors implemented here.
|
||||
*/
|
||||
public class NavigationDrawerFragment extends Fragment {
|
||||
|
||||
/**
|
||||
* Remember the position of the selected item.
|
||||
*/
|
||||
private static final String STATE_SELECTED_POSITION = "selected_navigation_drawer_position";
|
||||
|
||||
/**
|
||||
* Per the design guidelines, you should show the drawer on launch until the user manually
|
||||
* expands it. This shared preference tracks this.
|
||||
*/
|
||||
private static final String PREF_USER_LEARNED_DRAWER = "navigation_drawer_learned";
|
||||
|
||||
/**
|
||||
* A pointer to the current callbacks instance (the Activity).
|
||||
*/
|
||||
private NavigationDrawerCallbacks mCallbacks;
|
||||
|
||||
/**
|
||||
* Helper component that ties the action bar to the navigation drawer.
|
||||
*/
|
||||
private ActionBarDrawerToggle mDrawerToggle;
|
||||
|
||||
private DrawerLayout mDrawerLayout;
|
||||
private ListView mDrawerListView;
|
||||
private View mFragmentContainerView;
|
||||
|
||||
private int mCurrentSelectedPosition = 0;
|
||||
private boolean mFromSavedInstanceState;
|
||||
private boolean mUserLearnedDrawer;
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
// Read in the flag indicating whether or not the user has demonstrated awareness of the
|
||||
// drawer. See PREF_USER_LEARNED_DRAWER for details.
|
||||
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getActivity());
|
||||
mUserLearnedDrawer = sp.getBoolean(PREF_USER_LEARNED_DRAWER, false);
|
||||
|
||||
if (savedInstanceState != null) {
|
||||
mCurrentSelectedPosition = savedInstanceState.getInt(STATE_SELECTED_POSITION);
|
||||
mFromSavedInstanceState = true;
|
||||
}
|
||||
|
||||
// Select either the default item (0) or the last selected item.
|
||||
selectItem(mCurrentSelectedPosition);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onActivityCreated (Bundle savedInstanceState) {
|
||||
super.onActivityCreated(savedInstanceState);
|
||||
// Indicate that this fragment would like to influence the set of actions in the action bar.
|
||||
setHasOptionsMenu(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
mDrawerListView = (ListView) inflater.inflate(
|
||||
R.layout.fragment_navigation_drawer, container, false);
|
||||
mDrawerListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
||||
@Override
|
||||
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
||||
selectItem(position);
|
||||
}
|
||||
});
|
||||
mDrawerListView.setAdapter(new ArrayAdapter<String>(
|
||||
getActionBar().getThemedContext(),
|
||||
android.R.layout.simple_list_item_activated_1,
|
||||
android.R.id.text1,
|
||||
new String[]{
|
||||
getString(R.string.title_section1),
|
||||
getString(R.string.title_section2),
|
||||
getString(R.string.title_section3),
|
||||
}));
|
||||
mDrawerListView.setItemChecked(mCurrentSelectedPosition, true);
|
||||
return mDrawerListView;
|
||||
}
|
||||
|
||||
public boolean isDrawerOpen() {
|
||||
return mDrawerLayout != null && mDrawerLayout.isDrawerOpen(mFragmentContainerView);
|
||||
}
|
||||
|
||||
/**
|
||||
* Users of this fragment must call this method to set up the navigation drawer interactions.
|
||||
*
|
||||
* @param fragmentId The android:id of this fragment in its activity's layout.
|
||||
* @param drawerLayout The DrawerLayout containing this fragment's UI.
|
||||
*/
|
||||
public void setUp(int fragmentId, DrawerLayout drawerLayout) {
|
||||
mFragmentContainerView = getActivity().findViewById(fragmentId);
|
||||
mDrawerLayout = drawerLayout;
|
||||
|
||||
// set a custom shadow that overlays the main content when the drawer opens
|
||||
mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START);
|
||||
// set up the drawer's list view with items and click listener
|
||||
|
||||
ActionBar actionBar = getActionBar();
|
||||
actionBar.setDisplayHomeAsUpEnabled(true);
|
||||
actionBar.setHomeButtonEnabled(true);
|
||||
|
||||
// ActionBarDrawerToggle ties together the the proper interactions
|
||||
// between the navigation drawer and the action bar app icon.
|
||||
mDrawerToggle = new ActionBarDrawerToggle(
|
||||
getActivity(), /* host Activity */
|
||||
mDrawerLayout, /* DrawerLayout object */
|
||||
R.drawable.ic_drawer, /* nav drawer image to replace 'Up' caret */
|
||||
R.string.navigation_drawer_open, /* "open drawer" description for accessibility */
|
||||
R.string.navigation_drawer_close /* "close drawer" description for accessibility */
|
||||
) {
|
||||
@Override
|
||||
public void onDrawerClosed(View drawerView) {
|
||||
super.onDrawerClosed(drawerView);
|
||||
if (!isAdded()) {
|
||||
return;
|
||||
}
|
||||
|
||||
getActivity().invalidateOptionsMenu(); // calls onPrepareOptionsMenu()
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDrawerOpened(View drawerView) {
|
||||
super.onDrawerOpened(drawerView);
|
||||
if (!isAdded()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!mUserLearnedDrawer) {
|
||||
// The user manually opened the drawer; store this flag to prevent auto-showing
|
||||
// the navigation drawer automatically in the future.
|
||||
mUserLearnedDrawer = true;
|
||||
SharedPreferences sp = PreferenceManager
|
||||
.getDefaultSharedPreferences(getActivity());
|
||||
sp.edit().putBoolean(PREF_USER_LEARNED_DRAWER, true).apply();
|
||||
}
|
||||
|
||||
getActivity().invalidateOptionsMenu(); // calls onPrepareOptionsMenu()
|
||||
}
|
||||
};
|
||||
|
||||
// If the user hasn't 'learned' about the drawer, open it to introduce them to the drawer,
|
||||
// per the navigation drawer design guidelines.
|
||||
if (!mUserLearnedDrawer && !mFromSavedInstanceState) {
|
||||
mDrawerLayout.openDrawer(mFragmentContainerView);
|
||||
}
|
||||
|
||||
// Defer code dependent on restoration of previous instance state.
|
||||
mDrawerLayout.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
mDrawerToggle.syncState();
|
||||
}
|
||||
});
|
||||
|
||||
mDrawerLayout.setDrawerListener(mDrawerToggle);
|
||||
}
|
||||
|
||||
private void selectItem(int position) {
|
||||
mCurrentSelectedPosition = position;
|
||||
if (mDrawerListView != null) {
|
||||
mDrawerListView.setItemChecked(position, true);
|
||||
}
|
||||
if (mDrawerLayout != null) {
|
||||
mDrawerLayout.closeDrawer(mFragmentContainerView);
|
||||
}
|
||||
if (mCallbacks != null) {
|
||||
mCallbacks.onNavigationDrawerItemSelected(position);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAttach(Activity activity) {
|
||||
super.onAttach(activity);
|
||||
try {
|
||||
mCallbacks = (NavigationDrawerCallbacks) activity;
|
||||
} catch (ClassCastException e) {
|
||||
throw new ClassCastException("Activity must implement NavigationDrawerCallbacks.");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDetach() {
|
||||
super.onDetach();
|
||||
mCallbacks = null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSaveInstanceState(Bundle outState) {
|
||||
super.onSaveInstanceState(outState);
|
||||
outState.putInt(STATE_SELECTED_POSITION, mCurrentSelectedPosition);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onConfigurationChanged(Configuration newConfig) {
|
||||
super.onConfigurationChanged(newConfig);
|
||||
// Forward the new configuration the drawer toggle component.
|
||||
mDrawerToggle.onConfigurationChanged(newConfig);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
|
||||
// If the drawer is open, show the global app actions in the action bar. See also
|
||||
// showGlobalContextActionBar, which controls the top-left area of the action bar.
|
||||
if (mDrawerLayout != null && isDrawerOpen()) {
|
||||
inflater.inflate(R.menu.global, menu);
|
||||
showGlobalContextActionBar();
|
||||
}
|
||||
super.onCreateOptionsMenu(menu, inflater);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
if (mDrawerToggle.onOptionsItemSelected(item)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (item.getItemId() == R.id.action_execute) {
|
||||
Toast.makeText(getActivity(), "Running", Toast.LENGTH_SHORT).show();
|
||||
return true;
|
||||
}
|
||||
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
|
||||
/**
|
||||
* Per the navigation drawer design guidelines, updates the action bar to show the global app
|
||||
* 'context', rather than just what's in the current screen.
|
||||
*/
|
||||
private void showGlobalContextActionBar() {
|
||||
ActionBar actionBar = getActionBar();
|
||||
actionBar.setDisplayShowTitleEnabled(true);
|
||||
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
|
||||
actionBar.setTitle(R.string.app_name);
|
||||
}
|
||||
|
||||
private ActionBar getActionBar() {
|
||||
return getActivity().getActionBar();
|
||||
}
|
||||
|
||||
/**
|
||||
* Callbacks interface that all activities using this fragment must implement.
|
||||
*/
|
||||
public static interface NavigationDrawerCallbacks {
|
||||
/**
|
||||
* Called when an item in the navigation drawer is selected.
|
||||
*/
|
||||
void onNavigationDrawerItemSelected(int position);
|
||||
}
|
||||
}
|
||||
package com.ericsson.uecontrol.gui.fragments;
|
||||
|
||||
|
||||
import android.app.ActionBar;
|
||||
import android.app.Activity;
|
||||
import android.app.Fragment;
|
||||
import android.content.SharedPreferences;
|
||||
import android.content.res.Configuration;
|
||||
import android.os.Bundle;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.support.v4.app.ActionBarDrawerToggle;
|
||||
import android.support.v4.view.GravityCompat;
|
||||
import android.support.v4.widget.DrawerLayout;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuInflater;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.ListView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.ericsson.uecontrol.R;
|
||||
|
||||
/**
|
||||
* Fragment used for managing interactions for and presentation of a navigation drawer.
|
||||
* See the <a href="https://developer.android.com/design/patterns/navigation-drawer.html#Interaction">
|
||||
* design guidelines</a> for a complete explanation of the behaviors implemented here.
|
||||
*/
|
||||
public class NavigationDrawerFragment extends Fragment {
|
||||
|
||||
/**
|
||||
* Remember the position of the selected item.
|
||||
*/
|
||||
private static final String STATE_SELECTED_POSITION = "selected_navigation_drawer_position";
|
||||
|
||||
/**
|
||||
* Per the design guidelines, you should show the drawer on launch until the user manually
|
||||
* expands it. This shared preference tracks this.
|
||||
*/
|
||||
private static final String PREF_USER_LEARNED_DRAWER = "navigation_drawer_learned";
|
||||
|
||||
/**
|
||||
* A pointer to the current callbacks instance (the Activity).
|
||||
*/
|
||||
private NavigationDrawerCallbacks mCallbacks;
|
||||
|
||||
/**
|
||||
* Helper component that ties the action bar to the navigation drawer.
|
||||
*/
|
||||
private ActionBarDrawerToggle mDrawerToggle;
|
||||
|
||||
private DrawerLayout mDrawerLayout;
|
||||
private ListView mDrawerListView;
|
||||
private View mFragmentContainerView;
|
||||
|
||||
private int mCurrentSelectedPosition = 0;
|
||||
private boolean mFromSavedInstanceState;
|
||||
private boolean mUserLearnedDrawer;
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
// Read in the flag indicating whether or not the user has demonstrated awareness of the
|
||||
// drawer. See PREF_USER_LEARNED_DRAWER for details.
|
||||
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getActivity());
|
||||
mUserLearnedDrawer = sp.getBoolean(PREF_USER_LEARNED_DRAWER, false);
|
||||
|
||||
if (savedInstanceState != null) {
|
||||
mCurrentSelectedPosition = savedInstanceState.getInt(STATE_SELECTED_POSITION);
|
||||
mFromSavedInstanceState = true;
|
||||
}
|
||||
|
||||
// Select either the default item (0) or the last selected item.
|
||||
selectItem(mCurrentSelectedPosition);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onActivityCreated (Bundle savedInstanceState) {
|
||||
super.onActivityCreated(savedInstanceState);
|
||||
// Indicate that this fragment would like to influence the set of actions in the action bar.
|
||||
setHasOptionsMenu(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
mDrawerListView = (ListView) inflater.inflate(
|
||||
R.layout.fragment_navigation_drawer, container, false);
|
||||
mDrawerListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
||||
@Override
|
||||
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
||||
selectItem(position);
|
||||
}
|
||||
});
|
||||
mDrawerListView.setAdapter(new ArrayAdapter<String>(
|
||||
getActionBar().getThemedContext(),
|
||||
android.R.layout.simple_list_item_activated_1,
|
||||
android.R.id.text1,
|
||||
new String[]{
|
||||
getString(R.string.title_section1),
|
||||
getString(R.string.title_section2),
|
||||
getString(R.string.title_section3),
|
||||
}));
|
||||
mDrawerListView.setItemChecked(mCurrentSelectedPosition, true);
|
||||
return mDrawerListView;
|
||||
}
|
||||
|
||||
public boolean isDrawerOpen() {
|
||||
return mDrawerLayout != null && mDrawerLayout.isDrawerOpen(mFragmentContainerView);
|
||||
}
|
||||
|
||||
/**
|
||||
* Users of this fragment must call this method to set up the navigation drawer interactions.
|
||||
*
|
||||
* @param fragmentId The android:id of this fragment in its activity's layout.
|
||||
* @param drawerLayout The DrawerLayout containing this fragment's UI.
|
||||
*/
|
||||
public void setUp(int fragmentId, DrawerLayout drawerLayout) {
|
||||
mFragmentContainerView = getActivity().findViewById(fragmentId);
|
||||
mDrawerLayout = drawerLayout;
|
||||
|
||||
// set a custom shadow that overlays the main content when the drawer opens
|
||||
mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START);
|
||||
// set up the drawer's list view with items and click listener
|
||||
|
||||
ActionBar actionBar = getActionBar();
|
||||
actionBar.setDisplayHomeAsUpEnabled(true);
|
||||
actionBar.setHomeButtonEnabled(true);
|
||||
|
||||
// ActionBarDrawerToggle ties together the the proper interactions
|
||||
// between the navigation drawer and the action bar app icon.
|
||||
mDrawerToggle = new ActionBarDrawerToggle(
|
||||
getActivity(), /* host Activity */
|
||||
mDrawerLayout, /* DrawerLayout object */
|
||||
R.drawable.ic_drawer, /* nav drawer image to replace 'Up' caret */
|
||||
R.string.navigation_drawer_open, /* "open drawer" description for accessibility */
|
||||
R.string.navigation_drawer_close /* "close drawer" description for accessibility */
|
||||
) {
|
||||
@Override
|
||||
public void onDrawerClosed(View drawerView) {
|
||||
super.onDrawerClosed(drawerView);
|
||||
if (!isAdded()) {
|
||||
return;
|
||||
}
|
||||
|
||||
getActivity().invalidateOptionsMenu(); // calls onPrepareOptionsMenu()
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDrawerOpened(View drawerView) {
|
||||
super.onDrawerOpened(drawerView);
|
||||
if (!isAdded()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!mUserLearnedDrawer) {
|
||||
// The user manually opened the drawer; store this flag to prevent auto-showing
|
||||
// the navigation drawer automatically in the future.
|
||||
mUserLearnedDrawer = true;
|
||||
SharedPreferences sp = PreferenceManager
|
||||
.getDefaultSharedPreferences(getActivity());
|
||||
sp.edit().putBoolean(PREF_USER_LEARNED_DRAWER, true).apply();
|
||||
}
|
||||
|
||||
getActivity().invalidateOptionsMenu(); // calls onPrepareOptionsMenu()
|
||||
}
|
||||
};
|
||||
|
||||
// If the user hasn't 'learned' about the drawer, open it to introduce them to the drawer,
|
||||
// per the navigation drawer design guidelines.
|
||||
if (!mUserLearnedDrawer && !mFromSavedInstanceState) {
|
||||
mDrawerLayout.openDrawer(mFragmentContainerView);
|
||||
}
|
||||
|
||||
// Defer code dependent on restoration of previous instance state.
|
||||
mDrawerLayout.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
mDrawerToggle.syncState();
|
||||
}
|
||||
});
|
||||
|
||||
mDrawerLayout.setDrawerListener(mDrawerToggle);
|
||||
}
|
||||
|
||||
private void selectItem(int position) {
|
||||
mCurrentSelectedPosition = position;
|
||||
if (mDrawerListView != null) {
|
||||
mDrawerListView.setItemChecked(position, true);
|
||||
}
|
||||
if (mDrawerLayout != null) {
|
||||
mDrawerLayout.closeDrawer(mFragmentContainerView);
|
||||
}
|
||||
if (mCallbacks != null) {
|
||||
mCallbacks.onNavigationDrawerItemSelected(position);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAttach(Activity activity) {
|
||||
super.onAttach(activity);
|
||||
try {
|
||||
mCallbacks = (NavigationDrawerCallbacks) activity;
|
||||
} catch (ClassCastException e) {
|
||||
throw new ClassCastException("Activity must implement NavigationDrawerCallbacks.");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDetach() {
|
||||
super.onDetach();
|
||||
mCallbacks = null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSaveInstanceState(Bundle outState) {
|
||||
super.onSaveInstanceState(outState);
|
||||
outState.putInt(STATE_SELECTED_POSITION, mCurrentSelectedPosition);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onConfigurationChanged(Configuration newConfig) {
|
||||
super.onConfigurationChanged(newConfig);
|
||||
// Forward the new configuration the drawer toggle component.
|
||||
mDrawerToggle.onConfigurationChanged(newConfig);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
|
||||
// If the drawer is open, show the global app actions in the action bar. See also
|
||||
// showGlobalContextActionBar, which controls the top-left area of the action bar.
|
||||
if (mDrawerLayout != null && isDrawerOpen()) {
|
||||
inflater.inflate(R.menu.global, menu);
|
||||
showGlobalContextActionBar();
|
||||
}
|
||||
super.onCreateOptionsMenu(menu, inflater);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
if (mDrawerToggle.onOptionsItemSelected(item)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (item.getItemId() == R.id.action_execute) {
|
||||
Toast.makeText(getActivity(), "Running", Toast.LENGTH_SHORT).show();
|
||||
return true;
|
||||
}
|
||||
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
|
||||
/**
|
||||
* Per the navigation drawer design guidelines, updates the action bar to show the global app
|
||||
* 'context', rather than just what's in the current screen.
|
||||
*/
|
||||
private void showGlobalContextActionBar() {
|
||||
ActionBar actionBar = getActionBar();
|
||||
actionBar.setDisplayShowTitleEnabled(true);
|
||||
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
|
||||
actionBar.setTitle(R.string.app_name);
|
||||
}
|
||||
|
||||
private ActionBar getActionBar() {
|
||||
return getActivity().getActionBar();
|
||||
}
|
||||
|
||||
/**
|
||||
* Callbacks interface that all activities using this fragment must implement.
|
||||
*/
|
||||
public static interface NavigationDrawerCallbacks {
|
||||
/**
|
||||
* Called when an item in the navigation drawer is selected.
|
||||
*/
|
||||
void onNavigationDrawerItemSelected(int position);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,65 +1,65 @@
|
|||
package com.ericsson.uecontrol.gui.fragments;
|
||||
|
||||
import android.app.AlertDialog;
|
||||
import android.app.Dialog;
|
||||
import android.app.DialogFragment;
|
||||
import android.content.DialogInterface;
|
||||
import android.os.Bundle;
|
||||
|
||||
import com.ericsson.uecontrol.R;
|
||||
import com.ericsson.uecontrol.core.UeBehaviour;
|
||||
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public class SelectBehaviourDialog extends DialogFragment {
|
||||
public static String[] behaviourClasses;
|
||||
public static String[] behaviourNames;
|
||||
|
||||
private BehaviourSelectionCallback callback;
|
||||
|
||||
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
// Generate nice behaviour names
|
||||
if(behaviourClasses == null) {
|
||||
behaviourClasses = getResources().getStringArray(R.array.behaviours);
|
||||
behaviourNames = new String[behaviourClasses.length];
|
||||
|
||||
for (int i = 0; i < behaviourClasses.length; i++) {
|
||||
try {
|
||||
UeBehaviour obj = (UeBehaviour) Class.forName(behaviourClasses[i]).newInstance();
|
||||
behaviourNames[i] = obj.getName();
|
||||
}catch(Exception e){
|
||||
e.printStackTrace();
|
||||
behaviourNames[i] = behaviourClasses[i];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Create dialog
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
|
||||
builder.setTitle(R.string.select_behaviour);
|
||||
builder.setItems(behaviourNames, new DialogInterface.OnClickListener() {
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
try {
|
||||
if (callback != null){
|
||||
Class objClass = Class.forName(behaviourClasses[which]);
|
||||
callback.behaviourSelected(behaviourNames[which], objClass);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
});
|
||||
return builder.create();
|
||||
}
|
||||
|
||||
public void setSelectionCallback(BehaviourSelectionCallback c){
|
||||
callback = c;
|
||||
}
|
||||
|
||||
public static interface BehaviourSelectionCallback{
|
||||
public void behaviourSelected(String name, Class<UeBehaviour> objClass);
|
||||
}
|
||||
package com.ericsson.uecontrol.gui.fragments;
|
||||
|
||||
import android.app.AlertDialog;
|
||||
import android.app.Dialog;
|
||||
import android.app.DialogFragment;
|
||||
import android.content.DialogInterface;
|
||||
import android.os.Bundle;
|
||||
|
||||
import com.ericsson.uecontrol.R;
|
||||
import com.ericsson.uecontrol.core.UeBehaviour;
|
||||
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public class SelectBehaviourDialog extends DialogFragment {
|
||||
public static String[] behaviourClasses;
|
||||
public static String[] behaviourNames;
|
||||
|
||||
private BehaviourSelectionCallback callback;
|
||||
|
||||
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
// Generate nice behaviour names
|
||||
if(behaviourClasses == null) {
|
||||
behaviourClasses = getResources().getStringArray(R.array.behaviours);
|
||||
behaviourNames = new String[behaviourClasses.length];
|
||||
|
||||
for (int i = 0; i < behaviourClasses.length; i++) {
|
||||
try {
|
||||
UeBehaviour obj = (UeBehaviour) Class.forName(behaviourClasses[i]).newInstance();
|
||||
behaviourNames[i] = obj.getName();
|
||||
}catch(Exception e){
|
||||
e.printStackTrace();
|
||||
behaviourNames[i] = behaviourClasses[i];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Create dialog
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
|
||||
builder.setTitle(R.string.select_behaviour);
|
||||
builder.setItems(behaviourNames, new DialogInterface.OnClickListener() {
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
try {
|
||||
if (callback != null){
|
||||
Class objClass = Class.forName(behaviourClasses[which]);
|
||||
callback.behaviourSelected(behaviourNames[which], objClass);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
});
|
||||
return builder.create();
|
||||
}
|
||||
|
||||
public void setSelectionCallback(BehaviourSelectionCallback c){
|
||||
callback = c;
|
||||
}
|
||||
|
||||
public static interface BehaviourSelectionCallback{
|
||||
public void behaviourSelected(String name, Class<UeBehaviour> objClass);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,92 +1,92 @@
|
|||
package com.ericsson.uecontrol.gui.fragments;
|
||||
|
||||
import android.app.Fragment;
|
||||
import android.content.Context;
|
||||
import android.graphics.Color;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.net.NetworkInfo;
|
||||
import android.net.wifi.WifiInfo;
|
||||
import android.net.wifi.WifiManager;
|
||||
import android.os.Bundle;
|
||||
import android.telephony.TelephonyManager;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.LinearLayout.LayoutParams;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.ericsson.uecontrol.R;
|
||||
import com.ericsson.uecontrol.core.UeControlExecutor;
|
||||
import com.ericsson.uecontrol.core.util.ThroughputCalculator;
|
||||
import com.ericsson.uecontrol.gui.MainActivity;
|
||||
import com.ericsson.uecontrol.gui.util.CSVWriter;
|
||||
import com.jjoe64.graphview.GraphView.GraphViewData;
|
||||
import com.jjoe64.graphview.GraphViewSeries;
|
||||
import com.jjoe64.graphview.GraphViewSeries.GraphViewSeriesStyle;
|
||||
import com.jjoe64.graphview.GraphViewStyle;
|
||||
import com.jjoe64.graphview.LineGraphView;
|
||||
|
||||
|
||||
/**
|
||||
* Created by ezivkoc on 2014-07-15.
|
||||
*/
|
||||
public class StatusFragment extends Fragment {
|
||||
private TextView down_speed;
|
||||
private TextView up_speed;
|
||||
private GraphViewSeries downGraph;
|
||||
private GraphViewSeries upGraph;
|
||||
private int x = 0;
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
// Inflate the layout for this fragment
|
||||
View view = inflater.inflate(R.layout.fragment_status, container, false);
|
||||
|
||||
down_speed = (TextView) view.findViewById(R.id.down_speed);
|
||||
up_speed = (TextView) view.findViewById(R.id.up_speed);
|
||||
|
||||
// Init the graph
|
||||
GraphViewData[] zeroPoint = new GraphViewData[]{new GraphViewData(0, 0)};
|
||||
downGraph = new GraphViewSeries("Download Throughput", new GraphViewSeriesStyle(Color.GREEN, 3), zeroPoint);
|
||||
upGraph = new GraphViewSeries("Upload Throughput" , new GraphViewSeriesStyle(Color.RED , 3), zeroPoint);
|
||||
|
||||
LineGraphView graphView = new LineGraphView(this.getActivity(), "GraphViewDemo");
|
||||
graphView.addSeries(downGraph);
|
||||
graphView.addSeries(upGraph);
|
||||
//graphView.setDrawDataPoints(true);
|
||||
graphView.setScrollable(true);
|
||||
graphView.setViewPort(0, 120);
|
||||
graphView.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
|
||||
graphView.getGraphViewStyle().setGridStyle(GraphViewStyle.GridStyle.BOTH);
|
||||
|
||||
LinearLayout layout = (LinearLayout) view.findViewById(R.id.graph);
|
||||
layout.addView(graphView);
|
||||
|
||||
return view;
|
||||
}
|
||||
|
||||
|
||||
private UeControlExecutor.ThroughputListener throughputListener =
|
||||
new UeControlExecutor.ThroughputListener() {
|
||||
public void throughputUpdate(final double downThroughput, final double upThroughput) {
|
||||
if(down_speed != null && up_speed != null)
|
||||
down_speed.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
down_speed.setText(ThroughputCalculator.getBitThroughputString(downThroughput));
|
||||
up_speed.setText(ThroughputCalculator.getBitThroughputString(upThroughput));
|
||||
downGraph.appendData(new GraphViewData(x, downThroughput), true, 120);
|
||||
upGraph.appendData(new GraphViewData(x, upThroughput), true, 120);
|
||||
x++;
|
||||
|
||||
MainActivity.logThroughput(downThroughput, upThroughput);
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
public UeControlExecutor.ThroughputListener getThroughputListener(){
|
||||
return throughputListener;
|
||||
}
|
||||
package com.ericsson.uecontrol.gui.fragments;
|
||||
|
||||
import android.app.Fragment;
|
||||
import android.content.Context;
|
||||
import android.graphics.Color;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.net.NetworkInfo;
|
||||
import android.net.wifi.WifiInfo;
|
||||
import android.net.wifi.WifiManager;
|
||||
import android.os.Bundle;
|
||||
import android.telephony.TelephonyManager;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.LinearLayout.LayoutParams;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.ericsson.uecontrol.R;
|
||||
import com.ericsson.uecontrol.core.UeControlExecutor;
|
||||
import com.ericsson.uecontrol.core.util.ThroughputCalculator;
|
||||
import com.ericsson.uecontrol.gui.MainActivity;
|
||||
import com.ericsson.uecontrol.gui.util.CSVWriter;
|
||||
import com.jjoe64.graphview.GraphView.GraphViewData;
|
||||
import com.jjoe64.graphview.GraphViewSeries;
|
||||
import com.jjoe64.graphview.GraphViewSeries.GraphViewSeriesStyle;
|
||||
import com.jjoe64.graphview.GraphViewStyle;
|
||||
import com.jjoe64.graphview.LineGraphView;
|
||||
|
||||
|
||||
/**
|
||||
* Created by ezivkoc on 2014-07-15.
|
||||
*/
|
||||
public class StatusFragment extends Fragment {
|
||||
private TextView down_speed;
|
||||
private TextView up_speed;
|
||||
private GraphViewSeries downGraph;
|
||||
private GraphViewSeries upGraph;
|
||||
private int x = 0;
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
// Inflate the layout for this fragment
|
||||
View view = inflater.inflate(R.layout.fragment_status, container, false);
|
||||
|
||||
down_speed = (TextView) view.findViewById(R.id.down_speed);
|
||||
up_speed = (TextView) view.findViewById(R.id.up_speed);
|
||||
|
||||
// Init the graph
|
||||
GraphViewData[] zeroPoint = new GraphViewData[]{new GraphViewData(0, 0)};
|
||||
downGraph = new GraphViewSeries("Download Throughput", new GraphViewSeriesStyle(Color.GREEN, 3), zeroPoint);
|
||||
upGraph = new GraphViewSeries("Upload Throughput" , new GraphViewSeriesStyle(Color.RED , 3), zeroPoint);
|
||||
|
||||
LineGraphView graphView = new LineGraphView(this.getActivity(), "GraphViewDemo");
|
||||
graphView.addSeries(downGraph);
|
||||
graphView.addSeries(upGraph);
|
||||
//graphView.setDrawDataPoints(true);
|
||||
graphView.setScrollable(true);
|
||||
graphView.setViewPort(0, 120);
|
||||
graphView.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
|
||||
graphView.getGraphViewStyle().setGridStyle(GraphViewStyle.GridStyle.BOTH);
|
||||
|
||||
LinearLayout layout = (LinearLayout) view.findViewById(R.id.graph);
|
||||
layout.addView(graphView);
|
||||
|
||||
return view;
|
||||
}
|
||||
|
||||
|
||||
private UeControlExecutor.ThroughputListener throughputListener =
|
||||
new UeControlExecutor.ThroughputListener() {
|
||||
public void throughputUpdate(final double downThroughput, final double upThroughput) {
|
||||
if(down_speed != null && up_speed != null)
|
||||
down_speed.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
down_speed.setText(ThroughputCalculator.getBitThroughputString(downThroughput));
|
||||
up_speed.setText(ThroughputCalculator.getBitThroughputString(upThroughput));
|
||||
downGraph.appendData(new GraphViewData(x, downThroughput), true, 120);
|
||||
upGraph.appendData(new GraphViewData(x, upThroughput), true, 120);
|
||||
x++;
|
||||
|
||||
MainActivity.logThroughput(downThroughput, upThroughput);
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
public UeControlExecutor.ThroughputListener getThroughputListener(){
|
||||
return throughputListener;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,92 +1,92 @@
|
|||
package com.ericsson.uecontrol.gui.util;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.ProgressBar;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.ericsson.uecontrol.R;
|
||||
import com.ericsson.uecontrol.core.UeBehaviour;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Created by ezivkoc on 2014-07-15.
|
||||
*/
|
||||
public class BehaviourListAdapter extends StableArrayAdapter<UeBehaviour>{
|
||||
private static final int VIEW_RESOURCE = R.layout.behaviour_list_item;
|
||||
|
||||
private static LayoutInflater inflater = null;
|
||||
|
||||
private boolean editable = false;
|
||||
|
||||
public BehaviourListAdapter(Activity a, List<UeBehaviour> objects) {
|
||||
super(a, VIEW_RESOURCE, objects);
|
||||
inflater = (LayoutInflater)a.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
||||
}
|
||||
|
||||
|
||||
public View getView(int position, View convertView, ViewGroup parent) {
|
||||
View vi = convertView;
|
||||
if(convertView==null)
|
||||
vi = inflater.inflate(VIEW_RESOURCE, null);
|
||||
|
||||
ImageView draggable = (ImageView)vi.findViewById(R.id.draggable);
|
||||
TextView title = (TextView)vi.findViewById(R.id.title);
|
||||
TextView description = (TextView)vi.findViewById(R.id.description);
|
||||
final ImageView warning = (ImageView) vi.findViewById(R.id.warning);
|
||||
final ProgressBar active = (ProgressBar)vi.findViewById(R.id.active);
|
||||
final ProgressBar progress = (ProgressBar) vi.findViewById(R.id.progress);
|
||||
|
||||
UeBehaviour behaviour = super.getItem(position);
|
||||
|
||||
// Setting all values in listview
|
||||
title.setText(behaviour.getName());
|
||||
description.setText(behaviour.toString());
|
||||
|
||||
if(editable)
|
||||
draggable.setVisibility(View.VISIBLE);
|
||||
|
||||
behaviour.setExecutionListener(new UeBehaviour.BehaviourExecutionListener() {
|
||||
public void executionStarted() {
|
||||
progress.post(new Runnable() {
|
||||
public void run() {
|
||||
active.setVisibility(View.VISIBLE);
|
||||
progress.setVisibility(View.VISIBLE);
|
||||
warning.setVisibility(View.INVISIBLE);
|
||||
}
|
||||
});
|
||||
}
|
||||
public void progressChanged(final float p) {
|
||||
progress.setMax(100);
|
||||
progress.setProgress((int) (p * 100));
|
||||
}
|
||||
public void executionStopped() {
|
||||
progress.post(new Runnable() {
|
||||
public void run() {
|
||||
active.setVisibility(View.INVISIBLE);
|
||||
progress.setVisibility(View.INVISIBLE);
|
||||
}
|
||||
});
|
||||
}
|
||||
public void exception(Exception e){
|
||||
warning.post(new Runnable() {
|
||||
public void run() {
|
||||
warning.setVisibility(View.VISIBLE);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
return vi;
|
||||
}
|
||||
|
||||
public void setEditable(boolean b) {
|
||||
editable = b;
|
||||
}
|
||||
|
||||
}
|
||||
package com.ericsson.uecontrol.gui.util;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.ProgressBar;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.ericsson.uecontrol.R;
|
||||
import com.ericsson.uecontrol.core.UeBehaviour;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Created by ezivkoc on 2014-07-15.
|
||||
*/
|
||||
public class BehaviourListAdapter extends StableArrayAdapter<UeBehaviour>{
|
||||
private static final int VIEW_RESOURCE = R.layout.behaviour_list_item;
|
||||
|
||||
private static LayoutInflater inflater = null;
|
||||
|
||||
private boolean editable = false;
|
||||
|
||||
public BehaviourListAdapter(Activity a, List<UeBehaviour> objects) {
|
||||
super(a, VIEW_RESOURCE, objects);
|
||||
inflater = (LayoutInflater)a.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
||||
}
|
||||
|
||||
|
||||
public View getView(int position, View convertView, ViewGroup parent) {
|
||||
View vi = convertView;
|
||||
if(convertView==null)
|
||||
vi = inflater.inflate(VIEW_RESOURCE, null);
|
||||
|
||||
ImageView draggable = (ImageView)vi.findViewById(R.id.draggable);
|
||||
TextView title = (TextView)vi.findViewById(R.id.title);
|
||||
TextView description = (TextView)vi.findViewById(R.id.description);
|
||||
final ImageView warning = (ImageView) vi.findViewById(R.id.warning);
|
||||
final ProgressBar active = (ProgressBar)vi.findViewById(R.id.active);
|
||||
final ProgressBar progress = (ProgressBar) vi.findViewById(R.id.progress);
|
||||
|
||||
UeBehaviour behaviour = super.getItem(position);
|
||||
|
||||
// Setting all values in listview
|
||||
title.setText(behaviour.getName());
|
||||
description.setText(behaviour.toString());
|
||||
|
||||
if(editable)
|
||||
draggable.setVisibility(View.VISIBLE);
|
||||
|
||||
behaviour.setExecutionListener(new UeBehaviour.BehaviourExecutionListener() {
|
||||
public void executionStarted() {
|
||||
progress.post(new Runnable() {
|
||||
public void run() {
|
||||
active.setVisibility(View.VISIBLE);
|
||||
progress.setVisibility(View.VISIBLE);
|
||||
warning.setVisibility(View.INVISIBLE);
|
||||
}
|
||||
});
|
||||
}
|
||||
public void progressChanged(final float p) {
|
||||
progress.setMax(100);
|
||||
progress.setProgress((int) (p * 100));
|
||||
}
|
||||
public void executionStopped() {
|
||||
progress.post(new Runnable() {
|
||||
public void run() {
|
||||
active.setVisibility(View.INVISIBLE);
|
||||
progress.setVisibility(View.INVISIBLE);
|
||||
}
|
||||
});
|
||||
}
|
||||
public void exception(Exception e){
|
||||
warning.post(new Runnable() {
|
||||
public void run() {
|
||||
warning.setVisibility(View.VISIBLE);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
return vi;
|
||||
}
|
||||
|
||||
public void setEditable(boolean b) {
|
||||
editable = b;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,112 +1,112 @@
|
|||
package com.ericsson.uecontrol.gui.util;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Modifier;
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* Created by ezivkoc on 2014-07-24.
|
||||
*/
|
||||
public class Configurator {
|
||||
/**
|
||||
* Sets a field in a class as externally configurable.
|
||||
*/
|
||||
@Retention(RetentionPolicy.RUNTIME) // Make this annotation accessible at runtime via reflection.
|
||||
@Target({ElementType.FIELD}) // This annotation can only be applied to class fields.
|
||||
public static @interface Configurable{
|
||||
String value();
|
||||
}
|
||||
|
||||
public static enum ConfigType{
|
||||
STRING, INT
|
||||
}
|
||||
|
||||
|
||||
private Object obj;
|
||||
private ConfigurationParam[] params;
|
||||
|
||||
public Configurator(Object obj){
|
||||
this.obj = obj;
|
||||
this.params = getConfiguration(obj);
|
||||
}
|
||||
|
||||
public ConfigurationParam[] getConfiguration(){
|
||||
return params;
|
||||
}
|
||||
|
||||
protected ConfigurationParam[] getConfiguration(Object obj){
|
||||
Class c = obj.getClass();
|
||||
ArrayList<ConfigurationParam> conf = new ArrayList<ConfigurationParam>();
|
||||
|
||||
Field[] all = c.getDeclaredFields();
|
||||
for(Field f : all){
|
||||
if(f.isAnnotationPresent(Configurable.class) && !Modifier.isStatic(f.getModifiers())) {
|
||||
try {
|
||||
conf.add(new ConfigurationParam(f));
|
||||
} catch (IllegalAccessException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return conf.toArray(new ConfigurationParam[conf.size()]);
|
||||
}
|
||||
|
||||
public void setConfiguration(){
|
||||
for(ConfigurationParam param : params){
|
||||
try {
|
||||
param.set();
|
||||
} catch (IllegalAccessException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public class ConfigurationParam{
|
||||
protected Field field;
|
||||
protected String name;
|
||||
protected String niceName;
|
||||
protected ConfigType type;
|
||||
protected Object value;
|
||||
|
||||
|
||||
protected ConfigurationParam(Field f) throws IllegalAccessException {
|
||||
field = f;
|
||||
field.setAccessible(true);
|
||||
name = field.getName();
|
||||
niceName = field.getAnnotation(Configurable.class).value();
|
||||
value = field.get(obj);
|
||||
|
||||
if (f.getType() == String.class) type = ConfigType.STRING;
|
||||
else if(f.getType() == int.class) type = ConfigType.INT;
|
||||
|
||||
}
|
||||
|
||||
public String getName(){return name;}
|
||||
public String getNiceName(){return niceName;}
|
||||
public ConfigType getType(){return type;}
|
||||
|
||||
public String getString(){
|
||||
if(value == null)
|
||||
return null;
|
||||
return value.toString();}
|
||||
|
||||
public void setString(String v){
|
||||
switch(type){
|
||||
case STRING:
|
||||
value = v; break;
|
||||
case INT:
|
||||
value = Integer.parseInt(v); break;
|
||||
}
|
||||
}
|
||||
|
||||
protected void set() throws IllegalAccessException {
|
||||
field.set(obj, value);
|
||||
}
|
||||
}
|
||||
}
|
||||
package com.ericsson.uecontrol.gui.util;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Modifier;
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* Created by ezivkoc on 2014-07-24.
|
||||
*/
|
||||
public class Configurator {
|
||||
/**
|
||||
* Sets a field in a class as externally configurable.
|
||||
*/
|
||||
@Retention(RetentionPolicy.RUNTIME) // Make this annotation accessible at runtime via reflection.
|
||||
@Target({ElementType.FIELD}) // This annotation can only be applied to class fields.
|
||||
public static @interface Configurable{
|
||||
String value();
|
||||
}
|
||||
|
||||
public static enum ConfigType{
|
||||
STRING, INT
|
||||
}
|
||||
|
||||
|
||||
private Object obj;
|
||||
private ConfigurationParam[] params;
|
||||
|
||||
public Configurator(Object obj){
|
||||
this.obj = obj;
|
||||
this.params = getConfiguration(obj);
|
||||
}
|
||||
|
||||
public ConfigurationParam[] getConfiguration(){
|
||||
return params;
|
||||
}
|
||||
|
||||
protected ConfigurationParam[] getConfiguration(Object obj){
|
||||
Class c = obj.getClass();
|
||||
ArrayList<ConfigurationParam> conf = new ArrayList<ConfigurationParam>();
|
||||
|
||||
Field[] all = c.getDeclaredFields();
|
||||
for(Field f : all){
|
||||
if(f.isAnnotationPresent(Configurable.class) && !Modifier.isStatic(f.getModifiers())) {
|
||||
try {
|
||||
conf.add(new ConfigurationParam(f));
|
||||
} catch (IllegalAccessException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return conf.toArray(new ConfigurationParam[conf.size()]);
|
||||
}
|
||||
|
||||
public void setConfiguration(){
|
||||
for(ConfigurationParam param : params){
|
||||
try {
|
||||
param.set();
|
||||
} catch (IllegalAccessException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public class ConfigurationParam{
|
||||
protected Field field;
|
||||
protected String name;
|
||||
protected String niceName;
|
||||
protected ConfigType type;
|
||||
protected Object value;
|
||||
|
||||
|
||||
protected ConfigurationParam(Field f) throws IllegalAccessException {
|
||||
field = f;
|
||||
field.setAccessible(true);
|
||||
name = field.getName();
|
||||
niceName = field.getAnnotation(Configurable.class).value();
|
||||
value = field.get(obj);
|
||||
|
||||
if (f.getType() == String.class) type = ConfigType.STRING;
|
||||
else if(f.getType() == int.class) type = ConfigType.INT;
|
||||
|
||||
}
|
||||
|
||||
public String getName(){return name;}
|
||||
public String getNiceName(){return niceName;}
|
||||
public ConfigType getType(){return type;}
|
||||
|
||||
public String getString(){
|
||||
if(value == null)
|
||||
return null;
|
||||
return value.toString();}
|
||||
|
||||
public void setString(String v){
|
||||
switch(type){
|
||||
case STRING:
|
||||
value = v; break;
|
||||
case INT:
|
||||
value = Integer.parseInt(v); break;
|
||||
}
|
||||
}
|
||||
|
||||
protected void set() throws IllegalAccessException {
|
||||
field.set(obj, value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,73 +1,73 @@
|
|||
/*
|
||||
* Copyright (C) 2013 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.ericsson.uecontrol.gui.util;
|
||||
|
||||
import android.content.Context;
|
||||
import android.widget.ArrayAdapter;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
public class StableArrayAdapter<T> extends ArrayAdapter<T> implements DynamicListView.DynamicListActionListener {
|
||||
|
||||
final int INVALID_ID = -1;
|
||||
|
||||
private HashMap<T, Integer> mIdMap = new HashMap<T, Integer>();
|
||||
private List<T> objects;
|
||||
|
||||
public StableArrayAdapter(Context context, int textViewResourceId, List<T> obj) {
|
||||
super(context, textViewResourceId, obj);
|
||||
objects = obj;
|
||||
generateIds();
|
||||
}
|
||||
|
||||
public void generateIds(){
|
||||
mIdMap.clear();
|
||||
for (int i = 0; i < objects.size(); ++i) {
|
||||
mIdMap.put(objects.get(i), i);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public long getItemId(int position) {
|
||||
if (position < 0 || position >= mIdMap.size()) {
|
||||
return INVALID_ID;
|
||||
}
|
||||
T item = getItem(position);
|
||||
return mIdMap.get(item);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void swapItems(int from, int to) {
|
||||
T temp = objects.get(from);
|
||||
objects.set(from, objects.get(to));
|
||||
objects.set(to, temp);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeItem(int which) {
|
||||
objects.remove(which);
|
||||
generateIds();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasStableIds() {
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
* Copyright (C) 2013 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.ericsson.uecontrol.gui.util;
|
||||
|
||||
import android.content.Context;
|
||||
import android.widget.ArrayAdapter;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
public class StableArrayAdapter<T> extends ArrayAdapter<T> implements DynamicListView.DynamicListActionListener {
|
||||
|
||||
final int INVALID_ID = -1;
|
||||
|
||||
private HashMap<T, Integer> mIdMap = new HashMap<T, Integer>();
|
||||
private List<T> objects;
|
||||
|
||||
public StableArrayAdapter(Context context, int textViewResourceId, List<T> obj) {
|
||||
super(context, textViewResourceId, obj);
|
||||
objects = obj;
|
||||
generateIds();
|
||||
}
|
||||
|
||||
public void generateIds(){
|
||||
mIdMap.clear();
|
||||
for (int i = 0; i < objects.size(); ++i) {
|
||||
mIdMap.put(objects.get(i), i);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public long getItemId(int position) {
|
||||
if (position < 0 || position >= mIdMap.size()) {
|
||||
return INVALID_ID;
|
||||
}
|
||||
T item = getItem(position);
|
||||
return mIdMap.get(item);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void swapItems(int from, int to) {
|
||||
T temp = objects.get(from);
|
||||
objects.set(from, objects.get(to));
|
||||
objects.set(to, temp);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeItem(int which) {
|
||||
objects.remove(which);
|
||||
generateIds();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasStableIds() {
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,16 +1,16 @@
|
|||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context="com.ericsson.uecontrol.gui.EditActivity">
|
||||
|
||||
<!--<com.ericsson.uecontrol.gui.util.TouchInterceptor
|
||||
android:id="@android:id/list"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" /> -->
|
||||
<com.ericsson.uecontrol.gui.util.DynamicListView
|
||||
android:id="@android:id/list"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
</RelativeLayout>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context="com.ericsson.uecontrol.gui.EditActivity">
|
||||
|
||||
<!--<com.ericsson.uecontrol.gui.util.TouchInterceptor
|
||||
android:id="@android:id/list"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" /> -->
|
||||
<com.ericsson.uecontrol.gui.util.DynamicListView
|
||||
android:id="@android:id/list"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
|
|
|||
|
|
@ -1,45 +1,45 @@
|
|||
<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
|
||||
<android.support.v4.widget.DrawerLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/drawer_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".MainActivity">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<fragment android:id="@+id/status_fragment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="150dp"
|
||||
android:name="com.ericsson.uecontrol.gui.fragments.StatusFragment"
|
||||
tools:layout="@layout/fragment_status" />
|
||||
|
||||
<!-- As the main content view, the view below consumes the entire
|
||||
space available using match_parent in both dimensions. -->
|
||||
<FrameLayout
|
||||
android:id="@+id/container"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<!-- android:layout_gravity="start" tells DrawerLayout to treat
|
||||
this as a sliding drawer on the left side for left-to-right
|
||||
languages and on the right side for right-to-left languages.
|
||||
If you're not building against API 17 or higher, use
|
||||
android:layout_gravity="left" instead. -->
|
||||
<!-- The drawer is given a fixed width in dp and extends the full height of
|
||||
the container. -->
|
||||
<!--
|
||||
<fragment android:id="@+id/navigation_drawer"
|
||||
android:layout_width="@dimen/navigation_drawer_width"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="start"
|
||||
android:name="com.ericsson.uecontrol.gui.fragments.NavigationDrawerFragment"
|
||||
tools:layout="@layout/fragment_navigation_drawer" />
|
||||
-->
|
||||
</android.support.v4.widget.DrawerLayout>
|
||||
<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
|
||||
<android.support.v4.widget.DrawerLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/drawer_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".MainActivity">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<fragment android:id="@+id/status_fragment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="150dp"
|
||||
android:name="com.ericsson.uecontrol.gui.fragments.StatusFragment"
|
||||
tools:layout="@layout/fragment_status" />
|
||||
|
||||
<!-- As the main content view, the view below consumes the entire
|
||||
space available using match_parent in both dimensions. -->
|
||||
<FrameLayout
|
||||
android:id="@+id/container"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<!-- android:layout_gravity="start" tells DrawerLayout to treat
|
||||
this as a sliding drawer on the left side for left-to-right
|
||||
languages and on the right side for right-to-left languages.
|
||||
If you're not building against API 17 or higher, use
|
||||
android:layout_gravity="left" instead. -->
|
||||
<!-- The drawer is given a fixed width in dp and extends the full height of
|
||||
the container. -->
|
||||
<!--
|
||||
<fragment android:id="@+id/navigation_drawer"
|
||||
android:layout_width="@dimen/navigation_drawer_width"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="start"
|
||||
android:name="com.ericsson.uecontrol.gui.fragments.NavigationDrawerFragment"
|
||||
tools:layout="@layout/fragment_navigation_drawer" />
|
||||
-->
|
||||
</android.support.v4.widget.DrawerLayout>
|
||||
|
|
|
|||
|
|
@ -1,77 +1,77 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="5dp"
|
||||
android:paddingTop="5dp"
|
||||
android:paddingRight="5dp">
|
||||
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/draggable"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentTop="true"
|
||||
android:src="@drawable/draggable"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_centerVertical="true"
|
||||
android:visibility="gone" />
|
||||
|
||||
<!-- Behaviour name-->
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Title"
|
||||
android:textColor="#040404"
|
||||
android:typeface="sans"
|
||||
android:textSize="17dip"
|
||||
android:textStyle="bold"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_toRightOf="@+id/draggable" />
|
||||
|
||||
<!-- Behaviour description -->
|
||||
<TextView
|
||||
android:id="@+id/description"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="#343434"
|
||||
android:textSize="12dip"
|
||||
android:text="Description"
|
||||
android:layout_below="@+id/title"
|
||||
android:layout_toRightOf="@+id/draggable" />
|
||||
|
||||
|
||||
<!-- Rightend -->
|
||||
<ProgressBar
|
||||
android:id="@+id/active"
|
||||
style="?android:attr/progressBarStyleSmall"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginRight="10dp"
|
||||
android:visibility="invisible" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/warning"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentTop="true"
|
||||
android:src="@drawable/warning"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_centerVertical="true"
|
||||
android:visibility="invisible"
|
||||
android:layout_toLeftOf="@+id/active" />
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/progress"
|
||||
style="?android:attr/progressBarStyleHorizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/description"
|
||||
android:visibility="invisible" />
|
||||
|
||||
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="5dp"
|
||||
android:paddingTop="5dp"
|
||||
android:paddingRight="5dp">
|
||||
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/draggable"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentTop="true"
|
||||
android:src="@drawable/draggable"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_centerVertical="true"
|
||||
android:visibility="gone" />
|
||||
|
||||
<!-- Behaviour name-->
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Title"
|
||||
android:textColor="#040404"
|
||||
android:typeface="sans"
|
||||
android:textSize="17dip"
|
||||
android:textStyle="bold"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_toRightOf="@+id/draggable" />
|
||||
|
||||
<!-- Behaviour description -->
|
||||
<TextView
|
||||
android:id="@+id/description"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="#343434"
|
||||
android:textSize="12dip"
|
||||
android:text="Description"
|
||||
android:layout_below="@+id/title"
|
||||
android:layout_toRightOf="@+id/draggable" />
|
||||
|
||||
|
||||
<!-- Rightend -->
|
||||
<ProgressBar
|
||||
android:id="@+id/active"
|
||||
style="?android:attr/progressBarStyleSmall"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginRight="10dp"
|
||||
android:visibility="invisible" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/warning"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentTop="true"
|
||||
android:src="@drawable/warning"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_centerVertical="true"
|
||||
android:visibility="invisible"
|
||||
android:layout_toLeftOf="@+id/active" />
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/progress"
|
||||
style="?android:attr/progressBarStyleHorizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/description"
|
||||
android:visibility="invisible" />
|
||||
|
||||
|
||||
</RelativeLayout>
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
<ListView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:choiceMode="singleChoice"
|
||||
android:divider="@android:color/transparent"
|
||||
android:dividerHeight="0dp"
|
||||
android:background="#cccc"
|
||||
tools:context=".NavigationDrawerFragment" />
|
||||
<ListView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:choiceMode="singleChoice"
|
||||
android:divider="@android:color/transparent"
|
||||
android:dividerHeight="0dp"
|
||||
android:background="#cccc"
|
||||
tools:context=".NavigationDrawerFragment" />
|
||||
|
|
|
|||
|
|
@ -1,66 +1,66 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@android:color/background_dark">
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:weightSum="1"
|
||||
android:paddingLeft="10dp"
|
||||
android:paddingTop="10dp"
|
||||
android:paddingRight="10dp">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/imageView2"
|
||||
android:src="@android:drawable/stat_sys_download" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="160dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:text="0 Mbits"
|
||||
android:id="@+id/down_speed"
|
||||
android:textColor="#ffffffff"
|
||||
android:typeface="sans"
|
||||
android:layout_weight="0" />
|
||||
|
||||
<Space
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.08" />
|
||||
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/imageView3"
|
||||
android:src="@android:drawable/stat_sys_upload" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:text="0 Mbits"
|
||||
android:id="@+id/up_speed"
|
||||
android:textColor="#ffffffff"
|
||||
android:typeface="sans"
|
||||
android:layout_weight="0.45" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/graph"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal" >
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@android:color/background_dark">
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:weightSum="1"
|
||||
android:paddingLeft="10dp"
|
||||
android:paddingTop="10dp"
|
||||
android:paddingRight="10dp">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/imageView2"
|
||||
android:src="@android:drawable/stat_sys_download" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="160dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:text="0 Mbits"
|
||||
android:id="@+id/down_speed"
|
||||
android:textColor="#ffffffff"
|
||||
android:typeface="sans"
|
||||
android:layout_weight="0" />
|
||||
|
||||
<Space
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.08" />
|
||||
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/imageView3"
|
||||
android:src="@android:drawable/stat_sys_upload" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:text="0 Mbits"
|
||||
android:id="@+id/up_speed"
|
||||
android:textColor="#ffffffff"
|
||||
android:typeface="sans"
|
||||
android:layout_weight="0.45" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/graph"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal" >
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:context="com.ericsson.uecontrol.gui.EditActivity" >
|
||||
|
||||
<item android:id="@+id/action_add"
|
||||
android:title="@string/action_add"
|
||||
android:showAsAction="withText|ifRoom" />
|
||||
|
||||
</menu>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:context="com.ericsson.uecontrol.gui.EditActivity" >
|
||||
|
||||
<item android:id="@+id/action_add"
|
||||
android:title="@string/action_add"
|
||||
android:showAsAction="withText|ifRoom" />
|
||||
|
||||
</menu>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:id="@+id/action_settings"
|
||||
android:title="@string/action_settings"
|
||||
android:orderInCategory="100"
|
||||
android:showAsAction="never" />
|
||||
</menu>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:id="@+id/action_settings"
|
||||
android:title="@string/action_settings"
|
||||
android:orderInCategory="100"
|
||||
android:showAsAction="never" />
|
||||
</menu>
|
||||
|
|
|
|||
|
|
@ -1,25 +1,25 @@
|
|||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:context=".MainActivity" >
|
||||
<item android:id="@+id/action_execute"
|
||||
android:title="@string/action_run"
|
||||
android:showAsAction="withText|ifRoom" />
|
||||
|
||||
<item android:id="@+id/action_edit"
|
||||
android:title="@string/action_edit"
|
||||
android:orderInCategory="50"
|
||||
android:showAsAction="never" />
|
||||
<item android:id="@+id/action_import"
|
||||
android:title="@string/action_import"
|
||||
android:orderInCategory="100"
|
||||
android:showAsAction="never" />
|
||||
<item android:id="@+id/action_export"
|
||||
android:title="@string/action_export"
|
||||
android:orderInCategory="100"
|
||||
android:showAsAction="never" />
|
||||
|
||||
<item android:id="@+id/action_settings"
|
||||
android:title="@string/action_settings"
|
||||
android:orderInCategory="100"
|
||||
android:showAsAction="never" />
|
||||
</menu>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:context=".MainActivity" >
|
||||
<item android:id="@+id/action_execute"
|
||||
android:title="@string/action_run"
|
||||
android:showAsAction="withText|ifRoom" />
|
||||
|
||||
<item android:id="@+id/action_edit"
|
||||
android:title="@string/action_edit"
|
||||
android:orderInCategory="50"
|
||||
android:showAsAction="never" />
|
||||
<item android:id="@+id/action_import"
|
||||
android:title="@string/action_import"
|
||||
android:orderInCategory="100"
|
||||
android:showAsAction="never" />
|
||||
<item android:id="@+id/action_export"
|
||||
android:title="@string/action_export"
|
||||
android:orderInCategory="100"
|
||||
android:showAsAction="never" />
|
||||
|
||||
<item android:id="@+id/action_settings"
|
||||
android:title="@string/action_settings"
|
||||
android:orderInCategory="100"
|
||||
android:showAsAction="never" />
|
||||
</menu>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string-array name="behaviours" >
|
||||
<item>com.ericsson.uecontrol.core.behaviour.UeBehaviourFtp</item>
|
||||
<item>com.ericsson.uecontrol.core.behaviour.UeBehaviourSleep</item>
|
||||
<item>com.ericsson.uecontrol.core.behaviour.UeBehaviourSurfing</item>
|
||||
</string-array>
|
||||
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string-array name="behaviours" >
|
||||
<item>com.ericsson.uecontrol.core.behaviour.UeBehaviourFtp</item>
|
||||
<item>com.ericsson.uecontrol.core.behaviour.UeBehaviourSleep</item>
|
||||
<item>com.ericsson.uecontrol.core.behaviour.UeBehaviourSurfing</item>
|
||||
</string-array>
|
||||
|
||||
</resources>
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
<resources>
|
||||
<!-- Default screen margins, per the Android Design guidelines. -->
|
||||
<dimen name="activity_horizontal_margin">16dp</dimen>
|
||||
<dimen name="activity_vertical_margin">16dp</dimen>
|
||||
|
||||
<!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp:
|
||||
https://developer.android.com/design/patterns/navigation-drawer.html -->
|
||||
<dimen name="navigation_drawer_width">240dp</dimen>
|
||||
|
||||
<dimen name="standard_padding">10dp</dimen>
|
||||
</resources>
|
||||
<resources>
|
||||
<!-- Default screen margins, per the Android Design guidelines. -->
|
||||
<dimen name="activity_horizontal_margin">16dp</dimen>
|
||||
<dimen name="activity_vertical_margin">16dp</dimen>
|
||||
|
||||
<!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp:
|
||||
https://developer.android.com/design/patterns/navigation-drawer.html -->
|
||||
<dimen name="navigation_drawer_width">240dp</dimen>
|
||||
|
||||
<dimen name="standard_padding">10dp</dimen>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
<resources>
|
||||
|
||||
<!--
|
||||
Layout alias to replace the single-pane version of the layout with a
|
||||
two-pane version on Large screens.
|
||||
|
||||
For more on layout aliases, see:
|
||||
http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters
|
||||
-->
|
||||
<item name="fragment_item" type="layout">@layout/fragment_list</item>
|
||||
|
||||
<resources>
|
||||
|
||||
<!--
|
||||
Layout alias to replace the single-pane version of the layout with a
|
||||
two-pane version on Large screens.
|
||||
|
||||
For more on layout aliases, see:
|
||||
http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters
|
||||
-->
|
||||
<item name="fragment_item" type="layout">@layout/fragment_list</item>
|
||||
|
||||
</resources>
|
||||
|
|
@ -1,30 +1,30 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">UeControl</string>
|
||||
<string name="title_section1">Section 1</string>
|
||||
<string name="title_section2">Section 2</string>
|
||||
<string name="title_section3">Section 3</string>
|
||||
<string name="navigation_drawer_open">Open navigation drawer</string>
|
||||
<string name="navigation_drawer_close">Close navigation drawer</string>
|
||||
<string name="action_run">Run</string>
|
||||
<string name="action_stop">Stop</string>
|
||||
<string name="action_edit">Edit</string>
|
||||
<string name="action_import">Import</string>
|
||||
<string name="action_export">Export</string>
|
||||
<string name="action_settings">Settings</string>
|
||||
<string name="pref_exec_title">Execution Settings</string>
|
||||
<string name="pref_other_title">Other Settings</string>
|
||||
<string name="title_activity_edit">Edit</string>
|
||||
<string name="action_add">Add</string>
|
||||
<string name="select_behaviour">Select Behaviour</string>
|
||||
<string name="configure_behaviour">Configure Behaviour</string>
|
||||
<string name="action_save">Save</string>
|
||||
<string name="action_cancel">Cancel</string>
|
||||
<string name="pref_about">About</string>
|
||||
<string name="pref_logging">Logging</string>
|
||||
<string name="pref_logging_summ">Enable logging of throughput and other attributes to a csv file</string>
|
||||
<string name="pref_logging_path">Log Path</string>
|
||||
<string name="pref_logging_path_summ">Folder where log file will be stored</string>
|
||||
<string name="title_activity_about">About</string>
|
||||
|
||||
</resources>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">UeControl</string>
|
||||
<string name="title_section1">Section 1</string>
|
||||
<string name="title_section2">Section 2</string>
|
||||
<string name="title_section3">Section 3</string>
|
||||
<string name="navigation_drawer_open">Open navigation drawer</string>
|
||||
<string name="navigation_drawer_close">Close navigation drawer</string>
|
||||
<string name="action_run">Run</string>
|
||||
<string name="action_stop">Stop</string>
|
||||
<string name="action_edit">Edit</string>
|
||||
<string name="action_import">Import</string>
|
||||
<string name="action_export">Export</string>
|
||||
<string name="action_settings">Settings</string>
|
||||
<string name="pref_exec_title">Execution Settings</string>
|
||||
<string name="pref_other_title">Other Settings</string>
|
||||
<string name="title_activity_edit">Edit</string>
|
||||
<string name="action_add">Add</string>
|
||||
<string name="select_behaviour">Select Behaviour</string>
|
||||
<string name="configure_behaviour">Configure Behaviour</string>
|
||||
<string name="action_save">Save</string>
|
||||
<string name="action_cancel">Cancel</string>
|
||||
<string name="pref_about">About</string>
|
||||
<string name="pref_logging">Logging</string>
|
||||
<string name="pref_logging_summ">Enable logging of throughput and other attributes to a csv file</string>
|
||||
<string name="pref_logging_path">Log Path</string>
|
||||
<string name="pref_logging_path_summ">Folder where log file will be stored</string>
|
||||
<string name="title_activity_about">About</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<resources>
|
||||
|
||||
<!-- Base application theme. -->
|
||||
<style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
|
||||
<!-- Customize your theme here. -->
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
<resources>
|
||||
|
||||
<!-- Base application theme. -->
|
||||
<style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
|
||||
<!-- Customize your theme here. -->
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,30 +1,30 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<PreferenceCategory
|
||||
android:title="@string/pref_exec_title"
|
||||
android:key="pref_key_storage_settings">
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="logging"
|
||||
android:title="@string/pref_logging"
|
||||
android:summary="@string/pref_logging_summ"
|
||||
android:defaultValue="false" />
|
||||
<EditTextPreference
|
||||
android:key="logging_path"
|
||||
android:title="@string/pref_logging_path"
|
||||
android:summary="@string/pref_logging_path_summ"
|
||||
android:defaultValue="/sdcard/uecontrol/" />
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:title="@string/pref_other_title"
|
||||
android:key="pref_key_storage_settings">
|
||||
|
||||
<Preference
|
||||
android:key="about"
|
||||
android:title="@string/pref_about"
|
||||
android:defaultValue="false">
|
||||
</Preference>
|
||||
|
||||
</PreferenceCategory>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<PreferenceCategory
|
||||
android:title="@string/pref_exec_title"
|
||||
android:key="pref_key_storage_settings">
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="logging"
|
||||
android:title="@string/pref_logging"
|
||||
android:summary="@string/pref_logging_summ"
|
||||
android:defaultValue="false" />
|
||||
<EditTextPreference
|
||||
android:key="logging_path"
|
||||
android:title="@string/pref_logging_path"
|
||||
android:summary="@string/pref_logging_path_summ"
|
||||
android:defaultValue="/sdcard/uecontrol/" />
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:title="@string/pref_other_title"
|
||||
android:key="pref_key_storage_settings">
|
||||
|
||||
<Preference
|
||||
android:key="about"
|
||||
android:title="@string/pref_about"
|
||||
android:defaultValue="false">
|
||||
</Preference>
|
||||
|
||||
</PreferenceCategory>
|
||||
</PreferenceScreen>
|
||||
Loading…
Add table
Add a link
Reference in a new issue