Merge branch 'master' of git.linphone.org:linphone-android

This commit is contained in:
François Grisez 2014-08-01 15:51:37 +02:00
commit ba5fc7ce51
4 changed files with 370 additions and 368 deletions

4
README
View file

@ -3,7 +3,7 @@
To build liblinphone for Android, you must: To build liblinphone for Android, you must:
0) download the Android sdk with platform-tools and tools updated to latest revision (at least API 16 is needed), then add both 'tools' and 'platform-tools' folders in your path. 0) download the Android sdk with platform-tools and tools updated to latest revision (at least API 16 is needed), then add both 'tools' and 'platform-tools' folders in your path.
1) download the Android ndk (>=r9d) from google and add it to your path (no symlink !!!). 1) download the Android ndk (>=r9d, < r10) from google and add it to your path (no symlink !!!).
2) install yasm, nasm, curl, ant, rsync and the autotools: autoconf, automake, aclocal, libtoolize, pkgconfig 2) install yasm, nasm, curl, ant, rsync and the autotools: autoconf, automake, aclocal, libtoolize, pkgconfig
On 64 bits linux systems you'll need the ia32-libs package On 64 bits linux systems you'll need the ia32-libs package
With the latest Debian (multiarch), you need this: With the latest Debian (multiarch), you need this:
@ -39,6 +39,8 @@ To create an apk with a different package name, you need to edit the custom_rule
TROUBLESHOOTING TROUBLESHOOTING
***************************** *****************************
Currently Android NDK 10 is NOT supported for X86 version, please use Android NDK 9d maximum.
If you encounter troubles with the make clean target and you are using the 8e android ndk, the solution can be found here: https://groups.google.com/forum/?fromgroups=#!topic/android-ndk/3wIbb-h3nDU If you encounter troubles with the make clean target and you are using the 8e android ndk, the solution can be found here: https://groups.google.com/forum/?fromgroups=#!topic/android-ndk/3wIbb-h3nDU
If you built the app using eclipse, ensure you ran at least once the make command (see above steps 0 to 3) ! Else you'll have this exceptions: If you built the app using eclipse, ensure you ran at least once the make command (see above steps 0 to 3) ! Else you'll have this exceptions:

View file

