diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2014-03-03 05:01:02 +0100 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2014-03-03 05:01:02 +0100 |
commit | c609eefefac5097c7c40a9f1b8741e9634da316f (patch) | |
tree | 53363dfbab46d84e81b8b95f49e586374dc358f0 /gen | |
parent | 2ab6cb0ada6370e6ea83a73e0a6a39ea3ff90715 (diff) |
api changes. muc options
Diffstat (limited to '')
-rw-r--r-- | gen/eu/siacs/conversations/R.java | 95 | ||||
-rw-r--r-- | gen/org/sufficientlysecure/keychain/api/R.java | 1 |
2 files changed, 55 insertions, 41 deletions
diff --git a/gen/eu/siacs/conversations/R.java b/gen/eu/siacs/conversations/R.java index afe69062..8c71eebe 100644 --- a/gen/eu/siacs/conversations/R.java +++ b/gen/eu/siacs/conversations/R.java @@ -34,43 +34,44 @@ public final class R { public static final int ic_action_add=0x7f020005; public static final int ic_action_add_person=0x7f020006; public static final int ic_action_cancel_launchersize=0x7f020007; - public static final int ic_action_delete=0x7f020008; - public static final int ic_action_group=0x7f020009; - public static final int ic_action_person=0x7f02000a; - public static final int ic_action_refresh=0x7f02000b; - public static final int ic_action_secure=0x7f02000c; - public static final int ic_action_send=0x7f02000d; - public static final int ic_action_send_now=0x7f02000e; - public static final int ic_action_unsecure=0x7f02000f; - public static final int ic_launcher=0x7f020010; - public static final int ic_profile=0x7f020011; - public static final int message_border=0x7f020012; - public static final int notification=0x7f020013; - public static final int red=0x7f020014; - public static final int redbackground=0x7f020015; - public static final int section_header=0x7f020016; + public static final int ic_action_cancel_launchersize_light=0x7f020008; + public static final int ic_action_delete=0x7f020009; + public static final int ic_action_group=0x7f02000a; + public static final int ic_action_person=0x7f02000b; + public static final int ic_action_refresh=0x7f02000c; + public static final int ic_action_secure=0x7f02000d; + public static final int ic_action_send=0x7f02000e; + public static final int ic_action_send_now=0x7f02000f; + public static final int ic_action_unsecure=0x7f020010; + public static final int ic_launcher=0x7f020011; + public static final int ic_profile=0x7f020012; + public static final int message_border=0x7f020013; + public static final int notification=0x7f020014; + public static final int red=0x7f020015; + public static final int redbackground=0x7f020016; + public static final int section_header=0x7f020017; } public static final class id { public static final int account_confirm_password_desc=0x7f0a001c; - public static final int account_delete=0x7f0a0038; - public static final int account_disable=0x7f0a0039; - public static final int account_enable=0x7f0a003a; + public static final int account_delete=0x7f0a0041; + public static final int account_disable=0x7f0a0042; + public static final int account_enable=0x7f0a0043; public static final int account_jid=0x7f0a0000; - public static final int account_list=0x7f0a0029; + public static final int account_list=0x7f0a002b; public static final int account_password=0x7f0a0019; public static final int account_password_confirm2=0x7f0a001d; public static final int account_status=0x7f0a0002; public static final int account_usetls=0x7f0a001a; - public static final int action_accounts=0x7f0a0032; - public static final int action_add=0x7f0a002d; - public static final int action_add_account=0x7f0a0037; - public static final int action_archive=0x7f0a0031; - public static final int action_contact_details=0x7f0a002f; - public static final int action_muc_details=0x7f0a0030; - public static final int action_refresh_contacts=0x7f0a003c; - public static final int action_security=0x7f0a002e; - public static final int action_settings=0x7f0a0033; - public static final int announce_pgp=0x7f0a003b; + public static final int action_accounts=0x7f0a003b; + public static final int action_add=0x7f0a0036; + public static final int action_add_account=0x7f0a0040; + public static final int action_archive=0x7f0a003a; + public static final int action_contact_details=0x7f0a0038; + public static final int action_muc_details=0x7f0a0039; + public static final int action_refresh_contacts=0x7f0a0045; + public static final int action_security=0x7f0a0037; + public static final int action_settings=0x7f0a003c; + public static final int announce_pgp=0x7f0a0044; public static final int contactList=0x7f0a0006; public static final int contact_display_name=0x7f0a0008; public static final int contact_jid=0x7f0a0009; @@ -88,22 +89,31 @@ public final class R { public static final int details_receive_presence=0x7f0a0014; public static final int details_send_presence=0x7f0a0013; public static final int edit_account_register_new=0x7f0a001b; - public static final int encryption_choice_none=0x7f0a0034; - public static final int encryption_choice_otr=0x7f0a0035; - public static final int encryption_choice_pgp=0x7f0a0036; + public static final int encryption_choice_none=0x7f0a003d; + public static final int encryption_choice_otr=0x7f0a003e; + public static final int encryption_choice_pgp=0x7f0a003f; public static final int info_box=0x7f0a0022; - public static final int list=0x7f0a0027; - public static final int message_body=0x7f0a002b; - public static final int message_photo=0x7f0a002a; - public static final int message_time=0x7f0a002c; + public static final int list=0x7f0a0029; + public static final int message_body=0x7f0a002d; + public static final int message_photo=0x7f0a002c; + public static final int message_time=0x7f0a002e; public static final int messages_view=0x7f0a0021; + public static final int muc_error=0x7f0a0023; + public static final int muc_error_msg=0x7f0a0024; + public static final int muc_moderators=0x7f0a0031; + public static final int muc_moderators_header=0x7f0a0030; + public static final int muc_participants=0x7f0a0033; + public static final int muc_participants_header=0x7f0a0032; + public static final int muc_visitors=0x7f0a0035; + public static final int muc_visitors_header=0x7f0a0034; + public static final int muc_your_nick=0x7f0a002f; public static final int new_conversation_search=0x7f0a0004; - public static final int new_fingerprint=0x7f0a0023; - public static final int otr_fingerprint=0x7f0a0024; - public static final int pgp_keyentry=0x7f0a0025; + public static final int new_fingerprint=0x7f0a0025; + public static final int otr_fingerprint=0x7f0a0026; + public static final int pgp_keyentry=0x7f0a0027; public static final int progressBar1=0x7f0a0003; - public static final int selected_conversation=0x7f0a0028; - public static final int slidingpanelayout=0x7f0a0026; + public static final int selected_conversation=0x7f0a002a; + public static final int slidingpanelayout=0x7f0a0028; public static final int textSendButton=0x7f0a0020; public static final int textView1=0x7f0a0018; public static final int textView2=0x7f0a0001; @@ -127,6 +137,7 @@ public final class R { public static final int message_error=0x7f03000a; public static final int message_recieved=0x7f03000b; public static final int message_sent=0x7f03000c; + public static final int muc_options=0x7f03000d; } public static final class menu { public static final int conversations=0x7f090000; @@ -146,8 +157,10 @@ public final class R { public static final int action_settings=0x7f050003; public static final int announce_pgp=0x7f05000e; public static final int app_name=0x7f050002; + public static final int conference_details=0x7f050010; public static final int encrypted_message=0x7f05000f; public static final int just_now=0x7f05000c; + public static final int nick_in_use=0x7f050011; public static final int openpgp_install_openkeychain_via=0x7f050001; public static final int openpgp_list_preference_none=0x7f050000; public static final int sending=0x7f05000d; diff --git a/gen/org/sufficientlysecure/keychain/api/R.java b/gen/org/sufficientlysecure/keychain/api/R.java index a49700a6..2cc4ddf7 100644 --- a/gen/org/sufficientlysecure/keychain/api/R.java +++ b/gen/org/sufficientlysecure/keychain/api/R.java @@ -9,6 +9,7 @@ package org.sufficientlysecure.keychain.api; public final class R { public static final class drawable { public static final int ic_action_cancel_launchersize = 0x7f020007; + public static final int ic_action_cancel_launchersize_light = 0x7f020008; } public static final class string { public static final int openpgp_install_openkeychain_via = 0x7f050001; |