Skip to content
Snippets Groups Projects
Commit 7596ad93 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

merge

parents f82a0c01 a4325153
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 172 additions and 116 deletions
.gitignore
+ 7
− 0
View file @ 7596ad93
......@@ -8,6 +8,13 @@ tags
TAGS.LST
ID
.classpath
.project
.settings/org.eclipse.jdt.core.prefs
.settings/org.eclipse.jdt.ui.prefs
SFLPhoneservice*
CallManagerJNI.java
Callback.java
......
AndroidManifest.xml
+ 1
− 4
View file @ 7596ad93
......@@ -53,7 +53,7 @@ as that of the covered work.
android:label="@string/app_name"
android:theme="@style/AppTheme" >
<activity
android:name=".client.SFLPhoneHome"
android:name=".client.SFLPhoneHomeActivity"
android:label="@string/title_activity_sflphone_home"
android:screenOrientation="portrait"
android:theme="@style/AppTheme" >
......@@ -70,9 +70,6 @@ as that of the covered work.
android:name="android.support.PARENT_ACTIVITY"
android:value="com.savoirfairelinux.sflphone.client.SFLPhoneHome" />
</activity>
<activity android:name=".client.AccountCreationActivity"
android:label="@string/app_name"
android:screenOrientation="portrait"/>
<activity android:name=".client.AccountPreferenceActivity"
android:label="@string/app_name"
android:screenOrientation="portrait"/>
......
README
+ 14
− 3
View file @ 7596ad93
......@@ -24,9 +24,15 @@ Check that following files are executable:
make-swig.sh
Compile pjsip-android
cd jni/pjsip-androi/android
./configure-android --disable-audio (or --disable-sound)
make dep && make
$ pushd jni/pjproject-android/android
$ ./configure-android --disable-sound
$ make dep && make
$ popd
Generate dbus interface
$ ./make-glue.sh
$ ndk-build -j4
......@@ -37,4 +43,9 @@ Check that no errors occurred. In particular, following files should have been g
sflphoneserviceJNI.java
ManagerImpl.java
Add compatibility library to libs folder
$ cp $ANDROID_SDK/extras/android/support/v13/android-support-v13.jar ./libs/
Then build android project with your favorite JDK: eclipse or ant.
bin/AndroidManifest.xml
+ 1
− 4
View file @ 7596ad93
......@@ -53,7 +53,7 @@ as that of the covered work.
android:label="@string/app_name"
android:theme="@style/AppTheme" >
<activity
android:name=".client.SFLPhoneHome"
android:name=".client.SFLPhoneHomeActivity"
android:label="@string/title_activity_sflphone_home"
android:screenOrientation="portrait"
android:theme="@style/AppTheme" >
......@@ -70,9 +70,6 @@ as that of the covered work.
android:name="android.support.PARENT_ACTIVITY"
android:value="com.savoirfairelinux.sflphone.client.SFLPhoneHome" />
</activity>
<activity android:name=".client.AccountCreationActivity"
android:label="@string/app_name"
android:screenOrientation="portrait"/>
<activity android:name=".client.AccountPreferenceActivity"
android:label="@string/app_name"
android:screenOrientation="portrait"/>
......
libs/android-support-v13.jar
+ 0
− 0
View file @ 7596ad93
No preview for this file type
make-glue.sh 0 → 100755
+ 23
− 0
View file @ 7596ad93
SRCDIR=jni/sflphone/daemon/src
# Fix a problem with dbusxx generating *const introspect() instead of introspect()
echo "Generating callmanager glue..."
dbusxx-xml2cpp $SRCDIR/dbus/callmanager-introspec.xml --adaptor=$SRCDIR/dbus/callmanager-glue-tmp.h
sed -e 's/const introspect()/introspect()/' <$SRCDIR/dbus/callmanager-glue-tmp.h >$SRCDIR/dbus/callmanager-glue.h
rm $SRCDIR/dbus/callmanager-glue-tmp.h
echo "Generating configurationmanager glue..."
dbusxx-xml2cpp $SRCDIR/dbus/configurationmanager-introspec.xml --adaptor=$SRCDIR/dbus/configurationmanager-glue-tmp.h
sed -e 's/const introspect()/introspect()/' <$SRCDIR/dbus/configurationmanager-glue-tmp.h >$SRCDIR/dbus/configurationmanager-glue.h
rm $SRCDIR/dbus/configurationmanager-glue-tmp.h
#echo "Generating contactmanager glue..."
#dbusxx-xml2cpp $SRCDIR/dbus/contactmanager-introspec.xml --adaptor=$SRCDIR/dbus/contactmanager-glue-tmp.h
#sed -e 's/const introspect()/introspect()/' <$SRCDIR/dbus/contactmanager-glue-tmp.h >$SRCDIR/dbus/contactmanager-glue.h
#rm $SRCDIR/dbus/contactmanager-glue-tmp.h
echo "Generating instance glue..."
dbusxx-xml2cpp $SRCDIR/dbus/instance-introspec.xml --adaptor=$SRCDIR/dbus/instance-glue-tmp.h
sed -e 's/const introspect()/introspect()/' <$SRCDIR/dbus/instance-glue-tmp.h >$SRCDIR/dbus/instance-glue.h
rm $SRCDIR/dbus/instance-glue-tmp.h
\ No newline at end of file
make-swig.sh
+ 3
− 0
View file @ 7596ad93
......@@ -83,6 +83,9 @@ else
exit 3
fi
# FIXME
echo "Generating callmanager_wrap.cpp..."
mkdir -p $NATIVEDIR
......
project.properties
+ 1
− 1
View file @ 7596ad93
......@@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-15
target=android-17
res/drawable-hdpi/ic_checkmark_holo_light.png 0 → 100644
+ 0
− 0
View file @ 7596ad93
res/drawable-hdpi/ic_checkmark_holo_light.png

