TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-17 20:44:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into groups

Browse Source
This commit is contained in:
Moxie Marlinspike
2014-02-18 13:53:35 -08:00
parent 3999171377 fc3411da83
commit 760c96171d
313 changed files with 87 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -84,7 +84,7 @@
<!-- ConversationListAdapter -->
<string name="ConversationListAdapter_key_exchange_message">Key exchange message...</string>
<!-- ConversationListFragment -->
<string name="ConversationListFragment_delete_threads_question">Delete threads?</string>
<string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Are you sure you wish to delete ALL selected conversation threads?</string>
@@ -705,6 +705,8 @@
<!-- conversation_list -->
<string name="conversation_list__menu_search">Search</string>
<string name="conversation_list__drawer_open">Open navigation drawer</string>
<string name="conversation_list__drawer_close">Close navigation drawer</string>
<!-- conversation_secure_verified -->
<string name="conversation_secure_verified__menu_security">Security</string>

11
res/values/styles.xml
View File

@@ -1,9 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="NoAnimation.Theme.Sherlock.Light.DarkActionBar" parent="@style/Theme.Sherlock.Light.DarkActionBar">
<item name="android:windowAnimationStyle">@null</item>
<style name="NoAnimation.Theme.BlackScreen" parent="@style/Theme.Sherlock.NoActionBar">
<item name="android:windowAnimationStyle">@null</item>
<item name="android:windowBackground">@android:color/black</item>
</style>
<style name="NoAnimation.Theme.Sherlock.Light.DarkActionBar" parent="@style/Theme.Sherlock.Light.DarkActionBar">
<item name="android:windowAnimationStyle">@null</item>
</style>
<style name="transparent_progress">
<item name="android:windowFrame">@null</item>
<item name="android:windowBackground">@android:color/transparent</item>