From 1fef6d48cd11e154c6eeca141919c8783f863728 Mon Sep 17 00:00:00 2001 From: Timothy Rae Date: Sat, 28 Nov 2015 11:29:06 +0900 Subject: [PATCH 1/2] Don't clear undo unless a new deck has been selected --- AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.java b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.java index 901d2e45a4..6ac5c0d829 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.java +++ b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.java @@ -1627,8 +1627,6 @@ public class DeckPicker extends NavigationDrawerActivity implements private void openStudyOptions(boolean withDeckOptions) { - // Clear the undo history when selecting a new deck - getCol().clearUndo(); mCongratulationsShown = false; if (mFragmented) { // The fragment will show the study options screen instead of launching a new activity. @@ -1645,6 +1643,10 @@ public class DeckPicker extends NavigationDrawerActivity implements private void handleDeckSelection(long did) { // Forget what the last used deck was in the browser CardBrowser.clearSelectedDeck(); + // Clear the undo history when selecting a new deck + if (getCol().getDecks().selected() != did) { + getCol().clearUndo(); + } // Select the deck getCol().getDecks().select(did); // Reset the schedule so that we get the counts for the currently selected deck @@ -1977,8 +1979,6 @@ public class DeckPicker extends NavigationDrawerActivity implements private void openReviewer() { - // Clear the undo history when selecting a new deck - getCol().clearUndo(); mCongratulationsShown = false; Intent reviewer = new Intent(this, Reviewer.class); startActivityForResultWithAnimation(reviewer, REQUEST_REVIEW, ActivityTransitionAnimation.LEFT); From 17be96c3fe0cb08a4a7e2eb65201495bb7fd21b1 Mon Sep 17 00:00:00 2001 From: Timothy Rae Date: Sat, 28 Nov 2015 11:29:34 +0900 Subject: [PATCH 2/2] Add subsection headers to general preferences --- .../src/main/res/xml/preferences_general.xml | 78 ++++++++++--------- 1 file changed, 41 insertions(+), 37 deletions(-) diff --git a/AnkiDroid/src/main/res/xml/preferences_general.xml b/AnkiDroid/src/main/res/xml/preferences_general.xml index 8c1af0cb03..33ca2aa429 100644 --- a/AnkiDroid/src/main/res/xml/preferences_general.xml +++ b/AnkiDroid/src/main/res/xml/preferences_general.xml @@ -24,43 +24,47 @@ - - - - - - - - + + + + + + + + + + + +