mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-19 04:28:08 +00:00
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
88 lines
2.6 KiB
XML
88 lines
2.6 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:background="@color/colorC"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent">
|
|
|
|
|
|
<RelativeLayout
|
|
android:id="@+id/address_bar"
|
|
android:background="@color/colorG"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="60dp"
|
|
android:layout_marginBottom="10dp"
|
|
android:layout_alignParentTop="true">
|
|
|
|
<org.linphone.ui.EraseButton
|
|
android:id="@+id/erase"
|
|
android:src="@drawable/erase_button"
|
|
android:layout_width="40dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_alignParentRight="true"
|
|
android:layout_centerVertical="true"
|
|
android:layout_marginRight="10dp"
|
|
android:layout_marginLeft="10dp" />
|
|
|
|
<org.linphone.ui.AddressText
|
|
android:id="@+id/address"
|
|
android:background="@color/colorG"
|
|
android:textColorHint="@color/colorE"
|
|
style="@style/font1"
|
|
android:ellipsize="start"
|
|
android:inputType="textEmailAddress"
|
|
android:hint="@string/address_bar_hint"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:paddingLeft="20dp"
|
|
android:paddingRight="5dp"
|
|
android:layout_toLeftOf="@id/erase"
|
|
android:layout_centerVertical="true"/>
|
|
|
|
</RelativeLayout>
|
|
|
|
<org.linphone.ui.Numpad
|
|
android:id="@+id/numpad"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:padding="10dp"
|
|
android:layout_above="@id/controls"
|
|
android:layout_below="@id/address_bar"
|
|
android:layout_centerInParent="true"/>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/controls"
|
|
android:layout_alignParentBottom="true"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="60dp">
|
|
|
|
<ImageView
|
|
android:id="@+id/back"
|
|
android:src="@drawable/dialer_alt_back"
|
|
android:background="@drawable/button_back_background"
|
|
android:layout_width="102dp"
|
|
android:layout_height="wrap_content"
|
|
android:padding="20dp"
|
|
android:visibility="gone"/>
|
|
|
|
<org.linphone.ui.CallButton
|
|
android:id="@+id/call"
|
|
android:src="@drawable/call_audio_start"
|
|
android:background="@drawable/call"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:padding="12dp"
|
|
android:layout_weight="0.5"/>
|
|
|
|
</LinearLayout>
|
|
|
|
<ScrollView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:id="@+id/scrollView"
|
|
android:layout_alignParentBottom="true"
|
|
android:layout_alignParentLeft="true"
|
|
android:layout_alignParentStart="true"
|
|
android:layout_marginLeft="478dp"
|
|
android:layout_marginStart="478dp"/>
|
|
|
|
</RelativeLayout>
|