diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsActivity.java b/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsActivity.java index 4d8b27f0f..cf76af330 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsActivity.java @@ -8,7 +8,6 @@ package com.todoroo.astrid.actfm; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; -import android.widget.TextView; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.view.MenuItem; @@ -27,11 +26,7 @@ public class CommentsActivity extends AstridActivity { ActionBar actionBar = getSupportActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); - actionBar.setDisplayShowTitleEnabled(false); - - actionBar.setDisplayShowCustomEnabled(true); - actionBar.setCustomView(R.layout.header_title_view); - ((TextView) actionBar.getCustomView().findViewById(R.id.title)).setText(R.string.TAd_contextEditTask); + actionBar.setTitle(R.string.TAd_contextEditTask); Fragment fragment; String tag; diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java b/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java index 1127bea29..8af9c3b8f 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java @@ -138,7 +138,7 @@ public abstract class CommentsFragment extends SherlockListFragment { ActionBar ab = ((AstridActivity) getActivity()).getSupportActionBar(); String title = hasModel() ? getString(R.string.tag_updates_title, getModelName()) : getString(R.string.TLA_all_activity); - ((TextView) ab.getCustomView().findViewById(R.id.title)).setText(title); + ab.setTitle(title); } final ImageButton commentButton = (ImageButton) getView().findViewById(R.id.commentButton); diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java index 2b9afca36..2ee015e3f 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java @@ -17,7 +17,6 @@ import android.view.View.OnClickListener; import android.view.ViewGroup.LayoutParams; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; -import android.widget.TextView; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.SherlockFragmentActivity; @@ -117,9 +116,6 @@ public class TagSettingsActivity extends SherlockFragmentActivity { ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { actionBar.setDisplayHomeAsUpEnabled(true); - actionBar.setDisplayShowTitleEnabled(false); - actionBar.setDisplayShowCustomEnabled(true); - actionBar.setCustomView(R.layout.header_title_view); } setUpSettingsPage(); @@ -287,12 +283,10 @@ public class TagSettingsActivity extends SherlockFragmentActivity { tagName.setText(tagData.getValue(TagData.NAME)); ActionBar ab = getSupportActionBar(); if (ab != null) { - View customView = ab.getCustomView(); - TextView titleView = (TextView) customView.findViewById(R.id.title); if (isNewTag) { - titleView.setText(getString(R.string.tag_new_list)); + ab.setTitle(getString(R.string.tag_new_list)); } else { - titleView.setText(getString(R.string.tag_settings_title)); + ab.setTitle(getString(R.string.tag_settings_title)); } } else { if (isNewTag) { diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java index fcacfa08f..4c43b300c 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java @@ -353,7 +353,6 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList @Override public boolean onPrepareOptionsMenu(Menu menu) { menuDrawer.closeMenu(); - hideKeyboard(); return super.onPrepareOptionsMenu(menu); } diff --git a/astrid/src/main/res/layout/header_title_view.xml b/astrid/src/main/res/layout/header_title_view.xml deleted file mode 100644 index e2ae1981b..000000000 --- a/astrid/src/main/res/layout/header_title_view.xml +++ /dev/null @@ -1,15 +0,0 @@ - - -