Update actionbar

* Remove custom view
* Don't hide keyboard when overflow selected
pull/46/head
Alex Baker 11 years ago
parent 77934d2c64
commit be259ae2b5

@ -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;

@ -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);

@ -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) {

@ -353,7 +353,6 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
menuDrawer.closeMenu();
hideKeyboard();
return super.onPrepareOptionsMenu(menu);
}

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
** Copyright (c) 2012 Todoroo Inc
**
** See the file "LICENSE" for the full license governing this code.
-->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="10dip"
android:paddingRight="10dip"
android:gravity="center_vertical"
style="@style/TextAppearance.ActionBar_ListsHeader"/>
Loading…
Cancel
Save