From d4d4d6cfdebafacbb255c424d7da031aacba7d1b Mon Sep 17 00:00:00 2001
From: Menny Even Danan <menny@evendanan.net>
Date: Fri, 6 Nov 2015 22:25:39 -0500
Subject: correctly setting sub-roots. #525

---
 build.gradle                                           |  2 +-
 .../ui/settings/MainSettingsActivity.java              | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index e064cd47a..78316acd1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -183,7 +183,7 @@ dependencies {
     compile 'com.android.support:recyclerview-v7:23.1.0'
     compile 'com.android.support:support-annotations:23.1.0'
     compile 'com.android.support:palette-v7:23.1.0'
-    compile 'com.github.menny:Chauffeur:0.0.7'
+    compile 'com.github.menny:Chauffeur:0.0.8'
     compile fileTree(dir: 'libs', include: '*.jar')
 
     testCompile 'junit:junit:4.12'
diff --git a/src/main/java/com/anysoftkeyboard/ui/settings/MainSettingsActivity.java b/src/main/java/com/anysoftkeyboard/ui/settings/MainSettingsActivity.java
index 8474cbc85..1f889f987 100644
--- a/src/main/java/com/anysoftkeyboard/ui/settings/MainSettingsActivity.java
+++ b/src/main/java/com/anysoftkeyboard/ui/settings/MainSettingsActivity.java
@@ -170,48 +170,48 @@ public class MainSettingsActivity extends FragmentChauffeurActivity {
 
     public void onNavigateToKeyboardAddonSettings(View v) {
         mDrawerRootLayout.closeDrawers();
-        addFragmentToUi(new KeyboardAddOnSettingsFragment(), TransitionExperiences.ROOT_FRAGMENT_EXPERIENCE_TRANSITION);
+        addFragmentToUi(new KeyboardAddOnSettingsFragment(), TransitionExperiences.SUB_ROOT_FRAGMENT_EXPERIENCE_TRANSITION);
     }
 
     public void onNavigateToDictionarySettings(View v) {
         mDrawerRootLayout.closeDrawers();
-        addFragmentToUi(new DictionariesFragment(), TransitionExperiences.ROOT_FRAGMENT_EXPERIENCE_TRANSITION);
+        addFragmentToUi(new DictionariesFragment(), TransitionExperiences.SUB_ROOT_FRAGMENT_EXPERIENCE_TRANSITION);
     }
 
     public void onNavigateToLanguageSettings(View v) {
         mDrawerRootLayout.closeDrawers();
-        addFragmentToUi(new AdditionalLanguageSettingsFragment(), TransitionExperiences.ROOT_FRAGMENT_EXPERIENCE_TRANSITION);
+        addFragmentToUi(new AdditionalLanguageSettingsFragment(), TransitionExperiences.SUB_ROOT_FRAGMENT_EXPERIENCE_TRANSITION);
 
     }
 
     public void onNavigateToKeyboardThemeSettings(View v) {
         mDrawerRootLayout.closeDrawers();
-        addFragmentToUi(new KeyboardThemeSelectorFragment(), TransitionExperiences.ROOT_FRAGMENT_EXPERIENCE_TRANSITION);
+        addFragmentToUi(new KeyboardThemeSelectorFragment(), TransitionExperiences.SUB_ROOT_FRAGMENT_EXPERIENCE_TRANSITION);
     }
 
     public void onNavigateToEffectsSettings(View v) {
         mDrawerRootLayout.closeDrawers();
-        addFragmentToUi(new EffectsSettingsFragment(), TransitionExperiences.ROOT_FRAGMENT_EXPERIENCE_TRANSITION);
+        addFragmentToUi(new EffectsSettingsFragment(), TransitionExperiences.SUB_ROOT_FRAGMENT_EXPERIENCE_TRANSITION);
     }
 
     public void onNavigateToGestureSettings(View v) {
         mDrawerRootLayout.closeDrawers();
-        addFragmentToUi(new GesturesSettingsFragment(), TransitionExperiences.ROOT_FRAGMENT_EXPERIENCE_TRANSITION);
+        addFragmentToUi(new GesturesSettingsFragment(), TransitionExperiences.SUB_ROOT_FRAGMENT_EXPERIENCE_TRANSITION);
     }
 
     public void onNavigateToQuickTextSettings(View v) {
         mDrawerRootLayout.closeDrawers();
-        addFragmentToUi(new QuickTextSettingsFragment(), TransitionExperiences.ROOT_FRAGMENT_EXPERIENCE_TRANSITION);
+        addFragmentToUi(new QuickTextSettingsFragment(), TransitionExperiences.SUB_ROOT_FRAGMENT_EXPERIENCE_TRANSITION);
     }
 
     public void onNavigateToUserInterfaceSettings(View v) {
         mDrawerRootLayout.closeDrawers();
-        addFragmentToUi(new AdditionalUiSettingsFragment(), TransitionExperiences.ROOT_FRAGMENT_EXPERIENCE_TRANSITION);
+        addFragmentToUi(new AdditionalUiSettingsFragment(), TransitionExperiences.SUB_ROOT_FRAGMENT_EXPERIENCE_TRANSITION);
     }
 
     public void onNavigateToAboutClicked(View v) {
         mDrawerRootLayout.closeDrawers();
-        addFragmentToUi(new AboutAnySoftKeyboardFragment(), TransitionExperiences.ROOT_FRAGMENT_EXPERIENCE_TRANSITION);
+        addFragmentToUi(new AboutAnySoftKeyboardFragment(), TransitionExperiences.SUB_ROOT_FRAGMENT_EXPERIENCE_TRANSITION);
     }
 
     public void setFullScreen(boolean fullScreen) {
-- 
cgit v1.2.3