Merge "Use Launcher.getLauncher(Context) instead of type-casting." into ub-launcher3...

author Tony Wickham <twickham@google.com>

Wed, 12 Oct 2016 21:22:05 +0000 (21:22 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 12 Oct 2016 21:22:05 +0000 (21:22 +0000)
author Tony Wickham <twickham@google.com>
Wed, 12 Oct 2016 21:22:05 +0000 (21:22 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 12 Oct 2016 21:22:05 +0000 (21:22 +0000)
diff --cc src/com/android/launcher3/Workspace.java
Simple merge
diff --cc src/com/android/launcher3/folder/Folder.java
Simple merge
diff --cc src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java
Simple merge
author	Tony Wickham <twickham@google.com>
	Wed, 12 Oct 2016 21:22:05 +0000 (21:22 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 12 Oct 2016 21:22:05 +0000 (21:22 +0000)
		1	2
src/com/android/launcher3/Workspace.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/folder/Folder.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java	patch \|	diff1 \|	diff2 \|	blob \| history