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

Fix landscape graphics

Browse source
This commit is contained in:
Margaux Clerc 2015-11-25 16:49:42 +01:00
parent 727033b77a
commit fc96a26de9
19 changed files with 248 additions and 258 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -128,7 +128,7 @@
<activity android:name=".assistant.AssistantActivity" <activity android:name=".assistant.AssistantActivity"
android:theme="@style/NoTitle" android:theme="@style/NoTitle"
android:screenOrientation="nosensor"> android:screenOrientation="behind">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
</intent-filter> </intent-filter>

110
res/layout-land/call.xml
View file

@ -52,65 +52,62 @@
<RelativeLayout <RelativeLayout
android:id="@+id/active_call" android:id="@+id/active_call"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:gravity="center"
android:layout_centerInParent="true"
android:visibility="visible"> android:visibility="visible">
<LinearLayout
android:id="@+id/active_call_info"
android:background="@color/colorH"
android:alpha="0.8"
android:paddingBottom="10dp"
android:layout_width="match_parent"
android:layout_height="60dp"
android:gravity="center_horizontal"
android:orientation="horizontal">
<TextView
android:id="@+id/current_contact_name"
style="@style/font5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"/>
<Chronometer
android:id="@+id/current_call_timer"
style="@style/font2"
android:layout_marginLeft="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"/>
</LinearLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/avatar_layout" android:id="@+id/avatar_layout"
android:layout_alignParentLeft="true" android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/active_call_info"
android:layout_margin="5dp" android:layout_margin="5dp"
android:paddingTop="10dp"> android:paddingTop="10dp"
android:gravity="center_horizontal">
<ImageView <ImageView
android:id="@+id/contact_picture" android:id="@+id/contact_picture"
android:src="@drawable/avatar" android:src="@drawable/avatar"
android:contentDescription="@string/content_description_contact_picture" android:contentDescription="@string/content_description_contact_picture"
android:layout_width="200dp" android:layout_width="150dp"
android:layout_height="200dp" android:layout_height="150dp"
android:adjustViewBounds="true"/> android:adjustViewBounds="true"/>
<ImageView <ImageView
android:id="@+id/mask" android:id="@+id/mask"
android:src="@drawable/avatar_mask_border" android:src="@drawable/avatar_mask_border"
android:contentDescription="@string/content_description_contact_picture" android:contentDescription="@string/content_description_contact_picture"
android:layout_width="200dp" android:layout_width="150dp"
android:layout_height="200dp" android:layout_height="150dp"
android:adjustViewBounds="true"/> android:adjustViewBounds="true"/>
</RelativeLayout> </RelativeLayout>
<LinearLayout
android:id="@+id/active_call_info"
android:background="@color/colorH"
android:alpha="0.8"
android:layout_centerInParent="true"
android:layout_toRightOf="@id/avatar_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/current_contact_name"
style="@style/font5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="5dp"
android:layout_gravity="center"/>
<Chronometer
android:id="@+id/current_call_timer"
style="@style/font2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/current_contact_name"
android:layout_gravity="center"/>
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/remote_pause" android:id="@+id/remote_pause"
android:background="@color/colorC" android:background="@color/colorC"
@ -143,7 +140,7 @@
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="80dp" android:layout_height="80dp"
android:padding="10dp" android:padding="10dp"
android:layout_alignTop="@+id/active_call_info" android:layout_below="@+id/active_call_info"
android:layout_alignParentRight="true"/> android:layout_alignParentRight="true"/>
<ImageView <ImageView
@ -158,10 +155,12 @@
android:layout_alignParentLeft="true"/> android:layout_alignParentLeft="true"/>
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
android:id="@+id/calls_list" android:id="@+id/calls_list"
android:background="@color/colorH" android:background="@color/colorH"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_weight="0.5"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_gravity="bottom" android:layout_gravity="bottom"
@ -247,7 +246,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:padding="20dp"/> android:padding="18dp"/>
</LinearLayout> </LinearLayout>
@ -267,7 +266,7 @@
android:id="@+id/video" android:id="@+id/video"
android:src="@drawable/camera_default" android:src="@drawable/camera_default"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:padding="25dp" android:padding="22dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"/>
@ -295,7 +294,7 @@
android:id="@+id/speaker" android:id="@+id/speaker"
android:src="@drawable/speaker_default" android:src="@drawable/speaker_default"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:padding="20dp" android:padding="18dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" /> android:layout_weight="1" />
@ -314,7 +313,7 @@
android:id="@+id/options" android:id="@+id/options"
android:src="@drawable/options_default" android:src="@drawable/options_default"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:padding="20dp" android:padding="18dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" /> android:layout_weight="1" />
@ -328,19 +327,20 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_above="@id/menu" android:layout_above="@id/menu"
android:orientation="horizontal" > android:orientation="horizontal" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="invisible" android:visibility="invisible"
android:layout_weight="0.5"/> android:layout_weight="1"/>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="invisible" android:visibility="invisible"
android:layout_weight="0.5"/> android:layout_weight="1"/>
<ImageView <ImageView
android:id="@+id/route_bluetooth" android:id="@+id/route_bluetooth"
@ -350,7 +350,7 @@
android:visibility="invisible" android:visibility="invisible"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.5" /> android:layout_weight="1.4" />
<ImageView <ImageView
android:id="@+id/add_call" android:id="@+id/add_call"
@ -360,7 +360,7 @@
android:visibility="invisible" android:visibility="invisible"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.5" /> android:layout_weight="1.4" />
</LinearLayout> </LinearLayout>
@ -375,13 +375,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="invisible" android:visibility="invisible"
android:layout_weight="0.5"/> android:layout_weight="1"/>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="invisible" android:visibility="invisible"
android:layout_weight="0.5"/> android:layout_weight="1"/>
<ImageView <ImageView
android:id="@+id/route_earpiece" android:id="@+id/route_earpiece"
@ -391,7 +391,7 @@
android:visibility="invisible" android:visibility="invisible"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.5"/> android:layout_weight="1.4"/>
<ImageView <ImageView
android:id="@+id/transfer" android:id="@+id/transfer"
@ -401,7 +401,7 @@
android:visibility="invisible" android:visibility="invisible"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.5"/> android:layout_weight="1.4"/>
</LinearLayout> </LinearLayout>
@ -415,13 +415,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="invisible" android:visibility="invisible"
android:layout_weight="0.5"/> android:layout_weight="1"/>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="invisible" android:visibility="invisible"
android:layout_weight="0.5"/> android:layout_weight="1"/>
<ImageView <ImageView
android:id="@+id/route_speaker" android:id="@+id/route_speaker"
@ -431,7 +431,7 @@
android:padding="20dp" android:padding="20dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.5"/> android:layout_weight="1.4"/>
<ImageView <ImageView
android:id="@+id/conference" android:id="@+id/conference"
@ -441,7 +441,7 @@
android:padding="20dp" android:padding="20dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.5"/> android:layout_weight="1.4"/>
</LinearLayout> </LinearLayout>

