Merge branch \'ub-launcher3-burnaby-nyc\' into launcher3merge
am: 8c340dff19
* commit '8c340dff19dd52c3d8d0a3c39178a9a388e89159':
Fixing homescreen getting blank when returning from the overlay
Fixing scrollTo getting called even though the gesture was handled by an overlay
Adding overlay interaction support
Cleaning up the overlay interface
Enable selection action mode for Android M+.
Fix home button returning to now screen issue
Fixing bug where the widget background enters into a focused state if a child calls requestFocus in xml
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Return 1f in Log(Ac/De)celerateInterpolators on a 1f input.
Revert "Calling start/stop listening in onStart/onStop"
Fix incorrect icon greying on pre-N system
Setting stable layout flags on the launcher, so that the instets do not change for launcher when going in/out of another app
Showing a toast when changing wallaper is disabled
Fix recyclerview res path
Change-Id: If46f540c36af5895a6efb7271fe56aeb7bc60a25
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index b43d965..a426215 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -536,7 +536,7 @@
@Override
public void run() {
mContentWrapper.setLayerType(LAYER_TYPE_NONE, null);
- mContentWrapper.setLayerType(LAYER_TYPE_NONE, null);
+ mFooter.setLayerType(LAYER_TYPE_NONE, null);
}
};
}