Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Code cleaned a bit

Browse source
This commit is contained in:
Sylvain Berfini 2012-07-20 16:58:32 +02:00
parent 1cef2ca364
commit 43e543368b
8 changed files with 151 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
AndroidManifest.xml
View file

@ -82,8 +82,7 @@
<activity android:name="org.linphone.InCallActivity" <activity android:name="org.linphone.InCallActivity"
android:theme="@android:style/Theme.NoTitleBar" android:theme="@android:style/Theme.NoTitleBar"
android:launchMode="singleTask" android:launchMode="singleTask">
android:configChanges="orientation">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
</intent-filter> </intent-filter>

46
res/layout-land/incall.xml
View file

@ -44,44 +44,44 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="100dp" android:layout_height="100dp"
android:layout_weight="0.5" android:layout_weight="1"
android:orientation="horizontal" > android:orientation="horizontal" >
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="1"
android:visibility="invisible" /> android:visibility="invisible" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="1"
android:visibility="invisible" /> android:visibility="invisible" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="1"
android:visibility="invisible" /> android:visibility="invisible" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="1"
android:visibility="invisible" /> android:visibility="invisible" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="1"
android:visibility="invisible" /> android:visibility="invisible" />
<ImageView <ImageView
android:id="@+id/transfer" android:id="@+id/transfer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="1"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/options_transfer" android:src="@drawable/options_transfer"
android:visibility="gone" /> android:visibility="gone" />
@ -89,14 +89,14 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="1"
android:visibility="invisible" /> android:visibility="invisible" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="100dp" android:layout_height="100dp"
android:layout_weight="0.5" android:layout_weight="1"
android:orientation="horizontal" > android:orientation="horizontal" >
<View <View
@ -108,32 +108,32 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="1"
android:visibility="invisible" /> android:visibility="invisible" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="1"
android:visibility="invisible" /> android:visibility="invisible" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="1"
android:visibility="invisible" /> android:visibility="invisible" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="1"
android:visibility="invisible" /> android:visibility="invisible" />
<ImageView <ImageView
android:id="@+id/addCall" android:id="@+id/addCall"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="1"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/options_add_call_alt" android:src="@drawable/options_add_call_alt"
android:visibility="gone" /> android:visibility="gone" />
@ -141,21 +141,21 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="1"
android:visibility="invisible" /> android:visibility="invisible" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="100dp" android:layout_height="100dp"
android:layout_weight="0.5" android:layout_weight="1"
android:orientation="horizontal" > android:orientation="horizontal" >
<ImageView <ImageView
android:id="@+id/pause" android:id="@+id/pause"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="1"
android:contentDescription="@string/content_description_pause" android:contentDescription="@string/content_description_pause"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/pause_off" /> android:src="@drawable/pause_off" />
@ -164,7 +164,7 @@
android:id="@+id/video" android:id="@+id/video"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="1"
android:contentDescription="@string/content_description_switch_video" android:contentDescription="@string/content_description_switch_video"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/video_off" /> android:src="@drawable/video_off" />
@ -173,7 +173,7 @@
android:id="@+id/micro" android:id="@+id/micro"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="1"
android:contentDescription="@string/content_description_toggle_micro" android:contentDescription="@string/content_description_toggle_micro"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/micro_on" /> android:src="@drawable/micro_on" />
@ -182,7 +182,7 @@
android:id="@+id/hangUp" android:id="@+id/hangUp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="1"
android:contentDescription="@string/content_description_hang_up" android:contentDescription="@string/content_description_hang_up"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/hangup" /> android:src="@drawable/hangup" />
@ -191,7 +191,7 @@
android:id="@+id/speaker" android:id="@+id/speaker"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="1"
android:contentDescription="@string/content_description_toggle_speaker" android:contentDescription="@string/content_description_toggle_speaker"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/speaker_off" /> android:src="@drawable/speaker_off" />
@ -200,7 +200,7 @@
android:id="@+id/options" android:id="@+id/options"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="1"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/options" /> android:src="@drawable/options" />
@ -208,7 +208,7 @@
android:id="@+id/dialer" android:id="@+id/dialer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.25" android:layout_weight="1"
android:contentDescription="@string/content_description_numpad" android:contentDescription="@string/content_description_numpad"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/dialer_alt" /> android:src="@drawable/dialer_alt" />

40
res/layout/incall.xml
View file

