mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-18 03:48:08 +00:00
1b207c8dc1
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
450 lines
17 KiB
XML
450 lines
17 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.support.v4.widget.DrawerLayout
|
|
android:id="@+id/side_menu"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent">
|
|
|
|
<RelativeLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_below="@id/status">
|
|
|
|
<LinearLayout
|
|
android:id="@+id/fragmentContainer"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:orientation="horizontal"/>
|
|
|
|
<FrameLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_above="@+id/menu">
|
|
|
|
<RelativeLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="40dp">
|
|
|
|
<LinearLayout
|
|
android:id="@+id/conference_list"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="top"
|
|
android:layout_alignParentTop="true"
|
|
android:orientation="vertical"
|
|
android:visibility="gone">
|
|
</LinearLayout>
|
|
|
|
<RelativeLayout
|
|
android:id="@+id/active_call"
|
|
android:background="@color/colorA"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="visible">
|
|
|
|
<LinearLayout
|
|
android:id="@+id/active_call_info"
|
|
android:background="@color/colorG"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="80dp"
|
|
android:layout_centerHorizontal="true"
|
|
android:layout_alignParentBottom="true"
|
|
android:orientation="vertical">
|
|
|
|
<TextView
|
|
android:id="@+id/current_contact_name"
|
|
style="@style/font13"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:paddingTop="5dp"
|
|
android:layout_alignParentTop="true"
|
|
android:layout_gravity="center"/>
|
|
|
|
<Chronometer
|
|
android:id="@+id/current_call_timer"
|
|
style="@style/font11"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_below="@id/current_contact_name"
|
|
android:layout_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"/>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/remote_pause"
|
|
android:background="@color/colorA"
|
|
android:alpha="0.9"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:gravity="center"
|
|
android:orientation="vertical"
|
|
android:visibility="gone">
|
|
|
|
<ImageView
|
|
android:src="@drawable/waiting_time"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center"/>
|
|
|
|
<TextView
|
|
android:text="@string/call_paused_by_remote"
|
|
style="@style/font4"
|
|
android:gravity="center"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center"/>
|
|
|
|
</LinearLayout>
|
|
|
|
<ImageView
|
|
android:id="@+id/pause"
|
|
android:src="@drawable/pause_big_default"
|
|
android:contentDescription="@string/content_description_pause"
|
|
android:layout_width="80dp"
|
|
android:layout_height="80dp"
|
|
android:padding="15dp"
|
|
android:layout_below="@+id/active_call_info"
|
|
android:layout_alignParentRight="true"
|
|
android:layout_alignParentTop="true"/>
|
|
|
|
<ImageView
|
|
android:id="@+id/switchCamera"
|
|
android:src="@drawable/switch_camera"
|
|
android:layout_width="80dp"
|
|
android:layout_height="80dp"
|
|
android:padding="15dp"
|
|
android:contentDescription="@string/content_description_switch_camera"
|
|
android:visibility="invisible"
|
|
android:layout_below="@+id/active_call_info"
|
|
android:layout_alignParentLeft="true"
|
|
android:layout_alignParentTop="true"/>
|
|
|
|
</RelativeLayout>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/calls_list"
|
|
android:background="@color/colorG"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_alignParentBottom="true"
|
|
android:layout_gravity="bottom"
|
|
android:divider="@color/colorF"
|
|
android:dividerHeight="1dp"
|
|
android:orientation="vertical">
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/no_current_call"
|
|
android:background="@color/colorA"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:orientation="vertical"
|
|
android:layout_above="@id/calls_list"
|
|
android:gravity="center_vertical"
|
|
android:visibility="gone">
|
|
|
|
<ImageView
|
|
android:src="@drawable/waiting_time"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center"/>
|
|
|
|
<TextView
|
|
android:text="@string/no_current_call"
|
|
style="@style/font4"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:gravity="center"
|
|
android:layout_gravity="center"/>
|
|
</LinearLayout>
|
|
|
|
</RelativeLayout>
|
|
</FrameLayout>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/main_bar"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="60dp"
|
|
android:layout_alignParentBottom="true"
|
|
android:layout_gravity="center"
|
|
android:orientation="horizontal" >
|
|
|
|
<ImageView
|
|
android:id="@+id/dialer"
|
|
android:src="@drawable/dialer"
|
|
android:background="@color/colorC"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="0.8"
|
|
android:padding="15dp" />
|
|
|
|
<ImageView
|
|
android:id="@+id/hang_up"
|
|
android:src="@drawable/call_hangup"
|
|
android:background="@drawable/hangup"
|
|
android:layout_gravity="center"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="0.4"
|
|
android:padding="12dp"/>
|
|
|
|
<ImageView
|
|
android:id="@+id/chat"
|
|
android:src="@drawable/chat"
|
|
android:background="@color/colorC"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="0.8"
|
|
android:padding="15dp"/>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/menu"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_above="@id/main_bar"
|
|
android:orientation="vertical">
|
|
|
|
<LinearLayout
|
|
android:background="@color/colorF"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="60dp"
|
|
android:orientation="horizontal">
|
|
|
|
<RelativeLayout
|
|
android:background="@drawable/button_background"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="1">
|
|
|
|
<ImageView
|
|
android:id="@+id/video"
|
|
android:src="@drawable/camera_default"
|
|
android:background="@drawable/button_background"
|
|
android:padding="20dp"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"/>
|
|
|
|
<ProgressBar
|
|
android:id="@+id/video_in_progress"
|
|
style="?android:attr/progressBarStyle"
|
|
android:layout_centerHorizontal="true"
|
|
android:layout_centerVertical="true"
|
|
android:visibility="gone"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"/>
|
|
|
|
</RelativeLayout>
|
|
|
|
<ImageView
|
|
android:id="@+id/micro"
|
|
android:src="@drawable/micro_default"
|
|
android:background="@drawable/button_background"
|
|
android:padding="12dp"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="1" />
|
|
|
|
<ImageView
|
|
android:id="@+id/speaker"
|
|
android:src="@drawable/speaker_default"
|
|
android:background="@drawable/button_background"
|
|
android:padding="15dp"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_weight="1" />
|
|
|
|
<ImageView
|
|
android:id="@+id/audio_route"
|
|
android:src="@drawable/routes"
|
|
android:background="@drawable/button_background"
|
|
android:visibility="gone"
|
|
android:padding="20dp"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_weight="1" />
|
|
|
|
<ImageView
|
|
android:id="@+id/options"
|
|
android:src="@drawable/options_default"
|
|
android:background="@drawable/button_background"
|
|
android:padding="15dp"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="1" />
|
|
</LinearLayout>
|
|
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/menu_bottom"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="60dp"
|
|
android:layout_above="@id/menu"
|
|
android:orientation="horizontal" >
|
|
|
|
<TextView
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="invisible"
|
|
android:layout_weight="0.5"/>
|
|
|
|
<TextView
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="invisible"
|
|
android:layout_weight="0.5"/>
|
|
|
|
<ImageView
|
|
android:id="@+id/route_bluetooth"
|
|
android:src="@drawable/route_bluetooth"
|
|
android:background="@drawable/button_call_background"
|
|
android:padding="15dp"
|
|
android:visibility="invisible"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="0.5" />
|
|
|
|
<ImageView
|
|
android:id="@+id/add_call"
|
|
android:src="@drawable/options_add_call"
|
|
android:background="@drawable/button_call_background"
|
|
android:padding="15dp"
|
|
android:visibility="invisible"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="0.5" />
|
|
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/menu_middle"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="60dp"
|
|
android:layout_above="@id/menu_bottom"
|
|
android:orientation="horizontal" >
|
|
|
|
<TextView
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="invisible"
|
|
android:layout_weight="0.5"/>
|
|
|
|
<TextView
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="invisible"
|
|
android:layout_weight="0.5"/>
|
|
|
|
<ImageView
|
|
android:id="@+id/route_earpiece"
|
|
android:src="@drawable/route_earpiece"
|
|
android:background="@drawable/button_call_background"
|
|
android:padding="15dp"
|
|
android:visibility="invisible"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="0.5"/>
|
|
|
|
<ImageView
|
|
android:id="@+id/transfer"
|
|
android:src="@drawable/options_transfer_call"
|
|
android:background="@drawable/button_call_background"
|
|
android:padding="15dp"
|
|
android:visibility="invisible"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="0.5"/>
|
|
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:layout_above="@id/menu_middle"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="60dp"
|
|
android:orientation="horizontal" >
|
|
|
|
<TextView
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="invisible"
|
|
android:layout_weight="0.5"/>
|
|
|
|
<TextView
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="invisible"
|
|
android:layout_weight="0.5"/>
|
|
|
|
<ImageView
|
|
android:id="@+id/route_speaker"
|
|
android:src="@drawable/route_speaker"
|
|
android:background="@drawable/button_call_background"
|
|
android:visibility="invisible"
|
|
android:padding="15dp"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="0.5"/>
|
|
|
|
<ImageView
|
|
android:id="@+id/conference"
|
|
android:src="@drawable/options_start_conference"
|
|
android:background="@drawable/button_call_background"
|
|
android:visibility="invisible"
|
|
android:padding="15dp"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="0.5"/>
|
|
|
|
</LinearLayout>
|
|
|
|
<org.linphone.ui.Numpad
|
|
android:id="@+id/numpad"
|
|
android:background="@color/colorC"
|
|
android:contentDescription="@string/content_description_numpad"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="gone"
|
|
android:layout_marginTop="50dp"
|
|
android:layout_marginBottom="10dp"
|
|
android:layout_above="@id/menu"
|
|
android:layout_centerHorizontal="true"
|
|
android:layout_centerVertical="true"/>
|
|
</RelativeLayout>
|
|
|
|
<RelativeLayout
|
|
android:id="@+id/side_menu_content"
|
|
android:background="@color/colorD"
|
|
android:layout_marginTop="40dp"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_gravity="left">
|
|
|
|
<include layout="@layout/incall_stats" android:id="@+id/incall_stats"/>
|
|
|
|
</RelativeLayout>
|
|
|
|
</android.support.v4.widget.DrawerLayout>
|
|
|
|
<fragment
|
|
android:id="@+id/status"
|
|
android:name="org.linphone.StatusFragment"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="40dp"
|
|
tools:layout="@layout/status" />
|
|
|
|
</RelativeLayout>
|