26
res/layout/call.xml
View file

@ -9,7 +9,7 @@
android:id="@+id/status" android:id="@+id/status"
android:name="org.linphone.StatusFragment" android:name="org.linphone.StatusFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="35dp"
tools:layout="@layout/status" /> tools:layout="@layout/status" />
@ -215,22 +215,22 @@
<LinearLayout <LinearLayout
android:background="@color/colorF" android:background="@color/colorF"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp" android:layout_height="60dp"
android:orientation="horizontal"> android:orientation="horizontal">
<RelativeLayout <RelativeLayout
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_weight="1"> android:layout_weight="1">
<ImageView <ImageView
android:id="@+id/video" android:id="@+id/video"
android:src="@drawable/camera_default" android:src="@drawable/camera_default"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:padding="25dp" android:padding="22dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="wrap_content"/>
<ProgressBar <ProgressBar
android:id="@+id/video_in_progress" android:id="@+id/video_in_progress"
@ -256,7 +256,7 @@
android:id="@+id/speaker" android:id="@+id/speaker"
android:src="@drawable/speaker_default" android:src="@drawable/speaker_default"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:padding="20dp" android:padding="18dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" /> android:layout_weight="1" />
@ -275,7 +275,7 @@
android:id="@+id/options" android:id="@+id/options"
android:src="@drawable/options_default" android:src="@drawable/options_default"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:padding="20dp" android:padding="18dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" /> android:layout_weight="1" />
@ -284,7 +284,7 @@
<LinearLayout <LinearLayout
android:id="@+id/main_bar" android:id="@+id/main_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp" android:layout_height="60dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_gravity="center" android:layout_gravity="center"
android:orientation="horizontal" > android:orientation="horizontal" >
@ -296,7 +296,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:padding="20dp" /> android:padding="18dp" />
<ImageView <ImageView
android:id="@+id/hang_up" android:id="@+id/hang_up"
@ -315,7 +315,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:padding="20dp"/> android:padding="18dp"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -323,7 +323,7 @@
<LinearLayout <LinearLayout
android:id="@+id/menu_bottom" android:id="@+id/menu_bottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp" android:layout_height="60dp"
android:layout_above="@id/menu" android:layout_above="@id/menu"
android:orientation="horizontal" > android:orientation="horizontal" >
@ -364,7 +364,7 @@
<LinearLayout <LinearLayout
android:id="@+id/menu_middle" android:id="@+id/menu_middle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp" android:layout_height="60dp"
android:layout_above="@id/menu_bottom" android:layout_above="@id/menu_bottom"
android:orientation="horizontal" > android:orientation="horizontal" >
@ -405,7 +405,7 @@
<LinearLayout <LinearLayout
android:layout_above="@id/menu_middle" android:layout_above="@id/menu_middle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp" android:layout_height="60dp"
android:orientation="horizontal" > android:orientation="horizontal" >
<TextView <TextView