@ -21,6 +21,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:layout="@layout/status" /> tools:layout="@layout/status" />
</FrameLayout> </FrameLayout>
<ImageView <ImageView
@ -44,32 +45,32 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.5" android:layout_weight="1"
android:orientation="horizontal" > android:orientation="horizontal" >
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_weight="0.25" android:layout_weight="1"
android:visibility="invisible" /> android:visibility="invisible" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_weight="0.25" android:layout_weight="1"
android:visibility="invisible" /> android:visibility="invisible" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_weight="0.25" android:layout_weight="1"
android:visibility="invisible" /> android:visibility="invisible" />
<ImageView <ImageView
android:id="@+id/transfer" android:id="@+id/transfer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_weight="0.25" android:layout_weight="1"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/options_transfer" android:src="@drawable/options_transfer"
android:visibility="gone" /> android:visibility="gone" />
@ -78,48 +79,49 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.5" android:layout_weight="1"
android:orientation="horizontal" > android:orientation="horizontal" >
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_weight="0.25" android:layout_weight="1"
android:visibility="invisible" /> android:visibility="invisible" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_weight="0.25" android:layout_weight="1"
android:visibility="invisible" /> android:visibility="invisible" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_weight="0.25" android:layout_weight="1"
android:visibility="invisible" /> android:visibility="invisible" />
<ImageView <ImageView
android:id="@+id/addCall" android:id="@+id/addCall"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_weight="0.25" android:layout_weight="1"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/options_add_call_alt" android:src="@drawable/options_add_call_alt"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.5" android:layout_weight="1"
android:orientation="horizontal" > android:orientation="horizontal" >
<ImageView <ImageView
android:id="@+id/video" android:id="@+id/video"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_weight="0.25" android:layout_weight="1"
android:contentDescription="@string/content_description_switch_video" android:contentDescription="@string/content_description_switch_video"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/video_off" /> android:src="@drawable/video_off" />
@ -128,7 +130,7 @@
android:id="@+id/micro" android:id="@+id/micro"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_weight="0.25" android:layout_weight="1"
android:contentDescription="@string/content_description_toggle_micro" android:contentDescription="@string/content_description_toggle_micro"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/micro_on" /> android:src="@drawable/micro_on" />
@ -137,7 +139,7 @@
android:id="@+id/speaker" android:id="@+id/speaker"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_weight="0.25" android:layout_weight="1"
android:contentDescription="@string/content_description_toggle_speaker" android:contentDescription="@string/content_description_toggle_speaker"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/speaker_off" /> android:src="@drawable/speaker_off" />
@ -146,7 +148,7 @@
android:id="@+id/options" android:id="@+id/options"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_weight="0.25" android:layout_weight="1"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/options" /> android:src="@drawable/options" />
</LinearLayout> </LinearLayout>
@ -154,14 +156,14 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_weight="0.5" android:layout_weight="1"
android:orientation="horizontal" > android:orientation="horizontal" >
<ImageView <ImageView
android:id="@+id/pause" android:id="@+id/pause"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.3" android:layout_weight="1"
android:contentDescription="@string/content_description_pause" android:contentDescription="@string/content_description_pause"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/pause_off" /> android:src="@drawable/pause_off" />
@ -170,7 +172,7 @@
android:id="@+id/hangUp" android:id="@+id/hangUp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.3" android:layout_weight="1"
android:contentDescription="@string/content_description_hang_up" android:contentDescription="@string/content_description_hang_up"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/hangup" /> android:src="@drawable/hangup" />
@ -179,7 +181,7 @@
android:id="@+id/dialer" android:id="@+id/dialer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.3" android:layout_weight="1"
android:contentDescription="@string/content_description_numpad" android:contentDescription="@string/content_description_numpad"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/dialer_alt" /> android:src="@drawable/dialer_alt" />

211
res/layout/main.xml
View file

