Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix led misplaced with alt bubbles

Browse source
This commit is contained in:
Sylvain Berfini 2012-09-13 16:00:21 +02:00
parent 16a05cf208
commit 9d934f7b33
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/layout/chat_bubble_alt_outgoing.xml
View file

@ -8,6 +8,7 @@
<ImageView <ImageView
android:contentDescription="@string/content_description_message_status" android:contentDescription="@string/content_description_message_status"
android:id="@+id/status" android:id="@+id/status"
android:layout_gravity="center_vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:adjustViewBounds="true" /> android:adjustViewBounds="true" />

2
res/values/non_localizable_custom.xml
View file

@ -21,7 +21,7 @@
<bool name="lock_statusbar">false</bool> <bool name="lock_statusbar">false</bool>
<bool name="emoticons_in_messages">true</bool> <bool name="emoticons_in_messages">true</bool>
<bool name="only_display_username_if_unknown">true</bool> <bool name="only_display_username_if_unknown">true</bool>
<bool name="display_messages_time">true</bool> <!-- Used to show the time of each message arrival --> <bool name="display_messages_time_and_status">true</bool> <!-- Used to show the time of each message arrival -->
<bool name="display_time_aside">false</bool> <!-- if display_messages_time = true, display time on the side of the message instead of below --> <bool name="display_time_aside">false</bool> <!-- if display_messages_time = true, display time on the side of the message instead of below -->
<bool name="call_last_log_if_adress_is_empty">true</bool> <bool name="call_last_log_if_adress_is_empty">true</bool>

4
src/org/linphone/ui/BubbleChat.java
View file

@ -65,7 +65,7 @@ public class BubbleChat {
emoticons.put(":-*", R.drawable.emo_im_kissing); emoticons.put(":-*", R.drawable.emo_im_kissing);
emoticons.put(":*", R.drawable.emo_im_kissing); emoticons.put(":*", R.drawable.emo_im_kissing);
emoticons.put(":-/", R.drawable.emo_im_undecided); emoticons.put(":-/", R.drawable.emo_im_undecided);
emoticons.put(":/ ", R.drawable.emo_im_undecided); emoticons.put(":/ ", R.drawable.emo_im_undecided); // The space after is needed to avoid bad display of links
emoticons.put(":-\\", R.drawable.emo_im_undecided); emoticons.put(":-\\", R.drawable.emo_im_undecided);
emoticons.put(":\\", R.drawable.emo_im_undecided); emoticons.put(":\\", R.drawable.emo_im_undecided);
emoticons.put(":-O", R.drawable.emo_im_surprised); emoticons.put(":-O", R.drawable.emo_im_surprised);
@ -110,7 +110,7 @@ public class BubbleChat {
text = getTextWithHttpLinks(message); text = getTextWithHttpLinks(message);
} }
if (context.getResources().getBoolean(R.bool.display_messages_time)) { if (context.getResources().getBoolean(R.bool.display_messages_time_and_status)) {
LinearLayout layout; LinearLayout layout;
if (context.getResources().getBoolean(R.bool.display_time_aside)) { if (context.getResources().getBoolean(R.bool.display_time_aside)) {
if (isIncoming) { if (isIncoming) {