@ -1,138 +1,138 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/background" android:background="@drawable/background"
android:orientation="vertical" > android:orientation="vertical" >
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:background="@drawable/toolsbar_background"> android:background="@drawable/toolsbar_background">
<TextView <TextView
android:visibility="invisible" android:visibility="invisible"
android:paddingTop="20dp" android:paddingTop="20dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_weight="1"/> android:layout_weight="1"/>
<TextView <TextView
android:contentDescription="@string/content_description_all_contacts" android:contentDescription="@string/content_description_all_contacts"
android:id="@+id/allContacts" android:id="@+id/allContacts"
android:background="@drawable/contacts_all" android:background="@drawable/contacts_all"
android:text="@string/button_all_contacts" android:text="@string/button_all_contacts"
android:gravity="center" android:gravity="center"
android:paddingTop="20dp" android:paddingTop="20dp"
android:textSize="13sp" android:textSize="13sp"
android:textColor="@drawable/text_switch_button_color" android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_weight="1"/> android:layout_weight="1"/>
<TextView <TextView
android:contentDescription="@string/content_description_linphone_contacts" android:contentDescription="@string/content_description_linphone_contacts"
android:id="@+id/linphoneContacts" android:id="@+id/linphoneContacts"
android:background="@drawable/contacts_sip" android:background="@drawable/contacts_sip"
android:text="@string/button_sip_contacts" android:text="@string/button_sip_contacts"
android:gravity="center" android:gravity="center"
android:paddingTop="20dp" android:paddingTop="20dp"
android:textSize="13sp" android:textSize="13sp"
android:textColor="@drawable/text_switch_button_color" android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_weight="1"/> android:layout_weight="1"/>
<TextView <TextView
android:contentDescription="@string/content_description_add_contact" android:contentDescription="@string/content_description_add_contact"
android:id="@+id/newContact" android:id="@+id/newContact"
android:background="@drawable/contacts_add_contact" android:background="@drawable/contacts_add_contact"
android:text="@string/button_add_contact" android:text="@string/button_add_contact"
android:gravity="center" android:gravity="center"
android:paddingTop="20dp" android:paddingTop="20dp"
android:textSize="13sp" android:textSize="13sp"
android:textColor="@drawable/text_button" android:textColor="@drawable/text_button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_weight="1"/> android:layout_weight="1"/>
</LinearLayout> </LinearLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<ImageView <ImageView
android:contentDescription="@string/content_description_cancel" android:contentDescription="@string/content_description_cancel"
android:id="@+id/clearSearchField" android:id="@+id/clearSearchField"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:src="@drawable/list_delete" android:src="@drawable/list_delete"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:paddingLeft="5dp" android:paddingLeft="5dp"
android:paddingRight="5dp"/> android:paddingRight="5dp"/>
<EditText <EditText
android:textCursorDrawable="@null" android:textCursorDrawable="@null"
android:id="@+id/searchField" android:id="@+id/searchField"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:background="@drawable/chat_fast_address_background" android:background="@drawable/chat_fast_address_background"
android:gravity="center" android:gravity="center"
android:layout_toLeftOf="@id/clearSearchField" android:layout_toLeftOf="@id/clearSearchField"
android:paddingRight="5dp" android:paddingRight="5dp"
android:inputType="textPersonName"/> android:inputType="textPersonName"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<ListView <ListView
android:id="@+id/contactsList" android:id="@+id/contactsList"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:divider="@android:color/darker_gray" android:divider="@android:color/darker_gray"
android:cacheColorHint="@color/transparent" android:cacheColorHint="@color/transparent"
android:fastScrollAlwaysVisible="true" android:fastScrollAlwaysVisible="true"
android:fastScrollEnabled="true" android:fastScrollEnabled="true"
android:dividerHeight="1dp" /> android:dividerHeight="1dp" />
<TextView <TextView
android:id="@+id/noSipContact" android:id="@+id/noSipContact"
android:visibility="gone" android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="@string/no_sip_contact" android:text="@string/no_sip_contact"
android:textColor="@drawable/text_color" android:textColor="@drawable/text_color"
android:textAppearance="@android:style/TextAppearance.Large"/> android:textAppearance="@android:style/TextAppearance.Large"/>
<TextView <TextView
android:id="@+id/noContact" android:id="@+id/noContact"
android:visibility="gone" android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="@string/no_contact" android:text="@string/no_contact"
android:textColor="@drawable/text_color" android:textColor="@drawable/text_color"
android:textAppearance="@android:style/TextAppearance.Large"/> android:textAppearance="@android:style/TextAppearance.Large"/>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

View file

