mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-18 11:58:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

🐛 Some fix

Browse source
This commit is contained in:
Erwan Croze 2018-09-13 11:11:06 +02:00
parent c7c7d1d888
commit 4e5b381fa7
5 changed files with 48 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
res/layout/call.xml
View file

@ -41,6 +41,9 @@
android:id="@+id/active_call"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="false"
android:layout_centerInParent="false"
android:layout_centerVertical="false"
android:visibility="visible">
<RelativeLayout
@ -82,9 +85,9 @@
android:id="@+id/avatar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/active_call_info"
android:layout_margin="5dp"
android:gravity="center_horizontal"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:gravity="center_vertical|center_horizontal"
android:paddingBottom="10dp"
android:paddingTop="10dp">
@ -155,9 +158,8 @@
android:id="@+id/active_call_info"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_above="@+id/help_space"
android:layout_alignParentBottom="true"
android:layout_marginTop="5dp"
android:layout_above="@+id/calls_list"
android:layout_alignParentBottom="false"
android:alpha="0.8"
android:background="@color/colorH"
android:orientation="vertical">
@ -180,24 +182,22 @@
/>
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:id="@+id/calls_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom"
android:background="@color/colorH"
android:orientation="vertical">
</LinearLayout>
<LinearLayout
android:id="@+id/calls_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/active_call"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom"
android:background="@color/colorH"
android:orientation="vertical">
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:id="@+id/no_current_call"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/calls_list"
android:alpha="0"
android:background="#e6ff6600"
android:gravity="center_vertical"

46
res/layout/main.xml
View file

@ -104,17 +104,17 @@
android:contentDescription="@string/content_description_history"
android:src="@drawable/footer_history"/>
<TextView
android:id="@+id/missed_calls"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_marginLeft="55dp"
android:layout_marginTop="20dp"
android:background="@drawable/history_chat_indicator"
android:gravity="center"
android:textColor="#000000"
android:textSize="18sp"
android:visibility="gone"/>
<TextView
android:id="@+id/missed_calls"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_marginLeft="55dp"
android:layout_marginTop="20dp"
android:background="@drawable/history_chat_indicator"
android:gravity="center"
android:textColor="#000000"
android:textSize="17sp"
android:visibility="invisible"/>
</RelativeLayout>
@ -198,18 +198,18 @@
android:background="@drawable/footer_button"
android:src="@drawable/footer_chat"/>
<TextView
android:id="@+id/missed_chats"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_marginLeft="55dp"
android:layout_marginTop="20dp"
android:background="@drawable/history_chat_indicator"
android:gravity="center"
android:textAlignment="center"
android:textColor="#000000"
android:textSize="18sp"
android:visibility="gone"/>
<TextView
android:id="@+id/missed_chats"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_marginLeft="55dp"
android:layout_marginTop="20dp"
android:background="@drawable/history_chat_indicator"
android:gravity="center"
android:textAlignment="center"
android:textColor="#000000"
android:textSize="17sp"
android:visibility="gone"/>
</RelativeLayout>
</LinearLayout>

7
src/android/org/linphone/LinphoneService.java
View file

@ -563,7 +563,12 @@ public final class LinphoneService extends Service {
} catch (Exception e) {
bm = BitmapFactory.decodeResource(getResources(), R.drawable.avatar_small_secure1);
}
String name = address.getDisplayName() == null ? address.getUsername() : address.getDisplayName();
String name;
if (contact != null) {
name = contact.getFullName() == null ? address.getUsername() : contact.getFullName();
} else {
name = address.getDisplayName() == null ? address.getUsername() : address.getDisplayName();
}
Intent notifIntent = new Intent(this, incomingReceivedActivity);
notifIntent.putExtra("Notification", true);
mNotifContentIntent = PendingIntent.getActivity(this, 0, notifIntent, PendingIntent.FLAG_UPDATE_CURRENT);

4
src/android/org/linphone/call/CallActivity.java
View file

@ -781,20 +781,16 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
private void enabledTransferButton(boolean enabled){
if(enabled) {
transfer.setEnabled(true);
transfer.setAlpha(1f);
} else {
transfer.setEnabled(false);
transfer.setAlpha(0.4f);
}
}
private void enabledConferenceButton(boolean enabled){
if (enabled) {
conference.setEnabled(true);
conference.setAlpha(1f);
} else {
conference.setEnabled(false);
conference.setAlpha(0.4f);
}
}

2
src/android/org/linphone/chat/GroupInfoFragment.java
View file

@ -503,7 +503,7 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
@Override
public void onSecurityEvent(ChatRoom cr, EventLog eventLog) {
refreshParticipantsList();
}
@Override