2
res/layout/call_inactive_row.xml
View file

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:background="@color/colorA" android:background="@color/colorA"
android:alpha="0.5" android:alpha="0.5"
android:layout_height="60dp" android:layout_height="50dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_margin="2dp" android:layout_margin="2dp"
android:gravity="center_vertical" android:gravity="center_vertical"

3
res/layout/conference_header.xml
View file

@ -1,7 +1,7 @@
<?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" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="60dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:background="@color/colorH"> android:background="@color/colorH">
@ -9,6 +9,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center_vertical"
android:paddingLeft="10dp"> android:paddingLeft="10dp">
<TextView <TextView

2
res/layout/conference_paused_row.xml
View file

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:background="@color/colorA" android:background="@color/colorA"
android:alpha="0.5" android:alpha="0.5"
android:layout_height="60dp" android:layout_height="50dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_margin="2dp" android:layout_margin="2dp"
android:gravity="center_vertical" android:gravity="center_vertical"

10
res/layout/contact.xml
View file

@ -7,7 +7,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="50dp"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="@color/colorF"> android:background="@color/colorF">
@ -19,22 +19,24 @@
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:padding="20dp"/> android:padding="15dp"/>
<ImageView <ImageView
android:contentDescription="@string/content_description_edit" android:contentDescription="@string/content_description_edit"
android:id="@+id/editContact" android:id="@+id/editContact"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:padding="15dp" android:padding="12dp"
android:src="@drawable/edit" android:src="@drawable/edit"
android:background="@drawable/toolbar_button"
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="match_parent"/> android:layout_height="match_parent"/>
<ImageView <ImageView
android:contentDescription="@string/content_description_delete" android:contentDescription="@string/content_description_delete"
android:id="@+id/deleteContact" android:id="@+id/deleteContact"
android:padding="15dp" android:padding="12dp"
android:src="@drawable/delete" android:src="@drawable/delete"
android:background="@drawable/toolbar_button"
android:gravity="center" android:gravity="center"
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="match_parent" android:layout_height="match_parent"

