forked from upstream-mirrors/quik
Show better titles in menu
This commit is contained in:
@@ -93,9 +93,7 @@ public class BlockedConversationHelper {
|
|||||||
* Blocked (#). This method will find the number of blocked unread messages to show in that menu item and bind it
|
* Blocked (#). This method will find the number of blocked unread messages to show in that menu item and bind it
|
||||||
*/
|
*/
|
||||||
public static void bindBlockedMenuItem(final Context context, final SharedPreferences prefs, final MenuItem item, boolean showBlocked) {
|
public static void bindBlockedMenuItem(final Context context, final SharedPreferences prefs, final MenuItem item, boolean showBlocked) {
|
||||||
Log.d("BlockedConversationHelper", "bindBlockedMenuItem");
|
|
||||||
if (item == null) {
|
if (item == null) {
|
||||||
Log.d("BlockedConversationHelper", "item is null");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -120,7 +118,7 @@ public class BlockedConversationHelper {
|
|||||||
protected void onPreExecute() {
|
protected void onPreExecute() {
|
||||||
super.onPreExecute();
|
super.onPreExecute();
|
||||||
mMenuItem.setVisible(mPrefs.getBoolean(SettingsFragment.BLOCKED_ENABLED, false));
|
mMenuItem.setVisible(mPrefs.getBoolean(SettingsFragment.BLOCKED_ENABLED, false));
|
||||||
mMenuItem.setTitle(mContext.getString(mShowBlocked ? R.string.menu_unblocked_conversations : R.string.menu_blocked_conversations, "..."));
|
mMenuItem.setTitle(mContext.getString(mShowBlocked ? R.string.menu_messages : R.string.menu_blocked));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -635,6 +635,8 @@
|
|||||||
<string name="menu_unmute_conversation">Unmute conversation</string>
|
<string name="menu_unmute_conversation">Unmute conversation</string>
|
||||||
<string name="menu_block_conversation">Block conversation</string>
|
<string name="menu_block_conversation">Block conversation</string>
|
||||||
<string name="menu_unblock_conversation">Unblock conversation</string>
|
<string name="menu_unblock_conversation">Unblock conversation</string>
|
||||||
|
<string name="menu_messages">Messages</string>
|
||||||
|
<string name="menu_blocked">Blocked</string>
|
||||||
<string name="menu_blocked_conversations">Blocked (%s new)</string>
|
<string name="menu_blocked_conversations">Blocked (%s new)</string>
|
||||||
<string name="menu_unblocked_conversations">Messages (%s new)</string>
|
<string name="menu_unblocked_conversations">Messages (%s new)</string>
|
||||||
<string name="menu_notification_settings">Notification settings</string>
|
<string name="menu_notification_settings">Notification settings</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user