summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/CellLayout.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2017-03-13 18:58:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-03-13 18:58:03 +0000
commit4eaacc7485b85ec964c0ff384dda781f7f17ec74 (patch)
tree2a76c577d5caca7127c07d46ccf6743f8c1b56b6 /src/com/android/launcher3/CellLayout.java
parent02a7624fc3e64aa1bd47bc06e4d9c434b8659402 (diff)
parent9b29ca5add472b6bdebfa7936142b3aad6cbe3c5 (diff)
downloadpackages_apps_Trebuchet-4eaacc7485b85ec964c0ff384dda781f7f17ec74.tar.gz
packages_apps_Trebuchet-4eaacc7485b85ec964c0ff384dda781f7f17ec74.tar.bz2
packages_apps_Trebuchet-4eaacc7485b85ec964c0ff384dda781f7f17ec74.zip
Merge "Defining HomeScreenElementTheme for elements which appear on top of wallpaper" into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
-rw-r--r--src/com/android/launcher3/CellLayout.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 70137aa7c..c0946a0e3 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -57,6 +57,7 @@ import com.android.launcher3.graphics.DragPreviewProvider;
import com.android.launcher3.util.CellAndSpan;
import com.android.launcher3.util.GridOccupancy;
import com.android.launcher3.util.ParcelableSparseArray;
+import com.android.launcher3.util.Themes;
import com.android.launcher3.util.Thunk;
import java.lang.annotation.Retention;
@@ -235,7 +236,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler {
for (int i = 0; i < mDragOutlines.length; i++) {
mDragOutlines[i] = new Rect(-1, -1, -1, -1);
}
- mDragOutlinePaint.setColor(getResources().getColor(R.color.outline_color));
+ mDragOutlinePaint.setColor(Themes.getAttrColor(context, android.R.attr.textColorPrimary));
// When dragging things around the home screens, we show a green outline of
// where the item will land. The outlines gradually fade out, leaving a trail