@ -1,115 +1,114 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent"> android:layout_width="match_parent"
android:layout_height="match_parent" >
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true"> android:layout_alignParentTop="true" >
<LinearLayout
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="20dp"
android:paddingBottom="75dp"
android:orientation="horizontal" />
<fragment android:name="org.linphone.StatusFragment"
android:id="@+id/status"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</FrameLayout>
<LinearLayout
android:id="@+id/menu"
android:layout_width="match_parent"
android:layout_height="90dp"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.2">
<ImageView
android:contentDescription="@string/content_description_history"
android:id="@+id/history"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="@drawable/history" />
<TextView
android:id="@+id/missedCalls"
android:layout_width="25dp"
android:layout_height="25dp"
android:gravity="center"
android:textSize="20dp"
android:visibility="gone"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:background="@drawable/missed_calls_bg" />
</RelativeLayout>
<ImageView
android:contentDescription="@string/content_description_contacts"
android:id="@+id/contacts"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.2"
android:scaleType="fitXY"
android:src="@drawable/contacts" />
<ImageView <LinearLayout
android:contentDescription="@string/content_description_dialer" android:id="@+id/fragmentContainer"
android:id="@+id/dialer" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:layout_height="match_parent" android:orientation="horizontal"
android:layout_weight="0.2" android:paddingBottom="75dp"
android:scaleType="fitXY" android:paddingTop="20dp" />
android:src="@drawable/dialer" />
<ImageView <fragment
android:contentDescription="@string/content_description_settings" android:id="@+id/status"
android:id="@+id/settings" android:name="org.linphone.StatusFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_weight="0.2" tools:layout="@layout/status" />
android:scaleType="fitXY" </FrameLayout>
android:src="@drawable/settings" />
<RelativeLayout <LinearLayout
android:layout_width="match_parent" android:id="@+id/menu"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_weight="0.2"> android:layout_height="90dp"
android:layout_alignParentBottom="true"
<ImageView android:orientation="horizontal" >
android:contentDescription="@string/content_description_chat"
android:id="@+id/chat" <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_weight="0.2" android:layout_weight="0.2" >
android:scaleType="fitXY"
android:src="@drawable/chat" /> <ImageView
android:id="@+id/history"
<TextView android:layout_width="match_parent"
android:id="@+id/missedChats" android:layout_height="wrap_content"
android:layout_width="25dp" android:contentDescription="@string/content_description_history"
android:layout_height="25dp" android:scaleType="fitXY"
android:gravity="center" android:src="@drawable/history" />
android:textSize="20dp"
android:visibility="gone" <TextView
android:layout_alignParentTop="true" android:id="@+id/missedCalls"
android:layout_alignParentRight="true" android:layout_width="25dp"
android:background="@drawable/missed_calls_bg" /> android:layout_height="25dp"
android:layout_alignParentRight="true"
</RelativeLayout> android:layout_alignParentTop="true"
android:background="@drawable/missed_calls_bg"
</LinearLayout> android:gravity="center"
android:textSize="20dp"
android:visibility="gone" />
</RelativeLayout>
<ImageView
android:id="@+id/contacts"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.2"
android:contentDescription="@string/content_description_contacts"
android:scaleType="fitXY"
android:src="@drawable/contacts" />
<ImageView
android:id="@+id/dialer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.2"
android:contentDescription="@string/content_description_dialer"
android:scaleType="fitXY"
android:src="@drawable/dialer" />
<ImageView
android:id="@+id/settings"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.2"
android:contentDescription="@string/content_description_settings"
android:scaleType="fitXY"
android:src="@drawable/settings" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.2" >
<ImageView
android:id="@+id/chat"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.2"
android:contentDescription="@string/content_description_chat"
android:scaleType="fitXY"
android:src="@drawable/chat" />
<TextView
android:id="@+id/missedChats"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:background="@drawable/missed_calls_bg"
android:gravity="center"
android:textSize="20dp"
android:visibility="gone" />
</RelativeLayout>
</LinearLayout>
</RelativeLayout> </RelativeLayout>

6
src/org/linphone/AudioCallFragment.java
View file

@ -152,12 +152,6 @@ public class AudioCallFragment extends Fragment {
InCallActivity.instance().setCallControlsVisibleAndRemoveCallbacks(); InCallActivity.instance().setCallControlsVisibleAndRemoveCallbacks();
} }
@Override
public void onDestroy() {
instance = null;
super.onDestroy();
}
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();

6
src/org/linphone/InCallActivity.java
View file

@ -557,12 +557,6 @@ public class InCallActivity extends FragmentActivity implements
} }
} }
@Override
protected void onDestroy() {
instance = null;
super.onDestroy();
}
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();

2
src/org/linphone/StatusFragment.java
View file

@ -276,7 +276,7 @@ public class StatusFragment extends Fragment {
mCallQualityUpdater = null; mCallQualityUpdater = null;
} }
} }
public void refreshStatusItems() { public void refreshStatusItems() {
LinphoneCall call = LinphoneManager.getLc().getCurrentCall(); LinphoneCall call = LinphoneManager.getLc().getCurrentCall();
if (call != null && encryption != null) { if (call != null && encryption != null) {

1
src/org/linphone/VideoCallFragment.java
View file

@ -153,7 +153,6 @@ public class VideoCallFragment extends Fragment {
// Prevent linphone from crashing if correspondent hang up while you are rotating // Prevent linphone from crashing if correspondent hang up while you are rotating
androidVideoWindowImpl.release(); androidVideoWindowImpl.release();
} }
instance = null;
super.onDestroy(); super.onDestroy();
} }