15
res/layout/contacts_list.xml
View file

@ -8,7 +8,7 @@
<RelativeLayout <RelativeLayout
android:id="@+id/top_bar" android:id="@+id/top_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="50dp"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="@color/colorF"> android:background="@color/colorF">
@ -24,8 +24,9 @@
android:contentDescription="@string/content_description_all_contacts" android:contentDescription="@string/content_description_all_contacts"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:src="@drawable/contacts_all" android:src="@drawable/contacts_all"
android:background="@drawable/toolbar_button"
android:gravity="center" android:gravity="center"
android:padding="15dp" android:padding="12dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"/>
@ -50,8 +51,9 @@
android:contentDescription="@string/content_description_linphone_contacts" android:contentDescription="@string/content_description_linphone_contacts"
android:id="@+id/linphone_contacts" android:id="@+id/linphone_contacts"
android:src="@drawable/contacts_sip" android:src="@drawable/contacts_sip"
android:background="@drawable/toolbar_button"
android:gravity="center" android:gravity="center"
android:padding="15dp" android:padding="12dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"/>
@ -70,12 +72,12 @@
<ImageView <ImageView
android:id="@+id/newContact" android:id="@+id/newContact"
android:src="@drawable/contact_add" android:src="@drawable/contact_add"
android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_new_contact" android:contentDescription="@string/content_description_new_contact"
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_toLeftOf="@id/edit" android:layout_toLeftOf="@id/edit"
android:padding="15dp" android:padding="12dp"/>
android:adjustViewBounds="true"/>
<ImageView <ImageView
android:id="@+id/edit" android:id="@+id/edit"
@ -85,8 +87,7 @@
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:padding="15dp" android:padding="12dp"/>
android:adjustViewBounds="true"/>
</RelativeLayout> </RelativeLayout>
<include layout="@layout/edit_list"/> <include layout="@layout/edit_list"/>

8
res/layout/dialer.xml
View file

@ -8,7 +8,7 @@
android:id="@+id/address_bar" android:id="@+id/address_bar"
android:background="@color/colorF" android:background="@color/colorF"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="50dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_alignParentTop="true"> android:layout_alignParentTop="true">
@ -52,7 +52,7 @@
android:id="@+id/controls" android:id="@+id/controls"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp"> android:layout_height="60dp">
<RelativeLayout <RelativeLayout
android:focusable="true" android:focusable="true"
@ -67,7 +67,7 @@
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="20dp" android:padding="15dp"
android:layout_alignParentBottom="true"/> android:layout_alignParentBottom="true"/>
</RelativeLayout> </RelativeLayout>
@ -78,7 +78,7 @@
android:background="@drawable/call" android:background="@drawable/call"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="15dp" android:padding="12dp"
android:layout_weight="0.5"/> android:layout_weight="0.5"/>
</LinearLayout> </LinearLayout>

10
res/layout/edit_list.xml
View file

