mirror/Anki-Android
0
0
Fork 0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 12:02:16 +02:00
Code

Merge pull request #881 from timrae/card-template-editor-toolbar

Browse Source 
Add toolbar back to card template editor
This commit is contained in:
Tim Rae 2015-06-30 20:34:01 +09:00
commit f5d793a792
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.java
View File

@ -25,6 +25,7 @@ import android.support.v4.app.FragmentPagerAdapter;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@ -34,6 +35,7 @@ import android.view.ViewGroup;
import android.widget.EditText;
import com.afollestad.materialdialogs.MaterialDialog;
import com.ichi2.anim.ActivityTransitionAnimation;
import com.ichi2.ui.SlidingTabLayout;
import com.ichi2.anki.dialogs.ConfirmationDialog;
import com.ichi2.anki.exception.ConfirmModSchemaException;
@ -139,8 +141,12 @@ public class CardTemplateEditor extends AnkiActivity {
//mCardId = getIntent().getLongExtra("cardId", -1L);
// Disable the home icon
//getSupportActionBar().setDisplayShowHomeEnabled(false);
//getSupportActionBar().setDisplayHomeAsUpEnabled (false);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
if (toolbar != null) {
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayShowHomeEnabled(false);
getSupportActionBar().setDisplayHomeAsUpEnabled(false);
}
startLoadingCollection();
}
@ -352,6 +358,9 @@ public class CardTemplateEditor extends AnkiActivity {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.home:
((AnkiActivity) getActivity()).finishWithAnimation(ActivityTransitionAnimation.DIALOG_EXIT);
return true;
case R.id.action_add:
Timber.i("CardTemplateEditor:: Add template button pressed");
addNewTemplateWithCheck(getModel());

1
AnkiDroid/src/main/res/layout/card_template_editor_activity.xml
View File

@ -11,6 +11,7 @@
android:layout_height="fill_parent"
android:gravity="center"
android:orientation="vertical" >
<include layout="@layout/toolbar" />
<LinearLayout android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">