paphonb 33ca738308 Merge remote-tracking branch 'aosp/master' into dev ...

# Conflicts:
#	Android.mk
#	AndroidManifest.xml
#	quickstep/res/drawable/ic_split_screen.xml
#	quickstep/res/values/dimens.xml
#	quickstep/src/com/android/launcher3/uioverrides/OverviewState.java
#	quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
#	quickstep/src/com/android/quickstep/TaskSystemShortcut.java
#	quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
#	quickstep/src/com/android/quickstep/views/ShelfScrimView.java
#	quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
#	res/layout/launcher.xml
#	res/values/dimens.xml
#	res/values/styles.xml
#	src/com/android/launcher3/DeviceProfile.java
#	src/com/android/launcher3/graphics/LauncherIcons.java
#	src/com/android/launcher3/model/PackageUpdatedTask.java
#	src/com/android/launcher3/views/ScrimView.java
#	src/com/android/launcher3/views/SpringRelativeLayout.java

2018-10-20 18:56:18 +07:00

..

bg_workspace_card_button.xml

Adding an empty page in Recents view corresponding to workspace

2017-12-19 10:06:15 -08:00

ic_empty_recents.xml

Adding an empty message in RecentsView

2018-03-26 17:24:12 -07:00

ic_pin.xml

Update a few icons to better match our outlined style

2018-09-18 18:44:51 +02:00

ic_split_screen.xml

Update a few icons to better match our outlined style

2018-09-18 18:44:51 +02:00

task_menu_bg.xml

Changed the Task Menu to overlay on top of the task view

2018-06-08 14:24:22 -07:00