@ -3,7 +3,7 @@
android:id="@+id/edit_list" android:id="@+id/edit_list"
android:background="@color/colorF" android:background="@color/colorF"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="50dp"
android:visibility="gone"> android:visibility="gone">
<ImageView <ImageView
@ -13,7 +13,7 @@
android:contentDescription="@string/content_description_valid" android:contentDescription="@string/content_description_valid"
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="15dp" android:padding="12dp"
android:layout_alignParentLeft="true"/> android:layout_alignParentLeft="true"/>
<ImageView <ImageView
@ -23,7 +23,7 @@
android:contentDescription="@string/content_description_valid" android:contentDescription="@string/content_description_valid"
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="15dp" android:padding="12dp"
android:layout_alignParentRight="true"/> android:layout_alignParentRight="true"/>
<ImageView <ImageView
@ -33,7 +33,7 @@
android:contentDescription="@string/content_description_valid" android:contentDescription="@string/content_description_valid"
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="15dp" android:padding="12dp"
android:layout_toLeftOf="@id/delete"/> android:layout_toLeftOf="@id/delete"/>
<ImageView <ImageView
@ -43,7 +43,7 @@
android:contentDescription="@string/content_description_valid" android:contentDescription="@string/content_description_valid"
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="15dp" android:padding="12dp"
android:layout_toLeftOf="@id/delete" android:layout_toLeftOf="@id/delete"
android:visibility="gone"/> android:visibility="gone"/>

8
res/layout/history.xml
View file

@ -9,7 +9,7 @@
android:id="@+id/top_bar" android:id="@+id/top_bar"
android:background="@color/colorF" android:background="@color/colorF"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="50dp"
android:layout_gravity="top"> android:layout_gravity="top">
<RelativeLayout <RelativeLayout
@ -23,7 +23,7 @@
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_all_calls" android:contentDescription="@string/content_description_all_calls"
android:gravity="center" android:gravity="center"
android:padding="15dp" android:padding="12dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"/>
@ -50,7 +50,7 @@
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_missed_calls" android:contentDescription="@string/content_description_missed_calls"
android:gravity="center" android:gravity="center"
android:padding="15dp" android:padding="12dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"/>
@ -74,7 +74,7 @@
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:padding="15dp"/> android:padding="12dp"/>
</RelativeLayout> </RelativeLayout>
<include layout="@layout/edit_list"/> <include layout="@layout/edit_list"/>

245
res/layout/history_detail.xml
View file

@ -8,7 +8,7 @@
<RelativeLayout <RelativeLayout
android:background="@color/colorF" android:background="@color/colorF"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="50dp"
android:layout_gravity="bottom"> android:layout_gravity="bottom">
<ImageView <ImageView
@ -16,159 +16,144 @@
android:src="@drawable/back" android:src="@drawable/back"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_back" android:contentDescription="@string/content_description_back"
android:layout_width="wrap_content" android:padding="15dp"
android:layout_height="match_parent" android:layout_width="70dp"
android:layout_alignParentLeft="true" android:layout_height="wrap_content"
android:padding="20dp" android:layout_alignParentLeft="true"/>
android:adjustViewBounds="true"/>
<ImageView <ImageView
android:id="@+id/add_contact" android:id="@+id/add_contact"
android:src="@drawable/contact_add" android:src="@drawable/contact_add"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_add_contact" android:contentDescription="@string/content_description_add_contact"
android:layout_alignParentRight="true" android:padding="12dp"
android:padding="15dp" android:layout_width="70dp"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="match_parent" android:layout_alignParentRight="true"/>
android:adjustViewBounds="true"/>
</RelativeLayout> </RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="20dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:gravity="center"
android:orientation="vertical">
<ScrollView
<RelativeLayout
android:id="@+id/avatar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">
<ImageView
android:id="@+id/contact_picture"
android:src="@drawable/avatar"
android:contentDescription="@string/content_description_contact_picture"
android:layout_width="100dp"
android:layout_height="100dp"
android:adjustViewBounds="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="5dp"/>
<ImageView
android:id="@+id/mask"
android:src="@drawable/avatar_mask"
android:contentDescription="@string/content_description_contact_picture"
android:layout_width="100dp"
android:layout_height="100dp"
android:adjustViewBounds="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="5dp"/>
</RelativeLayout>
<TextView
android:id="@+id/contact_name"
style="@style/font5"
android:singleLine="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/contact_address"
style="@style/font2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="20dp"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:id="@+id/call"
android:src="@drawable/call_start_body_default"
android:contentDescription="@string/content_description_dial_back"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_margin="10dp"
android:adjustViewBounds="true"
android:layout_centerInParent="true"/>
<ImageView
android:id="@+id/chat"
android:src="@drawable/chat_start_body_default"
android:contentDescription="@string/content_description_chat"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_margin="10dp"
android:adjustViewBounds="true"
android:layout_centerInParent="true" />
</LinearLayout>
<LinearLayout
android:id="@+id/log_row"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:orientation="vertical"
android:paddingTop="20dp">
<View
android:background="@color/colorE"
android:layout_width="wrap_content"
android:layout_height="1dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"/>
<TextView
android:text="@string/call"
style="@style/font13"
android:textAllCaps="true"
android:layout_marginTop="2dp"
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<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:gravity="center" android:gravity="center"
android:padding="10dp"> android:padding="10dp"
android:orientation="vertical">
<ImageView <RelativeLayout
android:id="@+id/direction" android:id="@+id/avatar_layout"
android:paddingLeft="10dp" android:layout_marginTop="20dp"
android:paddingRight="10dp" android:layout_marginBottom="10dp"
android:paddingTop="10dp" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">
<ImageView
android:id="@+id/contact_picture"
android:src="@drawable/avatar"
android:contentDescription="@string/content_description_contact_picture"
android:layout_width="100dp"
android:layout_height="100dp"/>
<ImageView
android:id="@+id/mask"
android:src="@drawable/avatar_mask"
android:layout_width="100dp"
android:layout_height="100dp"/>
</RelativeLayout>
<TextView
android:id="@+id/contact_name"
style="@style/font5"
android:singleLine="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<TextView <TextView
android:id="@+id/date" android:id="@+id/contact_address"
style="@style/font10" style="@style/font2"
android:paddingRight="10dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<TextView <LinearLayout
android:id="@+id/time" android:layout_width="match_parent"
style="@style/font10" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:padding="10dp"
android:layout_height="wrap_content"/> android:gravity="center"
android:orientation="horizontal">
<ImageView
android:id="@+id/call"
android:src="@drawable/call_start_body_default"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_margin="10dp"/>
<ImageView
android:id="@+id/chat"
android:src="@drawable/chat_start_body_default"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_margin="10dp"/>
</LinearLayout>
<LinearLayout
android:id="@+id/log_row"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<View
android:background="@color/colorE"
android:layout_width="wrap_content"
android:layout_height="1dp"/>
<TextView
android:text="@string/call"
style="@style/font13"
android:textAllCaps="true"
android:layout_marginTop="2dp"
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center"
android:padding="10dp">
<ImageView
android:id="@+id/direction"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/date"
style="@style/font10"
android:paddingRight="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/time"
style="@style/font10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout>
</ScrollView>
</LinearLayout> </LinearLayout>

16
res/layout/main.xml
View file

@ -9,7 +9,7 @@
android:id="@+id/status" android:id="@+id/status"
android:name="org.linphone.StatusFragment" android:name="org.linphone.StatusFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="35dp"
tools:layout="@layout/status" /> tools:layout="@layout/status" />
<android.support.v4.widget.DrawerLayout <android.support.v4.widget.DrawerLayout
@ -74,7 +74,7 @@
<LinearLayout <LinearLayout
android:id="@+id/footer" android:id="@+id/footer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp" android:layout_height="60dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:orientation="horizontal"> android:orientation="horizontal">
@ -88,7 +88,8 @@
<ImageView <ImageView
android:src="@drawable/footer_history" android:src="@drawable/footer_history"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="35dp" android:layout_height="wrap_content"
android:padding="15dp"
android:layout_centerInParent="true"/> android:layout_centerInParent="true"/>
<View <View
@ -121,7 +122,8 @@
<ImageView <ImageView
android:src="@drawable/footer_contacts" android:src="@drawable/footer_contacts"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="35dp" android:layout_height="wrap_content"
android:padding="15dp"
android:layout_centerInParent="true"/> android:layout_centerInParent="true"/>
<View <View
@ -143,7 +145,8 @@
<ImageView <ImageView
android:src="@drawable/footer_dialer" android:src="@drawable/footer_dialer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="35dp" android:layout_height="wrap_content"
android:padding="15dp"
android:layout_centerInParent="true"/> android:layout_centerInParent="true"/>
<View <View
@ -165,7 +168,8 @@
<ImageView <ImageView
android:src="@drawable/footer_chat" android:src="@drawable/footer_chat"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="35dp" android:layout_height="wrap_content"
android:padding="15dp"
android:layout_centerInParent="true" /> android:layout_centerInParent="true" />
<View <View

2
res/layout/search_contact_cell.xml
View file

@ -3,7 +3,7 @@
android:id="@+id/layout" android:id="@+id/layout"
android:background="@drawable/list_selector" android:background="@drawable/list_selector"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="50dp"
android:padding="5dp" android:padding="5dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="vertical" > android:orientation="vertical" >

4
res/layout/status.xml
View file

@ -3,7 +3,7 @@
android:id="@+id/status" android:id="@+id/status"
android:background="@color/colorA" android:background="@color/colorA"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="35dp"
android:orientation="horizontal"> android:orientation="horizontal">
<RelativeLayout <RelativeLayout
@ -16,7 +16,7 @@
android:src="@drawable/menu_burger" android:src="@drawable/menu_burger"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="10dp" android:padding="8dp"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_alignParentLeft="true"/> android:layout_alignParentLeft="true"/>

6
res/values/styles.xml
View file

@ -9,7 +9,7 @@
<item name="android:textColor">@color/colorA</item> <item name="android:textColor">@color/colorA</item>
<item name="android:textAllCaps">true</item> <item name="android:textAllCaps">true</item>
<item name="android:textStyle">bold</item> <item name="android:textStyle">bold</item>
<item name="android:textSize">28sp</item> <item name="android:textSize">24sp</item>
</style> </style>
<style name="font2" parent="@android:style/TextAppearance.Medium"> <style name="font2" parent="@android:style/TextAppearance.Medium">
@ -31,7 +31,7 @@
<style name="font5" parent="@android:style/TextAppearance.Medium"> <style name="font5" parent="@android:style/TextAppearance.Medium">
<item name="android:textColor">@color/colorC</item> <item name="android:textColor">@color/colorC</item>
<item name="android:textSize">32sp</item> <item name="android:textSize">28sp</item>
</style> </style>
<style name="font6" parent="@android:style/TextAppearance.Medium"> <style name="font6" parent="@android:style/TextAppearance.Medium">
@ -89,7 +89,7 @@
<style name="font16" parent="@android:style/TextAppearance.Small"> <style name="font16" parent="@android:style/TextAppearance.Small">
<item name="android:textColor">@color/colorH</item> <item name="android:textColor">@color/colorH</item>
<item name="android:textSize">20sp</item> <item name="android:textSize">18sp</item>
</style> </style>
<style name="font17" parent="@android:style/TextAppearance.Small"> <style name="font17" parent="@android:style/TextAppearance.Small">

25
src/org/linphone/CallActivity.java
View file

@ -74,7 +74,7 @@ import android.widget.Toast;
* @author Sylvain Berfini * @author Sylvain Berfini
*/ */
public class CallActivity extends Activity implements OnClickListener { public class CallActivity extends Activity implements OnClickListener {
private final static int SECONDS_BEFORE_HIDING_CONTROLS = 5000; private final static int SECONDS_BEFORE_HIDING_CONTROLS = 4000;
private final static int SECONDS_BEFORE_DENYING_CALL_UPDATE = 30000; private final static int SECONDS_BEFORE_DENYING_CALL_UPDATE = 30000;
private static CallActivity instance; private static CallActivity instance;
@ -468,11 +468,8 @@ public class CallActivity extends Activity implements OnClickListener {
enabledConferenceButton(false); enabledConferenceButton(false);
} }
refreshInCallActions(); refreshInCallActions();
refreshCallList(getResources()); refreshCallList(getResources());
} }
private void refreshInCallActions() { private void refreshInCallActions() {
@ -869,7 +866,6 @@ public class CallActivity extends Activity implements OnClickListener {
mActiveCallHeader.setVisibility(View.GONE); mActiveCallHeader.setVisibility(View.GONE);
switchCamera.setVisibility(View.GONE); switchCamera.setVisibility(View.GONE);
mNoCurrentCall.setVisibility(View.GONE); mNoCurrentCall.setVisibility(View.GONE);
Log.w("Call list gone");
callsList.setVisibility(View.GONE); callsList.setVisibility(View.GONE);
} }
} }
@ -1343,16 +1339,6 @@ public class CallActivity extends Activity implements OnClickListener {
@Override @Override
protected void onResume() { protected void onResume() {
instance = this; instance = this;
if (isVideoEnabled(LinphoneManager.getLc().getCurrentCall())) {
//displayVideoCallControlsIfHidden();
} else if(LinphoneManager.getLc().isInConference()) {
displayConference();
} else {
LinphoneManager.startProximitySensorForActivity(this);
removeCallbacks();
}
super.onResume(); super.onResume();
LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull(); LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
@ -1362,6 +1348,15 @@ public class CallActivity extends Activity implements OnClickListener {
refreshIncallUi(); refreshIncallUi();
handleViewIntent(); handleViewIntent();
if (isVideoEnabled(LinphoneManager.getLc().getCurrentCall())) {
displayVideoCall(false);
} else if(LinphoneManager.getLc().isInConference()) {
displayConference();
} else {
LinphoneManager.startProximitySensorForActivity(this);
removeCallbacks();
}
} }
private void handleViewIntent() { private void handleViewIntent() {

4
src/org/linphone/LinphoneService.java
View file

@ -79,7 +79,7 @@ public final class LinphoneService extends Service {
public static final int IC_LEVEL_ORANGE=0; public static final int IC_LEVEL_ORANGE=0;
/*private static final int IC_LEVEL_GREEN=1; /*private static final int IC_LEVEL_GREEN=1;
private static final int IC_LEVEL_RED=2;*/ private static final int IC_LEVEL_RED=2;*/
public static final int IC_LEVEL_OFFLINE=3; //public static final int IC_LEVEL_OFFLINE=3;
private static LinphoneService instance; private static LinphoneService instance;
@ -532,7 +532,7 @@ public final class LinphoneService extends Service {
bm = BitmapFactory.decodeResource(getResources(), R.drawable.linphone_logo); bm = BitmapFactory.decodeResource(getResources(), R.drawable.linphone_logo);
} catch (Exception e) { } catch (Exception e) {
} }
mNotif = Compatibility.createNotification(this, mNotificationTitle, text, R.drawable.status_level, level, bm, mNotifContentIntent, true,notifcationsPriority); mNotif = Compatibility.createNotification(this, mNotificationTitle, text, R.drawable.status_level, 0, bm, mNotifContentIntent, true,notifcationsPriority);
notifyWrapper(NOTIF_ID, mNotif); notifyWrapper(NOTIF_ID, mNotif);
} }

6
src/org/linphone/assistant/AssistantActivity.java
View file

@ -73,8 +73,10 @@ public class AssistantActivity extends Activity implements OnClickListener {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (getResources().getBoolean(R.bool.isTablet) && getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) { if (getResources().getBoolean(R.bool.isTablet) && getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
} } else if (getResources().getBoolean(R.bool.orientation_portrait_only)) {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
}
setContentView(R.layout.assistant); setContentView(R.layout.assistant);
initUI(); initUI();