From 548e3e0c62e1f9f2b57fa9f82a8b36dbe087eae3 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Tue, 19 Jul 2016 10:24:52 +0200
Subject: [PATCH] Add downloader layout + fix launch downloader for device with
 hardware echo canceller

---
 .../assistant_codec_downloader.xml            | 106 +++++++++++++++++
 .../assistant_codec_downloader.xml            | 109 +++++++++++++++++
 .../assistant_codec_downloader.xml            | 112 ++++++++++++++++++
 .../assistant_codec_downloader.xml            | 111 +++++++++++++++++
 .../linphone/assistant/AssistantActivity.java |   2 +
 5 files changed, 440 insertions(+)
 create mode 100644 res/layout-land/assistant_codec_downloader.xml
 create mode 100644 res/layout-sw533dp-land/assistant_codec_downloader.xml
 create mode 100644 res/layout-sw533dp/assistant_codec_downloader.xml
 create mode 100644 res/layout-sw720dp-land/assistant_codec_downloader.xml

diff --git a/res/layout-land/assistant_codec_downloader.xml b/res/layout-land/assistant_codec_downloader.xml
new file mode 100644
index 000000000..28579cae7
--- /dev/null
+++ b/res/layout-land/assistant_codec_downloader.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:padding="30dp"
+	android:orientation="vertical" >
+
+	<TextView
+		android:text="@string/assistant_codec_down_question"
+		style="@style/font7"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/question"
+		android:layout_alignParentTop="true"
+		android:layout_alignParentRight="true"
+		android:layout_alignParentEnd="true"/>
+
+	<ProgressBar
+		style="?android:attr/progressBarStyleHorizontal"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:id="@+id/progressBar"
+		android:layout_above="@+id/answerNo"
+		android:layout_alignParentLeft="true"
+		android:layout_alignParentStart="true"
+		android:layout_alignRight="@+id/downloadingInfo"
+		android:layout_alignEnd="@+id/downloadingInfo"/>
+
+	<TextView
+		style="@style/font7"
+		android:text="@string/assistant_codec_downloading"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/downloading"
+		android:layout_above="@+id/imageView"
+		android:layout_alignParentLeft="true"
+		android:layout_alignParentStart="true"/>
+
+	<Button
+		style="@style/font7"
+		android:text="No"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/answerNo"
+		android:layout_marginBottom="35dp"
+		android:layout_alignParentBottom="true"
+		android:layout_toLeftOf="@+id/imageView"
+		android:layout_toStartOf="@+id/imageView"
+		android:layout_marginRight="26dp"
+		android:layout_marginEnd="26dp"/>
+
+	<Button
+		style="@style/font7"
+		android:text="Yes"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/answerYes"
+		android:layout_below="@+id/progressBar"
+		android:layout_alignRight="@+id/progressBar"
+		android:layout_alignEnd="@+id/progressBar"/>
+
+	<Button
+		style="@style/font7"
+		android:text="Ok"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/answerOk"
+		android:layout_alignTop="@+id/answerYes"
+		android:layout_centerHorizontal="true"/>
+
+	<TextView
+		style="@style/font7"
+		android:text="@string/assistant_codec_downloaded"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/downloaded"
+		android:layout_above="@+id/imageView"
+		android:layout_alignParentLeft="true"
+		android:layout_alignParentStart="true"/>
+
+	<TextView
+		style="@style/font7"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/downloadingInfo"
+		android:layout_above="@+id/progressBar"
+		android:layout_alignParentLeft="true"
+		android:layout_alignParentStart="true"
+		android:layout_alignParentRight="true"
+		android:layout_alignParentEnd="true"/>
+
+</RelativeLayout>
diff --git a/res/layout-sw533dp-land/assistant_codec_downloader.xml b/res/layout-sw533dp-land/assistant_codec_downloader.xml
new file mode 100644
index 000000000..237d61620
--- /dev/null
+++ b/res/layout-sw533dp-land/assistant_codec_downloader.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:padding="30dp"
+	android:orientation="vertical" >
+
+	<TextView
+		android:text="@string/assistant_codec_down_question"
+		style="@style/font7"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/question"
+		android:layout_alignTop="@+id/downloading"
+		android:layout_centerHorizontal="true"/>
+	
+  	<ImageView
+		android:src="@drawable/linphone_logo_orange"
+		android:layout_width="150dp"
+		android:layout_height="150dp"
+		android:id="@+id/imageView"
+		android:layout_marginTop="38dp"
+		android:layout_below="@+id/question"
+		android:layout_centerHorizontal="true"/>
+
+	<ProgressBar
+		style="?android:attr/progressBarStyleHorizontal"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:id="@+id/progressBar"
+		android:layout_alignBottom="@+id/answerNo"
+		android:layout_alignParentRight="true"
+		android:layout_alignParentEnd="true"
+		android:layout_alignParentLeft="true"
+		android:layout_alignParentStart="true"/>
+
+	<TextView
+		style="@style/font7"
+		android:text="@string/assistant_codec_downloading"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/downloading"
+		android:layout_alignTop="@+id/downloaded"
+		android:layout_alignLeft="@+id/question"
+		android:layout_alignStart="@+id/question"/>
+
+	<Button
+		style="@style/font7"
+		android:text="No"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/answerNo"
+		android:layout_marginBottom="40dp"
+		android:layout_alignParentBottom="true"
+		android:layout_toLeftOf="@+id/imageView"
+		android:layout_toStartOf="@+id/imageView"/>
+
+	<Button
+		style="@style/font7"
+		android:text="Yes"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/answerYes"
+		android:layout_alignTop="@+id/answerOk"
+		android:layout_toRightOf="@+id/imageView"
+		android:layout_toEndOf="@+id/imageView"/>
+
+	<Button
+		style="@style/font7"
+		android:text="Ok"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/answerOk"
+		android:layout_alignTop="@+id/answerNo"
+		android:layout_centerHorizontal="true"/>
+
+	<TextView
+		style="@style/font7"
+		android:text="@string/assistant_codec_downloaded"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/downloaded"
+		android:layout_marginTop="36dp"
+		android:layout_alignParentTop="true"
+		android:layout_centerHorizontal="true"/>
+
+	<TextView
+		style="@style/font7"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/downloadingInfo"
+		android:layout_above="@+id/answerOk"
+		android:layout_centerHorizontal="true"/>
+
+</RelativeLayout>
diff --git a/res/layout-sw533dp/assistant_codec_downloader.xml b/res/layout-sw533dp/assistant_codec_downloader.xml
new file mode 100644
index 000000000..d6ec0fca9
--- /dev/null
+++ b/res/layout-sw533dp/assistant_codec_downloader.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:padding="30dp"
+	android:orientation="vertical" >
+
+	<TextView
+		android:text="@string/assistant_codec_down_question"
+		style="@style/font7"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/question"
+		android:layout_alignParentTop="true"
+		android:layout_alignParentLeft="true"
+		android:layout_alignParentStart="true"
+		android:layout_marginTop="145dp"/>
+	
+  	<ImageView
+		android:src="@drawable/linphone_logo_orange"
+		android:layout_width="150dp"
+		android:layout_height="150dp"
+		android:id="@+id/imageView"
+		android:layout_centerVertical="true"
+		android:layout_centerHorizontal="true"/>
+
+	<ProgressBar
+		style="?android:attr/progressBarStyleHorizontal"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:id="@+id/progressBar"
+		android:layout_below="@+id/imageView"
+		android:layout_marginTop="107dp"
+		android:layout_alignRight="@+id/question"
+		android:layout_alignEnd="@+id/question"
+		android:layout_alignParentLeft="true"
+		android:layout_alignParentStart="true"/>
+
+	<TextView
+		style="@style/font7"
+		android:text="@string/assistant_codec_downloading"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/downloading"
+		android:layout_alignTop="@+id/downloaded"
+		android:layout_alignParentRight="true"
+		android:layout_alignParentEnd="true"/>
+
+	<Button
+		style="@style/font7"
+		android:text="No"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/answerNo"
+		android:layout_marginBottom="40dp"
+		android:layout_alignParentBottom="true"
+		android:layout_toLeftOf="@+id/imageView"
+		android:layout_toStartOf="@+id/imageView"/>
+
+	<Button
+		style="@style/font7"
+		android:text="Yes"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/answerYes"
+		android:layout_alignTop="@+id/answerOk"
+		android:layout_toRightOf="@+id/imageView"
+		android:layout_toEndOf="@+id/imageView"/>
+
+	<Button
+		style="@style/font7"
+		android:text="Ok"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/answerOk"
+		android:layout_alignTop="@+id/answerNo"
+		android:layout_centerHorizontal="true"/>
+
+	<TextView
+		style="@style/font7"
+		android:text="@string/assistant_codec_downloaded"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/downloaded"
+		android:layout_alignBaseline="@+id/question"
+		android:layout_alignBottom="@+id/question"
+		android:layout_centerHorizontal="true"/>
+
+	<TextView
+		style="@style/font7"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/downloadingInfo"
+		android:layout_marginBottom="29dp"
+		android:layout_alignBottom="@+id/progressBar"
+		android:layout_centerHorizontal="true"/>
+
+</RelativeLayout>
diff --git a/res/layout-sw720dp-land/assistant_codec_downloader.xml b/res/layout-sw720dp-land/assistant_codec_downloader.xml
new file mode 100644
index 000000000..5c92115b0
--- /dev/null
+++ b/res/layout-sw720dp-land/assistant_codec_downloader.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:padding="30dp"
+	android:orientation="vertical" >
+
+	<TextView
+		android:text="@string/assistant_codec_down_question"
+		style="@style/font7"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/question"
+		android:layout_alignTop="@+id/downloading"
+		android:layout_centerHorizontal="true"/>
+	
+  	<ImageView
+		android:src="@drawable/linphone_logo_orange"
+		android:layout_width="150dp"
+		android:layout_height="150dp"
+		android:id="@+id/imageView"
+		android:layout_marginTop="96dp"
+		android:layout_below="@+id/question"
+		android:layout_centerHorizontal="true"/>
+
+	<ProgressBar
+		style="?android:attr/progressBarStyleHorizontal"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:id="@+id/progressBar"
+		android:layout_below="@+id/imageView"
+		android:layout_marginTop="120dp"
+		android:layout_alignParentRight="true"
+		android:layout_alignParentEnd="true"
+		android:layout_alignParentLeft="true"
+		android:layout_alignParentStart="true"/>
+
+	<TextView
+		style="@style/font7"
+		android:text="@string/assistant_codec_downloading"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/downloading"
+		android:layout_alignTop="@+id/downloaded"
+		android:layout_alignLeft="@+id/question"
+		android:layout_alignStart="@+id/question"/>
+
+	<Button
+		style="@style/font7"
+		android:text="No"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/answerNo"
+		android:layout_marginBottom="40dp"
+		android:layout_alignParentBottom="true"
+		android:layout_toLeftOf="@+id/imageView"
+		android:layout_toStartOf="@+id/imageView"/>
+
+	<Button
+		style="@style/font7"
+		android:text="Yes"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/answerYes"
+		android:layout_alignTop="@+id/answerOk"
+		android:layout_toRightOf="@+id/imageView"
+		android:layout_toEndOf="@+id/imageView"/>
+
+	<Button
+		style="@style/font7"
+		android:text="Ok"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/answerOk"
+		android:layout_alignTop="@+id/answerNo"
+		android:layout_centerHorizontal="true"/>
+
+	<TextView
+		style="@style/font7"
+		android:text="@string/assistant_codec_downloaded"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/downloaded"
+		android:layout_marginTop="37dp"
+		android:layout_alignParentTop="true"
+		android:layout_centerHorizontal="true"/>
+
+	<TextView
+		style="@style/font7"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:id="@+id/downloadingInfo"
+		android:layout_alignBottom="@+id/progressBar"
+		android:layout_centerHorizontal="true"
+		android:layout_marginBottom="54dp"/>
+
+</RelativeLayout>
diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java
index a7636db01..f7b1274ed 100644
--- a/src/org/linphone/assistant/AssistantActivity.java
+++ b/src/org/linphone/assistant/AssistantActivity.java
@@ -285,6 +285,7 @@ private static AssistantActivity instance;
 				echoCancellerAlreadyDone = true;
 				return true;
 			}
+			isEchoCalibrationFinished();
 		} else {
 			checkAndRequestAudioPermission();
 		}
@@ -378,6 +379,7 @@ private static AssistantActivity instance;
 	}
 
 	private void launchDownloadCodec() {
+		Log.i("linphone salut c'est miguel download");
 		OpenH264DownloadHelper downloadHelper = LinphoneCoreFactory.instance().createOpenH264DownloadHelper();
 		if (Version.getCpuAbis().contains("armeabi-v7a") && !Version.getCpuAbis().contains("x86") && !downloadHelper.isCodecFound()) {
 			CodecDownloaderFragment codecFragment = new CodecDownloaderFragment();