fixup! Set toolbar text when exiting search view

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java

@@ -94,7 +94,6 @@ import com.hippo.ehviewer.widget.GalleryInfoContentHelper;
 import com.hippo.ehviewer.widget.SearchLayout;
 import com.hippo.scene.Announcer;
 import com.hippo.scene.SceneFragment;
-import com.hippo.scene.StageActivity;
 import com.hippo.util.ExceptionUtils;
 import com.hippo.view.BringOutTransition;
 import com.hippo.view.ViewTransition;
@@ -495,7 +494,7 @@ public final class GalleryListScene extends SearchBarScene
                 : R.id.search_normal_search);
 
         // Update search edit text
-        if (!TextUtils.isEmpty(keyword) && !mIsTopList) {
+        if (!mIsTopList) {
             if (mode == ListUrlBuilder.MODE_TAG) {
                 keyword = wrapTagKeyword(keyword);
             }

app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt

@@ -117,6 +117,7 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene {
 
     @CallSuper
     open fun onSearchViewHidden() {
+        binding.toolbar.text = binding.searchview.text
         privLockModeStart?.let { setDrawerLockMode(it, GravityCompat.START) }
         privLockModeStart = null
         privLockModeEnd?.let { setDrawerLockMode(it, GravityCompat.END) }
@@ -367,7 +368,6 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene {
     private val mSearchViewOnBackPressedCallback =
         object : OnBackPressedCallback(false), TransitionListener {
             override fun handleOnBackPressed() {
-                binding.searchview.let { binding.toolbar.text = it.text }
                 binding.searchview.hide()
             }