aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 00:06:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix work tab is gone when leaving search mode" into ub-launcher3-master

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-18 23:31:55 +00:00
committed by Android (Google) Code Review
parent 288647874b 7ccbefcc56
commit 04ff8b1ca6
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/launcher3/allapps/AllAppsContainerView.java
View File

@@ -27,7 +27,6 @@ import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.Selection;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.KeyEvent;
import android.view.LayoutInflater;
@@ -149,9 +148,7 @@ public class AllAppsContainerView extends RelativeLayout implements DragSource,
*/
public void setApps(List<AppInfo> apps) {
boolean hasWorkProfileApp = hasWorkProfileApp(apps);
if (mUsingTabs != hasWorkProfileApp) {
rebindAdapters(hasWorkProfileApp);
}
rebindAdapters(hasWorkProfileApp);
mComponentToAppMap.clear();
addOrUpdateApps(apps);
}
@@ -262,7 +259,7 @@ public class AllAppsContainerView extends RelativeLayout implements DragSource,
});
mHeader = findViewById(R.id.all_apps_header);
rebindAdapters(mUsingTabs);
rebindAdapters(mUsingTabs, true /* force */);
mSearchContainer = findViewById(R.id.search_container_all_apps);
mSearchUiManager = (SearchUiManager) mSearchContainer;
@@ -396,9 +393,14 @@ public class AllAppsContainerView extends RelativeLayout implements DragSource,
}
private void rebindAdapters(boolean showTabs) {
if (showTabs != mUsingTabs) {
replaceRVContainer(showTabs);
rebindAdapters(showTabs, false /* force */);
}
private void rebindAdapters(boolean showTabs, boolean force) {
if (showTabs == mUsingTabs && !force) {
return;
}
replaceRVContainer(showTabs);
mUsingTabs = showTabs;
if (mUsingTabs) {
@@ -540,13 +542,16 @@ public class AllAppsContainerView extends RelativeLayout implements DragSource,
for (int i = 0; i < mAH.length; i++) {
mAH[i].adapter.setLastSearchQuery(query);
}
boolean hasQuery = !TextUtils.isEmpty(query);
if (mUsingTabs && hasQuery) {
if (mUsingTabs) {
mSearchModeWhileUsingTabs = true;
rebindAdapters(false); // hide tabs
} else if (mSearchModeWhileUsingTabs && !hasQuery) {
mSearchModeWhileUsingTabs = false;
}
}
public void onClearSearchResult() {
if (mSearchModeWhileUsingTabs) {
rebindAdapters(true); // show tabs
mSearchModeWhileUsingTabs = false;
}
}