@ -1,115 +1,115 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/background" android:background="@drawable/background"
android:orientation="vertical" > android:orientation="vertical" >
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:background="@drawable/toolsbar_background"> android:background="@drawable/toolsbar_background">
<TextView <TextView
android:contentDescription="@string/content_description_delete" android:contentDescription="@string/content_description_delete"
android:id="@+id/deleteAll" android:id="@+id/deleteAll"
android:background="@drawable/history_delete" android:background="@drawable/history_delete"
android:text="@string/button_delete_all" android:text="@string/button_delete_all"
android:gravity="center" android:gravity="center"
android:paddingTop="20dp" android:paddingTop="20dp"
android:textColor="@drawable/text_button" android:textColor="@drawable/text_button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_weight="1"/> android:layout_weight="1"/>
<TextView <TextView
android:contentDescription="@string/content_description_all_calls" android:contentDescription="@string/content_description_all_calls"
android:id="@+id/allCalls" android:id="@+id/allCalls"
android:background="@drawable/history_all" android:background="@drawable/history_all"
android:text="@string/button_all_call" android:text="@string/button_all_call"
android:gravity="center" android:gravity="center"
android:paddingTop="15dp" android:paddingTop="20dp"
android:textColor="@drawable/text_switch_button_color" android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_weight="1"/> android:layout_weight="1"/>
<TextView <TextView
android:contentDescription="@string/content_description_missed_calls" android:contentDescription="@string/content_description_missed_calls"
android:id="@+id/missedCalls" android:id="@+id/missedCalls"
android:background="@drawable/history_missed" android:background="@drawable/history_missed"
android:text="@string/button_missed_call" android:text="@string/button_missed_call"
android:gravity="center" android:gravity="center"
android:paddingTop="15dp" android:paddingTop="20dp"
android:textColor="@drawable/text_switch_button_color" android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_weight="1"/> android:layout_weight="1"/>
<TextView <TextView
android:contentDescription="@string/content_description_edit" android:contentDescription="@string/content_description_edit"
android:id="@+id/edit" android:id="@+id/edit"
android:background="@drawable/history_edit" android:background="@drawable/history_edit"
android:text="@string/button_edit" android:text="@string/button_edit"
android:gravity="center" android:gravity="center"
android:paddingTop="20dp" android:paddingTop="20dp"
android:textColor="@drawable/text_button" android:textColor="@drawable/text_button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_weight="1"/> android:layout_weight="1"/>
<TextView <TextView
android:contentDescription="@string/content_description_validate" android:contentDescription="@string/content_description_validate"
android:id="@+id/ok" android:id="@+id/ok"
android:background="@drawable/history_ok" android:background="@drawable/history_ok"
android:text="@string/button_ok" android:text="@string/button_ok"
android:gravity="center" android:gravity="center"
android:paddingTop="20dp" android:paddingTop="20dp"
android:textColor="@drawable/text_button" android:textColor="@drawable/text_button"
android:visibility="gone" android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_weight="1"/> android:layout_weight="1"/>
</LinearLayout> </LinearLayout>
<ExpandableListView <ExpandableListView
android:id="@+id/historyList" android:id="@+id/historyList"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:divider="@android:color/darker_gray" android:divider="@android:color/darker_gray"
android:cacheColorHint="@color/transparent" android:cacheColorHint="@color/transparent"
android:dividerHeight="1dp" /> android:dividerHeight="1dp" />
<TextView <TextView
android:id="@+id/noCallHistory" android:id="@+id/noCallHistory"
android:visibility="gone" android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:text="@string/no_call_history" android:text="@string/no_call_history"
android:textColor="@drawable/text_color" android:textColor="@drawable/text_color"
android:textAppearance="@android:style/TextAppearance.Large"/> android:textAppearance="@android:style/TextAppearance.Large"/>
<TextView <TextView
android:id="@+id/noMissedCallHistory" android:id="@+id/noMissedCallHistory"
android:visibility="gone" android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:text="@string/no_missed_call_history" android:text="@string/no_missed_call_history"
android:textColor="@drawable/text_color" android:textColor="@drawable/text_color"
android:textAppearance="@android:style/TextAppearance.Large"/> android:textAppearance="@android:style/TextAppearance.Large"/>
</LinearLayout> </LinearLayout>

View file

