From d484e5e6fb0e5d6558b7f6f4bce0b9e6ae166d04 Mon Sep 17 00:00:00 2001
From: Emeric Vigier <emeric.vigier@savoirfairelinux.com>
Date: Wed, 29 Aug 2012 09:42:10 -0400
Subject: [PATCH] #14399: clean up
---
res/drawable/ic_tab_play.xml | 1 -
res/layout/test_layout.xml | 18 +-----------------
.../sflphone/client/ManagerImpl.java | 6 ------
.../sflphone/client/SFLPhoneHome.java | 6 ------
4 files changed, 1 insertion(+), 30 deletions(-)
diff --git a/res/drawable/ic_tab_play.xml b/res/drawable/ic_tab_play.xml
index 73af416cd..2827a7032 100644
--- a/res/drawable/ic_tab_play.xml
+++ b/res/drawable/ic_tab_play.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_tab_play_selected" android:state_selected="true" android:state_pressed="false" />
- <item android:drawable="@drawable/ic_tab_play_unselected" />
</selector>
diff --git a/res/layout/test_layout.xml b/res/layout/test_layout.xml
index 6df0a8185..358961151 100644
--- a/res/layout/test_layout.xml
+++ b/res/layout/test_layout.xml
@@ -44,28 +44,12 @@ as that of the covered work.
android:layout_alignParentTop="true"
android:onClick="onClick"
android:text="init" />
-
- <Button
- android:id="@+id/buttonCall"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@+id/buttonInit"
- android:onClick="onClick"
- android:text="call" />
-
- <Button
- android:id="@+id/buttonTest1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@+id/buttonCall"
- android:onClick="onClick"
- android:text="test1" />
<TextView
android:id="@+id/callVoid_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@+id/buttonTest1"
+ android:layout_below="@+id/buttonInit"
android:text="callVoidText" />
<Button
diff --git a/src/com/savoirfairelinux/sflphone/client/ManagerImpl.java b/src/com/savoirfairelinux/sflphone/client/ManagerImpl.java
index 6683582c7..709a53f45 100644
--- a/src/com/savoirfairelinux/sflphone/client/ManagerImpl.java
+++ b/src/com/savoirfairelinux/sflphone/client/ManagerImpl.java
@@ -27,11 +27,6 @@ public class ManagerImpl {
m.sendToTarget();
}
- public static boolean outgoingCallJ(String account_id) {
- Log.i(TAG, "account_id:" + account_id);
- return true;
- }
-
public String getSipLogLevel() {
return sipLogLevel;
}
@@ -42,6 +37,5 @@ public class ManagerImpl {
public static native void setSipLogLevel(String level);
public static native String getJniString();
- public static native boolean outgoingCallN(String account_id);
public static native void initN(String config_file);
}
diff --git a/src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java b/src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java
index 880a8eb3e..c135b0d3c 100644
--- a/src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java
+++ b/src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java
@@ -274,15 +274,9 @@ public class SFLPhoneHome extends Activity implements ActionBar.TabListener, OnC
public void onClick(View view)
{
switch (view.getId()) {
- case R.id.buttonCall:
- ManagerImpl.outgoingCallJ("");
- break;
case R.id.buttonInit:
ManagerImpl.initN("");
break;
- case R.id.buttonTest1:
- Log.i(TAG, "buttonTest1");
- break;
case R.id.buttonCallVoid:
ManagerImpl.callVoid();
break;
--
GitLab