diff --git a/res/layout-small/status.xml b/res/layout-small/status.xml
index e87f8951b..13203f9d0 100644
--- a/res/layout-small/status.xml
+++ b/res/layout-small/status.xml
@@ -40,7 +40,7 @@
android:id="@+id/call_stats_title"
android:textStyle="bold"
android:textColor="@color/text_default"
- android:textSize="18dp"/>
+ android:textSize="18sp"/>
@@ -55,7 +55,7 @@
android:text="@string/call_stats_codec"
android:textStyle="bold"
android:textColor="@android:color/white"
- android:textSize="12dp"/>
+ android:textSize="12sp"/>
+ android:textSize="12sp"/>
@@ -79,7 +79,7 @@
android:text="@string/call_stats_upload"
android:textStyle="bold"
android:textColor="@android:color/white"
- android:textSize="12dp"/>
+ android:textSize="12sp"/>
+ android:textSize="12sp"/>
@@ -103,7 +103,7 @@
android:text="@string/call_stats_download"
android:textColor="@android:color/white"
android:textStyle="bold"
- android:textSize="12dp"/>
+ android:textSize="12sp"/>
+ android:textSize="12sp"/>
@@ -127,7 +127,7 @@
android:text="@string/call_stats_ice"
android:textStyle="bold"
android:textColor="@android:color/white"
- android:textSize="12dp"/>
+ android:textSize="12sp"/>
+ android:textSize="12sp"/>
+
+
+
+
+
+
+
+
@@ -179,7 +204,7 @@
android:id="@+id/statusText"
android:text="@string/status_not_connected"
android:textColor="@android:color/white"
- android:textSize="14dp"
+ android:textSize="14sp"
android:paddingLeft="5dp"
android:layout_centerVertical="true"
android:layout_width="wrap_content"
@@ -221,7 +246,7 @@
android:id="@+id/exit"
android:text="@string/menu_exit"
android:textColor="@android:color/white"
- android:textSize="14dp"
+ android:textSize="14sp"
android:layout_centerVertical="true"
android:layout_width="wrap_content"
android:layout_height="match_parent"
diff --git a/res/layout/status.xml b/res/layout/status.xml
index 33b234e11..bdeeb635e 100644
--- a/res/layout/status.xml
+++ b/res/layout/status.xml
@@ -139,6 +139,31 @@
android:textSize="12sp"/>
+
+
+
+
+
+
+
+
diff --git a/res/values-FR/strings.xml b/res/values-FR/strings.xml
index c687ced6f..d10491a33 100644
--- a/res/values-FR/strings.xml
+++ b/res/values-FR/strings.xml
@@ -230,6 +230,7 @@
Bande passante envoi :
Bande passante réception :
Connexion ICE :
+ Taille vidéo:
diff --git a/res/values-RU/strings.xml b/res/values-RU/strings.xml
index f180e1353..584dcc105 100755
--- a/res/values-RU/strings.xml
+++ b/res/values-RU/strings.xml
@@ -277,6 +277,7 @@
Полоса пропускания загрузки:
Полоса пропускания скачивания:
Подключение ICE:
+ Video size:
Кнопка добавить к контактам
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ee99eb33b..e577f1e7d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -275,6 +275,7 @@
Upload bandwidth:
Download bandwidth:
ICE connectivity:
+ Video size:
Add to contacts button
diff --git a/src/org/linphone/StatusFragment.java b/src/org/linphone/StatusFragment.java
index c5153ef07..30582ad7f 100644
--- a/src/org/linphone/StatusFragment.java
+++ b/src/org/linphone/StatusFragment.java
@@ -439,7 +439,10 @@ public class StatusFragment extends Fragment {
final TextView dl = (TextView) view.findViewById(R.id.downloadBandwith);
final TextView ul = (TextView) view.findViewById(R.id.uploadBandwith);
final TextView ice = (TextView) view.findViewById(R.id.ice);
- if (codec == null || dl == null || ul == null || ice == null) {
+ final TextView videoResolution = (TextView) view.findViewById(R.id.video_resolution);
+ final View videoResolutionLayout = view.findViewById(R.id.video_resolution_layout);
+
+ if (codec == null || dl == null || ul == null || ice == null || videoResolution == null || videoResolutionLayout == null) {
mTimer.cancel();
return;
}
@@ -462,6 +465,9 @@ public class StatusFragment extends Fragment {
dl.setText(String.valueOf((int) videoStats.getDownloadBandwidth()) + " / " + (int) audioStats.getDownloadBandwidth() + " kbits/s");
ul.setText(String.valueOf((int) videoStats.getUploadBandwidth()) + " / " + (int) audioStats.getUploadBandwidth() + " kbits/s");
ice.setText(videoStats.getIceState().toString());
+
+ videoResolutionLayout.setVisibility(View.VISIBLE);
+ videoResolution.setText("↑ " + params.getSentVideoSize().toDisplayableString() + " / ↓ " + params.getReceivedVideoSize().toDisplayableString());
}
} else {
final LinphoneCallStats audioStats = call.getAudioStats();
@@ -474,6 +480,8 @@ public class StatusFragment extends Fragment {
dl.setText(String.valueOf((int) audioStats.getDownloadBandwidth()) + " kbits/s");
ul.setText(String.valueOf((int) audioStats.getUploadBandwidth()) + " kbits/s");
ice.setText(audioStats.getIceState().toString());
+
+ videoResolutionLayout.setVisibility(View.GONE);
}
}
}
diff --git a/submodules/linphone b/submodules/linphone
index 3cd4eb5e7..3a3f331ca 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 3cd4eb5e75c6f9606ead1a38e4708b8031c44191
+Subproject commit 3a3f331ca30c0cffee9bfaab7edf66d148f968d1