Skip to content

Commit fafb061

Browse files
committed
fix flickering during same screen selection
Signed-off-by: alperozturk <[email protected]>
1 parent 3cbe8fe commit fafb061

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,7 @@ private void onNavigationItemClicked(final MenuItem menuItem) {
573573

574574
closeDrawer();
575575
} else if (itemId == R.id.nav_favorites) {
576-
handleSearchEvents(new SearchEvent("", SearchRemoteOperation.SearchType.FAVORITE_SEARCH),
577-
menuItem.getItemId());
576+
handleSearchEvents(new SearchEvent("", SearchRemoteOperation.SearchType.FAVORITE_SEARCH), menuItem.getItemId());
578577
setupToolbar();
579578
} else if (itemId == R.id.nav_gallery) {
580579
startPhotoSearch(menuItem.getItemId());

app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,18 @@ public void setupToolbarShowOnlyMenuButtonAndTitle(String title, View.OnClickLis
128128
}
129129

130130
public void setupToolbar() {
131+
if (mHomeSearchToolbar != null && mDefaultToolbar != null && mHomeSearchToolbar.getVisibility() == View.GONE && mDefaultToolbar.getVisibility() == View.VISIBLE) {
132+
return;
133+
}
134+
131135
setupToolbar(false, false);
132136
}
133137

134138
public void setupHomeSearchToolbarWithSortAndListButtons() {
139+
if (mHomeSearchToolbar != null && mDefaultToolbar != null && mHomeSearchToolbar.getVisibility() == View.VISIBLE && mDefaultToolbar.getVisibility() == View.GONE) {
140+
return;
141+
}
142+
135143
setupToolbar(true, true);
136144
}
137145

0 commit comments

Comments
 (0)