Merge branch 'master' into groups

2014-02-18 13:53:35 -08:00 · 2014-02-18 13:53:35 -08:00 · 760c96171d
parent 3999171377 fc3411da83
commit 760c96171d
313 changed files with 87 additions and 65 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@ -46,7 +46,7 @@
                 android:theme="@style/TextSecure.LightTheme">

        <activity android:name=".RoutingActivity"
-                  android:theme="@style/NoAnimation.Theme.Sherlock.Light.DarkActionBar"
+                  android:theme="@style/NoAnimation.Theme.BlackScreen"
                  android:launchMode="singleTask"
                  android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">

--- a/BUILDING.md
+++ b/BUILDING.md
@ -2,8 +2,8 @@ Building TextSecure
 ===================

 1. Ensure the 'Android Support Repository' is installed from the Android SDK manager.
-1. Ensure gradle >= 1.8 is installed.
+1. Ensure gradle 1.9 is installed.

 Execute Gradle:

-    gradle build
+    gradle build
--- a/README.md
+++ b/README.md
@ -10,7 +10,7 @@ TextSecure is a replacement for the standard text messaging application, allowin

 Current BitHub Payment For Commit:
 =================
-![Current Price](https://bithub.herokuapp.com/v1/status/payment/commit)
+[![Current Price](https://bithub.herokuapp.com/v1/status/payment/commit)](https://whispersystems.org/blog/bithub/)


 Bug tracker
--- a/res/drawable-hdpi-v11/icon_cached.png
+++ b/res/drawable-hdpi-v11/icon_cached.png
--- a/res/drawable-hdpi-v11/icon_notification.png
+++ b/res/drawable-hdpi-v11/icon_notification.png
--- a/res/drawable-hdpi-v9/icon_cached.png
+++ b/res/drawable-hdpi-v9/icon_cached.png
--- a/res/drawable-hdpi-v9/icon_notification.png
+++ b/res/drawable-hdpi-v9/icon_notification.png
--- a/res/drawable-hdpi/actionbar_icon_holo_dark.png
+++ b/res/drawable-hdpi/actionbar_icon_holo_dark.png
--- a/res/drawable-hdpi/actionbar_icon_holo_light.png
+++ b/res/drawable-hdpi/actionbar_icon_holo_light.png
--- a/res/drawable-hdpi/alert.png
+++ b/res/drawable-hdpi/alert.png
--- a/res/drawable-hdpi/card.9.png
+++ b/res/drawable-hdpi/card.9.png
--- a/res/drawable-hdpi/check.png
+++ b/res/drawable-hdpi/check.png
--- a/res/drawable-hdpi/check_dark.png
+++ b/res/drawable-hdpi/check_dark.png
--- a/res/drawable-hdpi/contacts_identities_dark.png
+++ b/res/drawable-hdpi/contacts_identities_dark.png
--- a/res/drawable-hdpi/contacts_identities_light.png
+++ b/res/drawable-hdpi/contacts_identities_light.png
--- a/res/drawable-hdpi/dialog_full_holo_light.9.png
+++ b/res/drawable-hdpi/dialog_full_holo_light.9.png
--- a/res/drawable-hdpi/divet_left_dark.png
+++ b/res/drawable-hdpi/divet_left_dark.png
--- a/res/drawable-hdpi/divet_left_light.png
+++ b/res/drawable-hdpi/divet_left_light.png
--- a/res/drawable-hdpi/divet_right_dark.png
+++ b/res/drawable-hdpi/divet_right_dark.png
--- a/res/drawable-hdpi/divet_right_light.png
+++ b/res/drawable-hdpi/divet_right_light.png
--- a/res/drawable-hdpi/drawer_shadow_dark.9.png
+++ b/res/drawable-hdpi/drawer_shadow_dark.9.png
--- a/res/drawable-hdpi/drawer_shadow_light.9.png
+++ b/res/drawable-hdpi/drawer_shadow_light.9.png
--- a/res/drawable-hdpi/encrypted_backup.png
+++ b/res/drawable-hdpi/encrypted_backup.png
--- a/res/drawable-hdpi/ic_action_new_holo_dark.png
+++ b/res/drawable-hdpi/ic_action_new_holo_dark.png
--- a/res/drawable-hdpi/ic_action_new_holo_light.png
+++ b/res/drawable-hdpi/ic_action_new_holo_light.png
--- a/res/drawable-hdpi/ic_attach_audio_holo_light.png
+++ b/res/drawable-hdpi/ic_attach_audio_holo_light.png
--- a/res/drawable-hdpi/ic_attach_picture_holo_light.png
+++ b/res/drawable-hdpi/ic_attach_picture_holo_light.png
--- a/res/drawable-hdpi/ic_attach_video_holo_light.png
+++ b/res/drawable-hdpi/ic_attach_video_holo_light.png
--- a/res/drawable-hdpi/ic_contact_picture.png
+++ b/res/drawable-hdpi/ic_contact_picture.png
--- a/res/drawable-hdpi/ic_drawer.png
+++ b/res/drawable-hdpi/ic_drawer.png
--- a/res/drawable-hdpi/ic_emoji_dark.png
+++ b/res/drawable-hdpi/ic_emoji_dark.png
--- a/res/drawable-hdpi/ic_emoji_light.png
+++ b/res/drawable-hdpi/ic_emoji_light.png
--- a/res/drawable-hdpi/ic_emoji_recent_light.png
+++ b/res/drawable-hdpi/ic_emoji_recent_light.png
--- a/res/drawable-hdpi/ic_ime_dark.png
+++ b/res/drawable-hdpi/ic_ime_dark.png
--- a/res/drawable-hdpi/ic_ime_light.png
+++ b/res/drawable-hdpi/ic_ime_light.png
--- a/res/drawable-hdpi/ic_list_alert_sms_failed.png
+++ b/res/drawable-hdpi/ic_list_alert_sms_failed.png
--- a/res/drawable-hdpi/ic_menu_add_field_holo_light.png
+++ b/res/drawable-hdpi/ic_menu_add_field_holo_light.png
--- a/res/drawable-hdpi/ic_menu_attach.png
+++ b/res/drawable-hdpi/ic_menu_attach.png
--- a/res/drawable-hdpi/ic_menu_barcode.png
+++ b/res/drawable-hdpi/ic_menu_barcode.png
--- a/res/drawable-hdpi/ic_menu_call_holo_dark.png
+++ b/res/drawable-hdpi/ic_menu_call_holo_dark.png
--- a/res/drawable-hdpi/ic_menu_call_holo_light.png
+++ b/res/drawable-hdpi/ic_menu_call_holo_light.png
--- a/res/drawable-hdpi/ic_menu_done_holo_dark.png
+++ b/res/drawable-hdpi/ic_menu_done_holo_dark.png
--- a/res/drawable-hdpi/ic_menu_friendslist.png
+++ b/res/drawable-hdpi/ic_menu_friendslist.png
--- a/res/drawable-hdpi/ic_menu_groups_holo_dark.png
+++ b/res/drawable-hdpi/ic_menu_groups_holo_dark.png
--- a/res/drawable-hdpi/ic_menu_lock_holo_dark.png
+++ b/res/drawable-hdpi/ic_menu_lock_holo_dark.png
--- a/res/drawable-hdpi/ic_menu_lock_holo_light.png
+++ b/res/drawable-hdpi/ic_menu_lock_holo_light.png
--- a/res/drawable-hdpi/ic_menu_lock_small_holo_light.png
+++ b/res/drawable-hdpi/ic_menu_lock_small_holo_light.png
--- a/res/drawable-hdpi/ic_menu_lock_unverified_holo_dark.png
+++ b/res/drawable-hdpi/ic_menu_lock_unverified_holo_dark.png
--- a/res/drawable-hdpi/ic_menu_lock_verified_holo_dark.png
+++ b/res/drawable-hdpi/ic_menu_lock_verified_holo_dark.png
--- a/res/drawable-hdpi/ic_menu_login.png
+++ b/res/drawable-hdpi/ic_menu_login.png
--- a/res/drawable-hdpi/ic_menu_msg_compose_holo_dark.png
+++ b/res/drawable-hdpi/ic_menu_msg_compose_holo_dark.png
--- a/res/drawable-hdpi/ic_menu_search_holo_dark.png
+++ b/res/drawable-hdpi/ic_menu_search_holo_dark.png
--- a/res/drawable-hdpi/ic_menu_search_holo_light.png
+++ b/res/drawable-hdpi/ic_menu_search_holo_light.png
--- a/res/drawable-hdpi/ic_menu_selectall_holo_dark.png
+++ b/res/drawable-hdpi/ic_menu_selectall_holo_dark.png
--- a/res/drawable-hdpi/ic_menu_selectall_holo_light.png
+++ b/res/drawable-hdpi/ic_menu_selectall_holo_light.png
--- a/res/drawable-hdpi/ic_menu_settings.png
+++ b/res/drawable-hdpi/ic_menu_settings.png
--- a/res/drawable-hdpi/ic_menu_split_holo_dark.png
+++ b/res/drawable-hdpi/ic_menu_split_holo_dark.png
--- a/res/drawable-hdpi/ic_menu_trash_holo_dark.png
+++ b/res/drawable-hdpi/ic_menu_trash_holo_dark.png
--- a/res/drawable-hdpi/ic_menu_trash_holo_light.png
+++ b/res/drawable-hdpi/ic_menu_trash_holo_light.png
--- a/res/drawable-hdpi/ic_menu_unlock_holo_dark.png
+++ b/res/drawable-hdpi/ic_menu_unlock_holo_dark.png
--- a/res/drawable-hdpi/ic_menu_unlock_holo_light.png
+++ b/res/drawable-hdpi/ic_menu_unlock_holo_light.png
--- a/res/drawable-hdpi/ic_missing_thumbnail_picture.png
+++ b/res/drawable-hdpi/ic_missing_thumbnail_picture.png
--- a/res/drawable-hdpi/ic_send_encrypted_holo_light.png
+++ b/res/drawable-hdpi/ic_send_encrypted_holo_light.png
--- a/res/drawable-hdpi/ic_send_holo_dark.png
+++ b/res/drawable-hdpi/ic_send_holo_dark.png
--- a/res/drawable-hdpi/ic_send_holo_dark_encrypted.png
+++ b/res/drawable-hdpi/ic_send_holo_dark_encrypted.png
--- a/res/drawable-hdpi/ic_send_holo_light.png
+++ b/res/drawable-hdpi/ic_send_holo_light.png
--- a/res/drawable-hdpi/ic_sms_mms_delivered_dark.png
+++ b/res/drawable-hdpi/ic_sms_mms_delivered_dark.png
--- a/res/drawable-hdpi/ic_sms_mms_delivered_light.png
+++ b/res/drawable-hdpi/ic_sms_mms_delivered_light.png
--- a/res/drawable-hdpi/ic_tab_contacts.png
+++ b/res/drawable-hdpi/ic_tab_contacts.png
--- a/res/drawable-hdpi/ic_tab_groups.png
+++ b/res/drawable-hdpi/ic_tab_groups.png
--- a/res/drawable-hdpi/ic_tab_recent.png
+++ b/res/drawable-hdpi/ic_tab_recent.png
--- a/res/drawable-hdpi/icon.png
+++ b/res/drawable-hdpi/icon.png
--- a/res/drawable-hdpi/icon_lock.png
+++ b/res/drawable-hdpi/icon_lock.png
--- a/res/drawable-hdpi/import_database.png
+++ b/res/drawable-hdpi/import_database.png
--- a/res/drawable-hdpi/import_export_dark.png
+++ b/res/drawable-hdpi/import_export_dark.png
--- a/res/drawable-hdpi/import_export_light.png
+++ b/res/drawable-hdpi/import_export_light.png
--- a/res/drawable-hdpi/list_selected_holo_dark.9.png
+++ b/res/drawable-hdpi/list_selected_holo_dark.9.png
--- a/res/drawable-hdpi/list_selected_holo_light.9.png
+++ b/res/drawable-hdpi/list_selected_holo_light.9.png
--- a/res/drawable-hdpi/list_selector_background_selected.9.png
+++ b/res/drawable-hdpi/list_selector_background_selected.9.png
--- a/res/drawable-hdpi/my_identity_dark.png
+++ b/res/drawable-hdpi/my_identity_dark.png
--- a/res/drawable-hdpi/my_identity_light.png
+++ b/res/drawable-hdpi/my_identity_light.png
--- a/res/drawable-hdpi/notify_panel_notification_icon_bg.png
+++ b/res/drawable-hdpi/notify_panel_notification_icon_bg.png
--- a/res/drawable-hdpi/padlock_prompt.png
+++ b/res/drawable-hdpi/padlock_prompt.png
--- a/res/drawable-hdpi/plaintext_backup.png
+++ b/res/drawable-hdpi/plaintext_backup.png
--- a/res/drawable-hdpi/refresh.png
+++ b/res/drawable-hdpi/refresh.png
--- a/res/drawable-hdpi/stat_sys_download_anim0.png
+++ b/res/drawable-hdpi/stat_sys_download_anim0.png
--- a/res/drawable-hdpi/stat_sys_download_anim1.png
+++ b/res/drawable-hdpi/stat_sys_download_anim1.png
--- a/res/drawable-hdpi/stat_sys_download_anim2.png
+++ b/res/drawable-hdpi/stat_sys_download_anim2.png
--- a/res/drawable-hdpi/stat_sys_download_anim3.png
+++ b/res/drawable-hdpi/stat_sys_download_anim3.png
--- a/res/drawable-hdpi/stat_sys_download_anim4.png
+++ b/res/drawable-hdpi/stat_sys_download_anim4.png
--- a/res/drawable-hdpi/stat_sys_download_anim5.png
+++ b/res/drawable-hdpi/stat_sys_download_anim5.png
--- a/res/drawable-hdpi/stock_sms.png
+++ b/res/drawable-hdpi/stock_sms.png
--- a/res/drawable-hdpi/telephone.png
+++ b/res/drawable-hdpi/telephone.png
--- a/res/drawable-mdpi-v11/icon_cached.png
+++ b/res/drawable-mdpi-v11/icon_cached.png
--- a/res/drawable-mdpi-v11/icon_notification.png
+++ b/res/drawable-mdpi-v11/icon_notification.png
--- a/res/drawable-mdpi-v9/icon_cached.png
+++ b/res/drawable-mdpi-v9/icon_cached.png
--- a/res/drawable-mdpi-v9/icon_notification.png
+++ b/res/drawable-mdpi-v9/icon_notification.png
--- a/res/drawable-mdpi/actionbar_icon_holo_dark.png
+++ b/res/drawable-mdpi/actionbar_icon_holo_dark.png
--- a/res/drawable-mdpi/actionbar_icon_holo_light.png
+++ b/res/drawable-mdpi/actionbar_icon_holo_light.png
--- a/res/drawable-mdpi/alert.png
+++ b/res/drawable-mdpi/alert.png
--- a/Show More
+++ b/Show More