Merge pull request #648 from veeti/tweaks-and-polish

Assorted tweaks and polish
This commit is contained in:
Moxie Marlinspike
2014-03-02 14:01:20 -08:00
23 changed files with 267 additions and 53 deletions

View File

@@ -58,4 +58,10 @@
<attr name="menu_group_icon" format="reference" />
<attr name="menu_split_icon" format="reference" />
<attr name="menu_accept_icon" format="reference" />
<declare-styleable name="ForegroundImageView">
<attr name="android:foreground" />
<attr name="android:foregroundInsidePadding" />
<attr name="android:foregroundGravity" />
</declare-styleable>
</resources>

View File

@@ -11,7 +11,7 @@
<color name="textsecure_holo_blue_light">#ff33b5e5</color>
<color name="card_background_active">#9933b5e5</color>
<color name="touch_highlight">#400099cc</color>
<color name="conversation_item_sent_background_dark">#ff284e0a</color>
<color name="conversation_item_sent_background_light">#ff64a926</color>

View File

@@ -90,8 +90,8 @@
<!-- ConversationFragment -->
<string name="ConversationFragment_message_details">Message details</string>
<string name="ConversationFragment_sender_s_transport_s_sent_received_s">Transport: %1$s\nSent/Received:%2$s</string>
<string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Sender: %1$s\nTransport: %2$s\nSent: %3$s\nReceived:%4$s</string>
<string name="ConversationFragment_sender_s_transport_s_sent_received_s">Transport: %1$s\nSent/Received: %2$s</string>
<string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Sender: %1$s\nTransport: %2$s\nSent: %3$s\nReceived: %4$s</string>
<string name="ConversationFragment_confirm_message_delete">Confirm Message Delete</string>
<string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Are you sure that you want to permanently delete this message?</string>