Merge "Various managed profile fixes" into ub-launcher3-burnaby
diff --git a/res/layout/widget_cell.xml b/res/layout/widget_cell.xml
index cb1c812..ab23b84 100644
--- a/res/layout/widget_cell.xml
+++ b/res/layout/widget_cell.xml
@@ -44,7 +44,7 @@
android:ellipsize="end"
android:fadingEdge="horizontal"
- android:textColor="#FFFFFFFF"
+ android:textColor="@color/widgets_view_item_text_color"
android:textSize="16sp"
android:textAlignment="viewStart"
android:fontFamily="sans-serif-condensed"
@@ -61,7 +61,7 @@
android:layout_marginLeft="5dp"
android:layout_weight="0"
android:gravity="start"
- android:textColor="#FFFFFFFF"
+ android:textColor="@color/widgets_view_item_text_color"
android:textSize="16sp"
android:textAlignment="viewStart"
android:fontFamily="sans-serif-condensed"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9695b26..0c3714b 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -42,6 +42,7 @@
<color name="apps_view_section_text_color">#009688</color>
<!-- Widgetss view -->
- <color name="widgets_view_section_text_color">#009688</color>
+ <color name="widgets_view_section_text_color">#FFFFFF</color>
+ <color name="widgets_view_item_text_color">#C4C4C4</color>
<color name="widgets_cell_color">#263238</color>
</resources>
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index e0aecea..ed8eea7 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -704,9 +704,15 @@
if (mInfo.opened) {
mLauncher.closeFolder();
mRearrangeOnClose = true;
+ } else if (mState == STATE_ANIMATING) {
+ mRearrangeOnClose = true;
} else {
rearrangeChildren();
+ clearDragInfo();
}
+ }
+
+ private void clearDragInfo() {
mCurrentDragInfo = null;
mCurrentDragView = null;
mSuppressOnAdd = false;
@@ -1037,6 +1043,7 @@
}
}
mSuppressFolderDeletion = false;
+ clearDragInfo();
}
@Thunk void replaceFolderWithFinalItem() {