mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-18 03:48: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
74 lines
No EOL
2.2 KiB
XML
74 lines
No EOL
2.2 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:background="@color/colorG"
|
|
android:orientation="vertical" >
|
|
|
|
<LinearLayout
|
|
android:id="@+id/top_bar"
|
|
android:orientation="horizontal"
|
|
android:background="@color/colorF"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="60dp">
|
|
|
|
<ImageView
|
|
android:id="@+id/new_discussion"
|
|
android:src="@drawable/chat_add_button"
|
|
android:contentDescription="@string/content_description_new_discussion"
|
|
android:layout_width="0dp"
|
|
android:layout_height="match_parent"
|
|
android:layout_weight="0.2"
|
|
android:padding="15dp"/>
|
|
|
|
<ImageView
|
|
android:id="@+id/back_in_call"
|
|
android:src="@drawable/call_back_button"
|
|
android:contentDescription="@string/content_description_call"
|
|
android:visibility="invisible"
|
|
android:layout_width="0dp"
|
|
android:layout_height="match_parent"
|
|
android:layout_weight="0.2"
|
|
android:padding="15dp"/>
|
|
|
|
<View
|
|
android:layout_width="0dp"
|
|
android:layout_height="match_parent"
|
|
android:layout_weight="0.4"/>
|
|
|
|
<ImageView
|
|
android:id="@+id/edit"
|
|
android:src="@drawable/edit_list_button"
|
|
android:contentDescription="@string/content_description_edit"
|
|
android:layout_width="0dp"
|
|
android:layout_height="match_parent"
|
|
android:layout_weight="0.2"
|
|
android:padding="15dp"/>
|
|
|
|
</LinearLayout>
|
|
|
|
<include layout="@layout/edit_list"/>
|
|
|
|
<View
|
|
android:background="@color/colorF"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="1dp"/>
|
|
|
|
<ListView
|
|
android:id="@+id/chatList"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:divider="@color/colorF"
|
|
android:cacheColorHint="@color/transparent"
|
|
android:dividerHeight="1dp" />
|
|
|
|
<TextView
|
|
android:id="@+id/noChatHistory"
|
|
android:text="@string/no_chat_history"
|
|
style="@style/font2"
|
|
android:visibility="gone"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:gravity="center"/>
|
|
|
|
</LinearLayout> |