mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-31 10:49:23 +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
49 lines
1.4 KiB
XML
49 lines
1.4 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:id="@+id/default_account"
|
|
android:background="@color/colorF"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="70dp">
|
|
|
|
<ImageView
|
|
android:id="@+id/main_account_avatar"
|
|
android:src="@drawable/avatar"
|
|
android:layout_width="40dp"
|
|
android:layout_height="40dp"
|
|
android:layout_marginLeft="12dp"
|
|
android:layout_marginRight="12dp"
|
|
android:layout_centerVertical="true" />
|
|
|
|
<LinearLayout
|
|
android:id="@+id/layout"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:orientation="vertical"
|
|
android:layout_toRightOf="@+id/main_account_avatar"
|
|
android:gravity="center_vertical">
|
|
|
|
<TextView
|
|
android:id="@+id/main_account_display_name"
|
|
style="@style/font3"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"/>
|
|
|
|
<TextView
|
|
android:id="@+id/main_account_address"
|
|
style="@style/font12"
|
|
android:singleLine="true"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"/>
|
|
|
|
</LinearLayout>
|
|
|
|
<ImageView
|
|
android:id="@+id/main_account_status"
|
|
android:src="@drawable/led_connected"
|
|
android:layout_width="25dp"
|
|
android:layout_height="25dp"
|
|
android:layout_alignParentRight="true"
|
|
android:padding="7dp"
|
|
android:layout_marginTop="10dp"/>
|
|
|
|
</RelativeLayout>
|