Merge "No longer stash taskbar when swiping up all apps" into tm-dev
This commit is contained in:
@@ -66,11 +66,6 @@ public class AllAppsState extends LauncherState {
|
||||
return scaleAndTranslation;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isTaskbarStashed(Launcher launcher) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected float getDepthUnchecked(Context context) {
|
||||
// The scrim fades in at approximately 50% of the swipe gesture.
|
||||
@@ -93,7 +88,7 @@ public class AllAppsState extends LauncherState {
|
||||
|
||||
@Override
|
||||
public int getVisibleElements(Launcher launcher) {
|
||||
return ALL_APPS_CONTENT;
|
||||
return ALL_APPS_CONTENT | HOTSEAT_ICONS;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user