@ -1,120 +1,120 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/background" android:background="@drawable/background"
android:orientation="vertical" > android:orientation="vertical" >
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:background="@drawable/toolsbar_background"> android:background="@drawable/toolsbar_background">
<TextView <TextView
android:contentDescription="@string/content_description_delete" android:contentDescription="@string/content_description_delete"
android:id="@+id/deleteAll" android:id="@+id/deleteAll"
android:background="@drawable/history_delete" android:background="@drawable/history_delete"
android:text="@string/button_delete_all" android:text="@string/button_delete_all"
android:gravity="center" android:gravity="center"
android:paddingTop="20dp" android:paddingTop="20dp"
android:textSize="13dp" android:textSize="13dp"
android:textColor="@drawable/text_button" android:textColor="@drawable/text_button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_weight="1"/> android:layout_weight="1"/>
<TextView <TextView
android:contentDescription="@string/content_description_all_calls" android:contentDescription="@string/content_description_all_calls"
android:id="@+id/allCalls" android:id="@+id/allCalls"
android:background="@drawable/history_all" android:background="@drawable/history_all"
android:text="@string/button_all_call" android:text="@string/button_all_call"
android:gravity="center" android:gravity="center"
android:paddingTop="15dp" android:paddingTop="20dp"
android:textSize="13dp" android:textSize="13dp"
android:textColor="@drawable/text_switch_button_color" android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_weight="1"/> android:layout_weight="1"/>
<TextView <TextView
android:contentDescription="@string/content_description_missed_calls" android:contentDescription="@string/content_description_missed_calls"
android:id="@+id/missedCalls" android:id="@+id/missedCalls"
android:background="@drawable/history_missed" android:background="@drawable/history_missed"
android:text="@string/button_missed_call" android:text="@string/button_missed_call"
android:gravity="center" android:gravity="center"
android:paddingTop="15dp" android:paddingTop="20dp"
android:textSize="13dp" android:textSize="13dp"
android:textColor="@drawable/text_switch_button_color" android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_weight="1"/> android:layout_weight="1"/>
<TextView <TextView
android:contentDescription="@string/content_description_edit" android:contentDescription="@string/content_description_edit"
android:id="@+id/edit" android:id="@+id/edit"
android:background="@drawable/history_edit" android:background="@drawable/history_edit"
android:text="@string/button_edit" android:text="@string/button_edit"
android:gravity="center" android:gravity="center"
android:paddingTop="20dp" android:paddingTop="20dp"
android:textSize="13dp" android:textSize="13dp"
android:textColor="@drawable/text_button" android:textColor="@drawable/text_button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_weight="1"/> android:layout_weight="1"/>
<TextView <TextView
android:contentDescription="@string/content_description_validate" android:contentDescription="@string/content_description_validate"
android:id="@+id/ok" android:id="@+id/ok"
android:background="@drawable/history_ok" android:background="@drawable/history_ok"
android:text="@string/button_ok" android:text="@string/button_ok"
android:gravity="center" android:gravity="center"
android:paddingTop="20dp" android:paddingTop="20dp"
android:textSize="13dp" android:textSize="13dp"
android:textColor="@drawable/text_button" android:textColor="@drawable/text_button"
android:visibility="gone" android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_weight="1"/> android:layout_weight="1"/>
</LinearLayout> </LinearLayout>
<ListView <ListView
android:id="@+id/historyList" android:id="@+id/historyList"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:divider="@android:color/darker_gray" android:divider="@android:color/darker_gray"
android:cacheColorHint="@color/transparent" android:cacheColorHint="@color/transparent"
android:dividerHeight="1dp" /> android:dividerHeight="1dp" />
<TextView <TextView
android:id="@+id/noCallHistory" android:id="@+id/noCallHistory"
android:visibility="gone" android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:text="@string/no_call_history" android:text="@string/no_call_history"
android:textColor="@drawable/text_color" android:textColor="@drawable/text_color"
android:textAppearance="@android:style/TextAppearance.Large"/> android:textAppearance="@android:style/TextAppearance.Large"/>
<TextView <TextView
android:id="@+id/noMissedCallHistory" android:id="@+id/noMissedCallHistory"
android:visibility="gone" android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:text="@string/no_missed_call_history" android:text="@string/no_missed_call_history"
android:textColor="@drawable/text_color" android:textColor="@drawable/text_color"
android:textAppearance="@android:style/TextAppearance.Large"/> android:textAppearance="@android:style/TextAppearance.Large"/>
</LinearLayout> </LinearLayout>