Cleaning up some enabled features
Bug: 270394468
Bug: 270393900
Bug: 270390907
Bug: 270390930
Bug: 270390937
Bug: 270391693
Bug: 270391638
Bug: 270395177
Bug: 270395269
Flag: EXEMPT legacy flags cleanup
ENABLE_SHOW_KEYBOARD_OPTION_IN_ALL_APPS
ENABLE_ALL_APPS_SEARCH_IN_TASKBAR
ENABLE_DEVICE_SEARCH
ENABLE_HIDE_HEADER
ENABLE_TWOLINE_ALLAPPS
IME_STICKY_SNACKBAR_EDU
FOLDER_NAME_MAJORITY_RANKING
SCROLL_TOP_TO_RESET
ENABLE_SEARCH_UNINSTALLED_APPS
ENABLE_HOME_TRANSITION_LISTENER
Test: Presubmit
Change-Id: Ia392c10fc65616405cc4d4a2b8ed566e3bb7d386
This commit is contained in:
1 parent
b41def0366
commit
4f9ba255a4
15 files changed
+24
-356
No files matched your search
@@ -728,9 +728,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
|
||||
|
||||
removeCustomRules(rvContainer);
|
||||
removeCustomRules(getSearchRecyclerView());
|
||||
if (!isSearchSupported()) {
|
||||
layoutWithoutSearchContainer(rvContainer, showTabs);
|
||||
} else if (isSearchBarFloating()) {
|
||||
if (isSearchBarFloating()) {
|
||||
alignParentTop(rvContainer, showTabs);
|
||||
alignParentTop(getSearchRecyclerView(), /* tabs= */ false);
|
||||
} else {
|
||||
@@ -761,9 +759,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
|
||||
});
|
||||
|
||||
removeCustomRules(mHeader);
|
||||
if (!isSearchSupported()) {
|
||||
layoutWithoutSearchContainer(mHeader, false /* includeTabsMargin */);
|
||||
} else if (isSearchBarFloating()) {
|
||||
if (isSearchBarFloating()) {
|
||||
alignParentTop(mHeader, false /* includeTabsMargin */);
|
||||
} else {
|
||||
layoutBelowSearchContainer(mHeader, false /* includeTabsMargin */);
|
||||
@@ -918,23 +914,6 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
|
||||
mMainAdapterProvider);
|
||||
}
|
||||
|
||||
// TODO(b/216683257): Remove when Taskbar All Apps supports search.
|
||||
protected boolean isSearchSupported() {
|
||||
return true;
|
||||
}
|
||||
|
||||
private void layoutWithoutSearchContainer(View v, boolean includeTabsMargin) {
|
||||
if (!(v.getLayoutParams() instanceof RelativeLayout.LayoutParams)) {
|
||||
return;
|
||||
}
|
||||
|
||||
RelativeLayout.LayoutParams layoutParams = (LayoutParams) v.getLayoutParams();
|
||||
layoutParams.addRule(RelativeLayout.ALIGN_PARENT_TOP);
|
||||
layoutParams.topMargin = getContext().getResources().getDimensionPixelSize(includeTabsMargin
|
||||
? R.dimen.all_apps_header_pill_height
|
||||
: R.dimen.all_apps_header_top_margin);
|
||||
}
|
||||
|
||||
public boolean isInAllApps() {
|
||||
// TODO: Make this abstract
|
||||
return true;
|
||||
|
||||
Reference in new issue
Block a user