1.13 KiB

res/layout/account_management_layout.xml deleted 100644 → 0
+ 0
− 59
View file @ f82a0c01
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
Author: Alexandre Savard <alexandre.savard@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
Additional permission under GNU GPL version 3 section 7:
If you modify this program, or any covered work, by linking or
combining it with the OpenSSL project's OpenSSL library (or a
modified version of that library), containing parts covered by the
terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
grants you additional permission to convey the resulting work.
Corresponding Source for a non-source form of such a combination
shall include the source code for the parts of OpenSSL used as well
as that of the covered work.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:orientation="vertical"
android:gravity="center_horizontal"
android:layout_below="@+id/editTo"
android:id="@+id/accountManagementLayout"
android:weightSum="1.0"
android:paddingLeft="8dp"
android:paddingRight="8dp" >
<Button
android:id="@+id/buttonAddAccount"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:onClick="onClick"
android:text="Add Account" />
<Button
android:id="@+id/buttonRemoveAccount"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:onClick="onClick"
android:text="Remove Account" />
</LinearLayout>
res/layout/activity_sflphone_home.xml
+ 3
− 0
View file @ 7596ad93
......@@ -56,6 +56,7 @@ as that of the covered work.
android:id="@+id/phoneNumberTextEntry"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="phone"
android:hint="Type phone number"
android:layout_below="@+id/buttonCall"/>
......@@ -72,6 +73,7 @@ as that of the covered work.
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".5"
android:layout_margin="10dp"
android:background="@drawable/call_button"
android:gravity="center_vertical"
android:onClick="onClick"
......@@ -82,6 +84,7 @@ as that of the covered work.
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".5"
android:layout_margin="10dp"
android:background="@drawable/hangup_button"
android:gravity="center_vertical"
android:onClick="onClick"
......
res/layout/test_layout.xml → res/layout/frag_button_section.xml
+ 1
− 1
View file @ 7596ad93
......@@ -107,7 +107,7 @@ as that of the covered work.
<include layout="@layout/dialpad"/>
</LinearLayout>
-->
<com.savoirfairelinux.sflphone.client.Numpad
<com.savoirfairelinux.sflphone.model.Numpad
android:id="@+id/numPad"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
res/layout/call_element_list.xml → res/layout/frag_call_element.xml
+ 2
− 3
View file @ 7596ad93
......@@ -37,11 +37,10 @@ as that of the covered work.
android:paddingLeft="8dp"
android:paddingRight="8dp" >
<com.savoirfairelinux.sflphone.utils.AccountSelectionButton
<com.savoirfairelinux.sflphone.account.AccountSelectionSpinner
android:id="@+id/account_selection_button"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="No Account Selected (for now)"/>
android:layout_width="match_parent"/>
<ListView
android:id="@id/android:list"
......
res/layout/pref_management_layout.xml → res/layout/frag_contact_list.xml
+ 21
− 22
View file @ 7596ad93
......@@ -2,7 +2,7 @@
<!--
Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
Author: Alexandre Savard <alexandre.savard@gmail.com>
Author: Adrien Beraud <adrien.beraud@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -29,29 +29,28 @@ Corresponding Source for a non-source form of such a combination
shall include the source code for the parts of OpenSSL used as well
as that of the covered work.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:orientation="vertical"
android:gravity="center_horizontal"
android:layout_below="@+id/editTo"
android:id="@+id/prefManagementLayout"
android:weightSum="1.0"
android:paddingLeft="8dp"
android:paddingRight="8dp" >
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="8dp"
android:paddingRight="8dp" >
<Button
android:id="@+id/buttonCodecUp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:text="Codec Up" />
<ListView
android:id="@id/android:list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
style="@style/CallElementList"
android:drawSelectorOnTop="false" />
<Button
android:id="@+id/buttonCodecDown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:text="Codec Down" />
<TextView
android:id="@id/android:empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
android:text="No data" />
</LinearLayout>
res/layout/item_account.xml 0 → 100644
+ 31
− 0
View file @ 7596ad93
<?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="wrap_content" >
<TextView
android:id="@+id/account_alias"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
android:id="@+id/account_host"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/account_alias"
android:textAppearance="?android:attr/textAppearanceSmall" />
<RadioButton
android:id="@+id/account_checked"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
android:clickable="false"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"/>
</RelativeLayout>
\ No newline at end of file
res/layout/call_element.xml → res/layout/item_contact.xml
+ 0
− 0
View file @ 7596ad93
File moved
res/layout/numpad.xml
+ 37
− 19
View file @ 7596ad93
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent" >
<TableRow
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1">
<Button android:id="@+id/numButton1"/>
<Button android:id="@+id/numButton2"/>
<Button android:id="@+id/numButton3"/>
android:layout_weight="1" >
<Button
android:id="@+id/numButton1"
style="?android:attr/buttonBarButtonStyle" />
<Button android:id="@+id/numButton2" />
<Button android:id="@+id/numButton3" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1">
<Button android:id="@+id/numButton4"/>
<Button android:id="@+id/numButton5"/>
<Button android:id="@+id/numButton6"/>
android:layout_weight="1" >
<Button android:id="@+id/numButton4" />
<Button android:id="@+id/numButton5" />
<Button android:id="@+id/numButton6" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1">
<Button android:id="@+id/numButton7"/>
<Button android:id="@+id/numButton8"/>
<Button android:id="@+id/numButton9"/>
android:layout_weight="1" >
<Button android:id="@+id/numButton7" />
<Button android:id="@+id/numButton8" />
<Button android:id="@+id/numButton9" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1">
<Button android:id="@+id/numButtonStar"/>
<Button android:id="@+id/numButton0"/>
<Button android:id="@+id/numButtonSharp"/>
android:layout_weight="1" >
<Button android:id="@+id/numButtonStar" />
<Button android:id="@+id/numButton0" />
<Button android:id="@+id/numButtonSharp" />
</TableRow>
</merge>
</merge>
\ No newline at end of file
res/menu/account_creation.xml 0 → 100644
+ 10
− 0
View file @ 7596ad93
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/menuitem_create"
android:icon="@drawable/ic_checkmark_holo_light"
android:showAsAction="ifRoom"
android:title="Create"/>
</menu>
\ No newline at end of file
res/menu/account_edition.xml 0 → 100644
+ 17
− 0
View file @ 7596ad93
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/menuitem_delete"
android:title="Delete"
android:showAsAction="ifRoom"
android:icon="@android:drawable/ic_menu_delete"/>
<item
android:id="@+id/menuitem_edit"
android:title="Edit"
android:showAsAction="ifRoom"
android:icon="@android:drawable/ic_menu_edit"/>
</menu>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment