linphone-android/res/layout/call_outgoing.xml
Margaux Clerc 1b207c8dc1 Merge remote-tracking branch 'linphone-android/master' into obiane
Conflicts:
	AndroidManifest.xml
	res/drawable-xhdpi/topbar_avatar.png
	res/drawable/assistant_button.xml
	res/layout-land/call.xml
	res/layout-land/call_incoming.xml
	res/layout-land/call_outgoing.xml
	res/layout-land/chatlist_cell.xml
	res/layout-land/main.xml
	res/layout/about.xml
	res/layout/assistant_account_creation.xml
	res/layout/assistant_linphone_login.xml
	res/layout/assistant_remote_provisioning_login.xml
	res/layout/assistant_topbar.xml
	res/layout/call.xml
	res/layout/call_incoming.xml
	res/layout/call_outgoing.xml
	res/layout/chat.xml
	res/layout/chatlist.xml
	res/layout/chatlist_cell.xml
	res/layout/conference_paused_row.xml
	res/layout/contact.xml
	res/layout/contact_edit.xml
	res/layout/contacts_list.xml
	res/layout/dialog.xml
	res/layout/edit_list.xml
	res/layout/history.xml
	res/layout/history_detail.xml
	res/layout/main.xml
	res/layout/side_menu_account_cell.xml
	res/mipmap-hdpi/ic_launcher.png
	res/mipmap-mdpi/ic_launcher.png
	res/mipmap-xhdpi/ic_launcher.png
	res/mipmap-xxhdpi/ic_launcher.png
	res/mipmap-xxxhdpi/ic_launcher.png
	res/values-ar/strings.xml
	res/values-de/strings.xml
	res/values-es/strings.xml
	res/values-fr/custom.xml
	res/values-fr/strings.xml
	res/values-he/strings.xml
	res/values-ja/strings.xml
	res/values-nl/strings.xml
	res/values-ru/strings.xml
	res/values-tr/strings.xml
	res/values/custom.xml
	res/values/non_localizable_custom.xml
	res/values/strings.xml
	res/values/styles.xml
	src/org/linphone/CallActivity.java
	src/org/linphone/ChatFragment.java
	src/org/linphone/ChatListFragment.java
	src/org/linphone/ContactDetailsFragment.java
	src/org/linphone/ContactsListFragment.java
	src/org/linphone/HistoryDetailFragment.java
	src/org/linphone/HistoryListFragment.java
	src/org/linphone/LinphoneActivity.java
	src/org/linphone/LinphoneManager.java
	src/org/linphone/LinphoneService.java
	src/org/linphone/assistant/RemoteProvisioningActivity.java
2016-02-18 15:56:50 +01:00

133 lines
3.8 KiB
XML

<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/topLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorA">
<fragment
android:id="@+id/status"
android:name="org.linphone.StatusFragment"
tools:layout="@layout/status"
android:layout_width="match_parent"
android:layout_height="40dp"/>
<LinearLayout
android:id="@+id/top_bar"
android:background="@color/colorG"
android:layout_width="match_parent"
android:layout_height="60dp"
android:orientation="horizontal"
android:layout_below="@id/status"
android:gravity="center">
<ImageView
android:src="@drawable/call_status_outgoing"
android:paddingRight="10dp"
android:paddingTop="15dp"
android:paddingBottom="15dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"/>
<TextView
android:text="@string/outgoing_call"
style="@style/font2"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"/>
</LinearLayout>
<ImageView
android:id="@+id/contact_picture"
android:src="@drawable/avatar_big"
android:contentDescription="@string/content_description_contact_picture"
android:layout_centerInParent="true"
android:layout_width="200dp"
android:layout_height="200dp"
android:paddingBottom="20dp"/>
<RelativeLayout
android:id="@+id/contact_detail"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/menu"
android:layout_below="@id/top_bar"
android:paddingTop="10dp">
<LinearLayout
android:background="@color/colorG"
android:layout_alignParentBottom="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:id="@+id/contact_name"
style="@style/font13"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="5dp"/>
<TextView
android:id="@+id/contact_number"
style="@style/font11"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="10dp"
android:layout_below="@id/contact_name"/>
</LinearLayout>
</RelativeLayout>
<org.linphone.mediastream.video.display.GL2JNIView
android:id="@+id/videoSurface"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:visibility="gone" />
<LinearLayout
android:id="@+id/menu"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:orientation="horizontal" >
<ImageView
android:id="@+id/micro"
android:src="@drawable/micro_default"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_micro"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="12dp"/>
<ImageView
android:id="@+id/speaker"
android:src="@drawable/speaker_default"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_speaker"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="15dp"/>
<ImageView
android:id="@+id/outgoing_hang_up"
android:src="@drawable/call_hangup"
android:background="@drawable/hangup"
android:contentDescription="@string/content_description_hang_up"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.7"
android:padding="12dp"/>
</LinearLayout>
</RelativeLayout>