diff --git a/.idea/libraries/GraphView_3_1_2.xml b/.idea/libraries/GraphView_3_1_2.xml index 970f273..78349eb 100755 --- a/.idea/libraries/GraphView_3_1_2.xml +++ b/.idea/libraries/GraphView_3_1_2.xml @@ -4,6 +4,8 @@ - + + + \ No newline at end of file diff --git a/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java b/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java index c12fde7..3043c1b 100755 --- a/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java +++ b/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java @@ -129,10 +129,10 @@ public class UeControlExecutor implements Runnable, UeBehaviour.DataHandledListe } protected boolean setRealDataUsage(){ boolean ret = false; - //long currentRxBytes = TrafficStats.getUidRxBytes(MainActivity.getUID()); - //long currentTxBytes = TrafficStats.getUidTxBytes(MainActivity.getUID()); - long currentRxBytes = TrafficStats.getTotalRxBytes(); - long currentTxBytes = TrafficStats.getTotalTxBytes(); + long currentRxBytes = TrafficStats.getUidRxBytes(MainActivity.getUID()); + long currentTxBytes = TrafficStats.getUidTxBytes(MainActivity.getUID()); + //long currentRxBytes = TrafficStats.getTotalRxBytes(); + //long currentTxBytes = TrafficStats.getTotalTxBytes(); if (currentRxBytes != TrafficStats.UNSUPPORTED && currentTxBytes != TrafficStats.UNSUPPORTED && previousRxBytes != TrafficStats.UNSUPPORTED && previousTxBytes != TrafficStats.UNSUPPORTED){ diff --git a/app/src/main/java/com/ericsson/uecontrol/core/util/ThroughputCalculator.java b/app/src/main/java/com/ericsson/uecontrol/core/util/ThroughputCalculator.java index d12214d..0f23c12 100755 --- a/app/src/main/java/com/ericsson/uecontrol/core/util/ThroughputCalculator.java +++ b/app/src/main/java/com/ericsson/uecontrol/core/util/ThroughputCalculator.java @@ -17,7 +17,7 @@ public class ThroughputCalculator { 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)); + throughput = data_amount / ((currentTimeStamp - previousTimeStamp) / NANOSEC_PER_SECOND); previousTimeStamp = currentTimeStamp; data_amount = 0; updated = true; diff --git a/app/src/main/res/drawable-hdpi/arrow_down_24.png b/app/src/main/res/drawable-hdpi/arrow_down_24.png new file mode 100644 index 0000000..a0346e6 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/arrow_down_24.png differ diff --git a/app/src/main/res/drawable-hdpi/arrow_up_24.png b/app/src/main/res/drawable-hdpi/arrow_up_24.png new file mode 100644 index 0000000..9ce5a54 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/arrow_up_24.png differ diff --git a/app/src/main/res/drawable-hdpi/stat_download.xml b/app/src/main/res/drawable-hdpi/stat_download.xml new file mode 100644 index 0000000..77ecf85 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/stat_download.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable-hdpi/stat_download_static.xml b/app/src/main/res/drawable-hdpi/stat_download_static.xml new file mode 100644 index 0000000..8d5f836 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/stat_download_static.xml @@ -0,0 +1,18 @@ + + + + diff --git a/app/src/main/res/drawable-hdpi/stat_sys_download_anim0.png b/app/src/main/res/drawable-hdpi/stat_sys_download_anim0.png new file mode 100644 index 0000000..910de29 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/stat_sys_download_anim0.png differ diff --git a/app/src/main/res/drawable-hdpi/stat_sys_download_anim1.png b/app/src/main/res/drawable-hdpi/stat_sys_download_anim1.png new file mode 100644 index 0000000..0b1aa34 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/stat_sys_download_anim1.png differ diff --git a/app/src/main/res/drawable-hdpi/stat_sys_download_anim2.png b/app/src/main/res/drawable-hdpi/stat_sys_download_anim2.png new file mode 100644 index 0000000..bc1877d Binary files /dev/null and b/app/src/main/res/drawable-hdpi/stat_sys_download_anim2.png differ diff --git a/app/src/main/res/drawable-hdpi/stat_sys_download_anim3.png b/app/src/main/res/drawable-hdpi/stat_sys_download_anim3.png new file mode 100644 index 0000000..9f41092 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/stat_sys_download_anim3.png differ diff --git a/app/src/main/res/drawable-hdpi/stat_sys_download_anim4.png b/app/src/main/res/drawable-hdpi/stat_sys_download_anim4.png new file mode 100644 index 0000000..5fa6305 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/stat_sys_download_anim4.png differ diff --git a/app/src/main/res/drawable-hdpi/stat_sys_download_anim5.png b/app/src/main/res/drawable-hdpi/stat_sys_download_anim5.png new file mode 100644 index 0000000..703759a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/stat_sys_download_anim5.png differ diff --git a/app/src/main/res/drawable-hdpi/stat_sys_upload_anim0.png b/app/src/main/res/drawable-hdpi/stat_sys_upload_anim0.png new file mode 100644 index 0000000..78f54b7 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/stat_sys_upload_anim0.png differ diff --git a/app/src/main/res/drawable-hdpi/stat_sys_upload_anim1.png b/app/src/main/res/drawable-hdpi/stat_sys_upload_anim1.png new file mode 100644 index 0000000..39d2c95 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/stat_sys_upload_anim1.png differ diff --git a/app/src/main/res/drawable-hdpi/stat_sys_upload_anim2.png b/app/src/main/res/drawable-hdpi/stat_sys_upload_anim2.png new file mode 100644 index 0000000..3a9031e Binary files /dev/null and b/app/src/main/res/drawable-hdpi/stat_sys_upload_anim2.png differ diff --git a/app/src/main/res/drawable-hdpi/stat_sys_upload_anim3.png b/app/src/main/res/drawable-hdpi/stat_sys_upload_anim3.png new file mode 100644 index 0000000..937720f Binary files /dev/null and b/app/src/main/res/drawable-hdpi/stat_sys_upload_anim3.png differ diff --git a/app/src/main/res/drawable-hdpi/stat_sys_upload_anim4.png b/app/src/main/res/drawable-hdpi/stat_sys_upload_anim4.png new file mode 100644 index 0000000..b35672c Binary files /dev/null and b/app/src/main/res/drawable-hdpi/stat_sys_upload_anim4.png differ diff --git a/app/src/main/res/drawable-hdpi/stat_sys_upload_anim5.png b/app/src/main/res/drawable-hdpi/stat_sys_upload_anim5.png new file mode 100644 index 0000000..4611122 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/stat_sys_upload_anim5.png differ diff --git a/app/src/main/res/drawable-hdpi/stat_upload.xml b/app/src/main/res/drawable-hdpi/stat_upload.xml new file mode 100644 index 0000000..a9d9609 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/stat_upload.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable-hdpi/stat_upload_static.xml b/app/src/main/res/drawable-hdpi/stat_upload_static.xml new file mode 100755 index 0000000..c556559 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/stat_upload_static.xml @@ -0,0 +1,18 @@ + + + + diff --git a/app/src/main/res/drawable-ldpi/ic_action.png b/app/src/main/res/drawable-ldpi/ic_action.png deleted file mode 100644 index 8d8f4ff..0000000 Binary files a/app/src/main/res/drawable-ldpi/ic_action.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/stat_sys_download_anim0.png b/app/src/main/res/drawable-mdpi/stat_sys_download_anim0.png new file mode 100644 index 0000000..25324f6 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/stat_sys_download_anim0.png differ diff --git a/app/src/main/res/drawable-mdpi/stat_sys_download_anim1.png b/app/src/main/res/drawable-mdpi/stat_sys_download_anim1.png new file mode 100644 index 0000000..6d1fb4a Binary files /dev/null and b/app/src/main/res/drawable-mdpi/stat_sys_download_anim1.png differ diff --git a/app/src/main/res/drawable-mdpi/stat_sys_download_anim2.png b/app/src/main/res/drawable-mdpi/stat_sys_download_anim2.png new file mode 100644 index 0000000..4c3e963 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/stat_sys_download_anim2.png differ diff --git a/app/src/main/res/drawable-mdpi/stat_sys_download_anim3.png b/app/src/main/res/drawable-mdpi/stat_sys_download_anim3.png new file mode 100644 index 0000000..2aae625 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/stat_sys_download_anim3.png differ diff --git a/app/src/main/res/drawable-mdpi/stat_sys_download_anim4.png b/app/src/main/res/drawable-mdpi/stat_sys_download_anim4.png new file mode 100644 index 0000000..55dbe12 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/stat_sys_download_anim4.png differ diff --git a/app/src/main/res/drawable-mdpi/stat_sys_download_anim5.png b/app/src/main/res/drawable-mdpi/stat_sys_download_anim5.png new file mode 100644 index 0000000..53fda44 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/stat_sys_download_anim5.png differ diff --git a/app/src/main/res/drawable-mdpi/stat_sys_upload_anim0.png b/app/src/main/res/drawable-mdpi/stat_sys_upload_anim0.png new file mode 100644 index 0000000..6402aa5 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/stat_sys_upload_anim0.png differ diff --git a/app/src/main/res/drawable-mdpi/stat_sys_upload_anim1.png b/app/src/main/res/drawable-mdpi/stat_sys_upload_anim1.png new file mode 100644 index 0000000..b9c364c Binary files /dev/null and b/app/src/main/res/drawable-mdpi/stat_sys_upload_anim1.png differ diff --git a/app/src/main/res/drawable-mdpi/stat_sys_upload_anim2.png b/app/src/main/res/drawable-mdpi/stat_sys_upload_anim2.png new file mode 100644 index 0000000..217ea4e Binary files /dev/null and b/app/src/main/res/drawable-mdpi/stat_sys_upload_anim2.png differ diff --git a/app/src/main/res/drawable-mdpi/stat_sys_upload_anim3.png b/app/src/main/res/drawable-mdpi/stat_sys_upload_anim3.png new file mode 100644 index 0000000..e22ec6d Binary files /dev/null and b/app/src/main/res/drawable-mdpi/stat_sys_upload_anim3.png differ diff --git a/app/src/main/res/drawable-mdpi/stat_sys_upload_anim4.png b/app/src/main/res/drawable-mdpi/stat_sys_upload_anim4.png new file mode 100644 index 0000000..a86d5cd Binary files /dev/null and b/app/src/main/res/drawable-mdpi/stat_sys_upload_anim4.png differ diff --git a/app/src/main/res/drawable-mdpi/stat_sys_upload_anim5.png b/app/src/main/res/drawable-mdpi/stat_sys_upload_anim5.png new file mode 100644 index 0000000..3387dbb Binary files /dev/null and b/app/src/main/res/drawable-mdpi/stat_sys_upload_anim5.png differ diff --git a/app/src/main/res/drawable-xhdpi/stat_sys_download_anim0.png b/app/src/main/res/drawable-xhdpi/stat_sys_download_anim0.png new file mode 100644 index 0000000..73cbc96 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/stat_sys_download_anim0.png differ diff --git a/app/src/main/res/drawable-xhdpi/stat_sys_download_anim1.png b/app/src/main/res/drawable-xhdpi/stat_sys_download_anim1.png new file mode 100644 index 0000000..3e39abb Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/stat_sys_download_anim1.png differ diff --git a/app/src/main/res/drawable-xhdpi/stat_sys_download_anim2.png b/app/src/main/res/drawable-xhdpi/stat_sys_download_anim2.png new file mode 100644 index 0000000..fc9b0de Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/stat_sys_download_anim2.png differ diff --git a/app/src/main/res/drawable-xhdpi/stat_sys_download_anim3.png b/app/src/main/res/drawable-xhdpi/stat_sys_download_anim3.png new file mode 100644 index 0000000..94bc012 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/stat_sys_download_anim3.png differ diff --git a/app/src/main/res/drawable-xhdpi/stat_sys_download_anim4.png b/app/src/main/res/drawable-xhdpi/stat_sys_download_anim4.png new file mode 100644 index 0000000..e6b5857 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/stat_sys_download_anim4.png differ diff --git a/app/src/main/res/drawable-xhdpi/stat_sys_download_anim5.png b/app/src/main/res/drawable-xhdpi/stat_sys_download_anim5.png new file mode 100644 index 0000000..f1df0c8 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/stat_sys_download_anim5.png differ diff --git a/app/src/main/res/drawable-xhdpi/stat_sys_upload_anim0.png b/app/src/main/res/drawable-xhdpi/stat_sys_upload_anim0.png new file mode 100644 index 0000000..2fbdaf8 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/stat_sys_upload_anim0.png differ diff --git a/app/src/main/res/drawable-xhdpi/stat_sys_upload_anim1.png b/app/src/main/res/drawable-xhdpi/stat_sys_upload_anim1.png new file mode 100644 index 0000000..cd0ca73 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/stat_sys_upload_anim1.png differ diff --git a/app/src/main/res/drawable-xhdpi/stat_sys_upload_anim2.png b/app/src/main/res/drawable-xhdpi/stat_sys_upload_anim2.png new file mode 100644 index 0000000..e443f45 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/stat_sys_upload_anim2.png differ diff --git a/app/src/main/res/drawable-xhdpi/stat_sys_upload_anim3.png b/app/src/main/res/drawable-xhdpi/stat_sys_upload_anim3.png new file mode 100644 index 0000000..8fb42f8 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/stat_sys_upload_anim3.png differ diff --git a/app/src/main/res/drawable-xhdpi/stat_sys_upload_anim4.png b/app/src/main/res/drawable-xhdpi/stat_sys_upload_anim4.png new file mode 100644 index 0000000..2fb1802 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/stat_sys_upload_anim4.png differ diff --git a/app/src/main/res/drawable-xhdpi/stat_sys_upload_anim5.png b/app/src/main/res/drawable-xhdpi/stat_sys_upload_anim5.png new file mode 100644 index 0000000..c1d9db5 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/stat_sys_upload_anim5.png differ diff --git a/app/src/main/res/layout/fragment_status.xml b/app/src/main/res/layout/fragment_status.xml index ecbfb52..4882fc6 100755 --- a/app/src/main/res/layout/fragment_status.xml +++ b/app/src/main/res/layout/fragment_status.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/imageView2" - android:src="@android:drawable/stat_sys_download" /> + android:src="@drawable/stat_download" /> + android:src="@drawable/stat_upload" />