forked from upstream-mirrors/quik
Update title correctly
This commit is contained in:
@@ -263,7 +263,7 @@ public class MainActivity extends QKActivity implements SlidingMenu.OnOpenListen
|
|||||||
if (mSlidingMenu.isMenuShowing() || content == null) {
|
if (mSlidingMenu.isMenuShowing() || content == null) {
|
||||||
getSupportActionBar().setDisplayHomeAsUpEnabled(false);
|
getSupportActionBar().setDisplayHomeAsUpEnabled(false);
|
||||||
|
|
||||||
setTitle(getString(R.string.title_conversation_list));
|
setTitle(this.menuFragment.getTitleId());
|
||||||
inflater.inflate(R.menu.coversation_list, menu);
|
inflater.inflate(R.menu.coversation_list, menu);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -162,6 +162,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage
|
|||||||
|
|
||||||
case R.id.menu_blocked:
|
case R.id.menu_blocked:
|
||||||
mShowBlocked = !mShowBlocked;
|
mShowBlocked = !mShowBlocked;
|
||||||
|
mContext.setTitle(mShowBlocked ? R.string.title_blocked : R.string.title_conversation_list);
|
||||||
BlockedConversationHelper.bindBlockedMenuItem(mContext, mPrefs, mBlockedItem, mShowBlocked);
|
BlockedConversationHelper.bindBlockedMenuItem(mContext, mPrefs, mBlockedItem, mShowBlocked);
|
||||||
initLoaderManager();
|
initLoaderManager();
|
||||||
return true;
|
return true;
|
||||||
@@ -170,6 +171,10 @@ public class ConversationListFragment extends QKFragment implements LoaderManage
|
|||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int getTitleId() {
|
||||||
|
return mShowBlocked ? R.string.title_blocked : R.string.title_conversation_list;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onItemClick(Conversation conversation, View view) {
|
public void onItemClick(Conversation conversation, View view) {
|
||||||
if (mAdapter.isInMultiSelectMode()) {
|
if (mAdapter.isInMultiSelectMode()) {
|
||||||
|
|||||||
@@ -295,6 +295,7 @@
|
|||||||
<string name="title_compose">Compose</string>
|
<string name="title_compose">Compose</string>
|
||||||
<!--Conversations screen title-->
|
<!--Conversations screen title-->
|
||||||
<string name="title_conversation_list">Conversations</string>
|
<string name="title_conversation_list">Conversations</string>
|
||||||
|
<string name="title_blocked">Blocked</string>
|
||||||
<!--Changelog screen title-->
|
<!--Changelog screen title-->
|
||||||
<string name="title_changelog">Changelog</string>
|
<string name="title_changelog">Changelog</string>
|
||||||
<!--QuickReply picker dialog title (shows up when you press reply from notification, but there are multiple senders)-->
|
<!--QuickReply picker dialog title (shows up when you press reply from notification, but there are multiple senders)-->
|
||||||
|
|||||||
Reference in New Issue
Block a user