2505ed5294
am 9c9f2090: Merge "Using material style overscroll effect for workspace and folders" into ub-launcher3-burnaby
...
* commit '9c9f20905c1bcf25594a2cb00846b583fb705a26':
Using material style overscroll effect for workspace and folders
2015-06-22 18:39:48 +00:00
9c9f20905c
Merge "Using material style overscroll effect for workspace and folders" into ub-launcher3-burnaby
2015-06-22 18:31:51 +00:00
5912327eeb
am 5796b03f: Add workspace scrim animation to the state transition to reduce jankiness. b/20956087
...
* commit '5796b03f6d526ee775fa48f175ceee0e92200b45':
Add workspace scrim animation to the state transition to reduce jankiness. b/20956087
2015-06-20 01:20:00 +00:00
5796b03f6d
Add workspace scrim animation to the state transition to reduce jankiness.
...
b/20956087
Note: Will work on creating a separate view for the scrim animation rather
than the drag layer on a separate CL.
Change-Id: Idaced5c6867abe3ed9afa984c885023676b3a141
2015-06-19 18:03:35 -07:00
21a4ccc627
Merge "Add extras required for compilation" into ub-launcher3-almonte
2015-06-19 23:00:34 +00:00
4d113a5ff4
Using material style overscroll effect for workspace and folders
...
Bug: 21335369
Change-Id: I53cc6edfa87334b9326f1dedd90c3e2222beade5
2015-06-19 19:53:34 +00:00
54c50bc08f
Add extras required for compilation
...
-> Patching back from a future branch
Change-Id: I5127a82560e39bf391fe083d0eb8932cf2473562
2015-06-19 12:12:50 -07:00
95781f3250
am e91a14c6: Merge "Cancelling launcher reload on mcc change" into ub-launcher3-burnaby
...
* commit 'e91a14c6986660253996018982d500a728585199':
Cancelling launcher reload on mcc change
2015-06-18 22:17:41 +00:00
a83d2d405f
am c44de1ad: Merge "Revert resource name to what platform ui automator test defines. b/21923650" into ub-launcher3-burnaby
...
* commit 'c44de1adcf57c52ee93b4a9d2f4505e17b6cc857':
Revert resource name to what platform ui automator test defines. b/21923650
2015-06-18 22:17:40 +00:00
e91a14c698
Merge "Cancelling launcher reload on mcc change" into ub-launcher3-burnaby
2015-06-18 22:09:50 +00:00
c44de1adcf
Merge "Revert resource name to what platform ui automator test defines. b/21923650" into ub-launcher3-burnaby
2015-06-18 22:07:09 +00:00
60331a9be7
Revert resource name to what platform ui automator test defines.
...
b/21923650
Change-Id: I26a9405ac0567f856a43d83886df4ece938c11a7
2015-06-18 15:05:56 -07:00
4894346811
am 7b933a5e: resolved conflicts for merge of 78564d4e to ub-launcher3-burnaby
...
* commit '7b933a5ef764d4716177dc7f060af823a38fa628':
Updating ComponentKey for compatibility with build.
2015-06-18 21:40:13 +00:00
7b933a5ef7
resolved conflicts for merge of 78564d4e to ub-launcher3-burnaby
...
Change-Id: I9e302b223dff1f238d720026e20b64315b61b293
2015-06-18 21:27:30 +00:00
ac9d7b403b
am d3800208: Merge "Moving predicted apps callbacks to use ComponentKey." into ub-launcher3-burnaby
...
* commit 'd3800208aa8c4f5926502ccb8e49e13501b441c9':
Moving predicted apps callbacks to use ComponentKey.
2015-06-18 21:19:53 +00:00
d3800208aa
Merge "Moving predicted apps callbacks to use ComponentKey." into ub-launcher3-burnaby
2015-06-18 21:10:41 +00:00
78564d4e2d
Updating ComponentKey for compatibility with build.
...
Change-Id: I293177c0eff8c162c2d21bfc2aebf83926c62690
2015-06-18 21:05:55 +00:00
2003c75ac4
Cancelling launcher reload on mcc change
...
Bug: 21022833
Change-Id: Iccd477e7b1638d162e1a500cdb7a52b8d359c657
2015-06-18 14:04:00 -07:00
dbe2b3f068
am 230eade4: Converting folder name to string before applying it to folder info
...
* commit '230eade4a35d9dfe9b186da46e38ca05f0256a69':
Converting folder name to string before applying it to folder info
2015-06-18 20:02:59 +00:00
230eade4a3
Converting folder name to string before applying it to folder info
...
> getText() returns Spannable which can contain text styling
Change-Id: Iacdf9da47b54b5cd290a355152383d75bf3e6836
2015-06-18 12:51:53 -07:00
6b1c73f50a
Moving predicted apps callbacks to use ComponentKey.
...
Bug: 21270185
Change-Id: If2d9dd77235e7a96de96a1a5441a589ef8a72a7f
2015-06-18 12:39:24 -07:00
65bafc04e8
am 3ea5cd43: Merge "Remove DEBUG flag inside WidgetsListAdapter" into ub-launcher3-burnaby
...
* commit '3ea5cd4311e095a5b6614bfcef40c08197719b22':
Remove DEBUG flag inside WidgetsListAdapter
2015-06-18 18:43:51 +00:00
3ea5cd4311
Merge "Remove DEBUG flag inside WidgetsListAdapter" into ub-launcher3-burnaby
2015-06-18 18:33:19 +00:00
289ec3af9a
Remove DEBUG flag inside WidgetsListAdapter
...
Change-Id: I7e5b3162f2b3768caff7ff79fd75567a793a1f45
2015-06-17 23:08:05 -07:00
878c941f51
am c1d53ef8: Merge "Widgets model should respect AppFilter." into ub-launcher3-burnaby
...
* commit 'c1d53ef81c2f1923fde9a35d44e8d267443a9ff9':
Widgets model should respect AppFilter.
2015-06-18 04:37:44 +00:00
c1d53ef81c
Merge "Widgets model should respect AppFilter." into ub-launcher3-burnaby
2015-06-18 04:29:52 +00:00
eaf291b9fe
Widgets model should respect AppFilter.
...
> This pattern is already used in AllAppsList
> mBgWidgetsModel variable cleanup inside LauncherModel.
b/21739736
Change-Id: I03a05064ce3c3e5effb09055af9f4d4de2811c95
2015-06-17 21:12:44 -07:00
a26f82fccd
am 170ca1cc: (-s ours) Import translations. DO NOT MERGE
...
* commit '170ca1ccd81a1a73bec94fa468a8b54d7d25717b':
Import translations. DO NOT MERGE
2015-06-18 03:40:57 +00:00
8cf3d1b640
am 27f03251: Merge "Deleting empty folders based on DB state" into ub-launcher3-burnaby
...
* commit '27f03251ea8b563dc385094e8d03f9fc1dc9390d':
Deleting empty folders based on DB state
2015-06-18 03:40:56 +00:00
886315de0e
resolved conflicts for merge of dad45a70 to ub-launcher3-master
...
Change-Id: I901fc7850b246dc2dfa161454ac596f91945d277
2015-06-17 20:39:45 -07:00
170ca1ccd8
Import translations. DO NOT MERGE
...
Change-Id: I8c0c8c4e5f5e09c5852d31429c8f668d4229cc37
Auto-generated-cl: translation import
2015-06-17 20:18:23 -07:00
27f03251ea
Merge "Deleting empty folders based on DB state" into ub-launcher3-burnaby
2015-06-18 03:06:30 +00:00
dad45a7026
Removing obsolete strings
...
Change-Id: I447d5fe819fbec64c4e873ed40dabd4f76bebb4a
2015-06-17 18:24:52 -07:00
546bd3a8a4
am e9819e6d: Add null-check for workspace/hotseat.
...
* commit 'e9819e6d5df372323582cf9ae7567062ffc6fca8':
Add null-check for workspace/hotseat.
2015-06-17 19:38:04 +00:00
e9819e6d5d
Add null-check for workspace/hotseat.
...
I assumed that they are non-null, but reportedly it was wrong.
This method can be invoked before the views are fully initialized.
Also hotseat can be null as far as I see setupViews(), therefore
null-check and 'importance stored' flag check should be done
separately.
Bug: 21779078
Change-Id: I3f17226f887c38adf2b1fb7ee2a016e00ffc0eb4
2015-06-17 11:26:54 -07:00
5b4805a323
am 49198279: Revert "Removing onInitialize method and creating searchManager in getView"
...
* commit '4919827990b16ae22595d0b7cb123a875961d9be':
Revert "Removing onInitialize method and creating searchManager in getView"
2015-06-17 16:21:22 +00:00
4919827990
Revert "Removing onInitialize method and creating searchManager in getView"
...
This reverts commit 6530017bb8
2015-06-17 16:09:07 +00:00
26851f42fc
am 6530017b: Removing onInitialize method and creating searchManager in getView
...
* commit '6530017bb88179aeb1e3f131738da8f0d7592f36':
Removing onInitialize method and creating searchManager in getView
2015-06-17 02:02:35 +00:00
6530017bb8
Removing onInitialize method and creating searchManager in getView
...
Change-Id: I3e2620a7839dfd5e6ecb76f24b384eb50e820a94
2015-06-16 18:43:58 -07:00
a844a41e0c
am 01d40534: Renaming id to prevent collision.
...
* commit '01d4053436a6a771b36b527a4f0ff49bbf468632':
Renaming id to prevent collision.
2015-06-17 00:50:35 +00:00
01d4053436
Renaming id to prevent collision.
...
Bug: 21878123
Change-Id: If4313d217967310ede7ed3fe11bdbe49311e1a4f
2015-06-17 00:45:04 +00:00
24f6d08d86
am 92060267: Making UserHandleCompat constructor public
...
* commit '92060267c4bf924be220cb69082df35e6217ddf2':
Making UserHandleCompat constructor public
2015-06-17 00:07:02 +00:00
92060267c4
Making UserHandleCompat constructor public
...
Change-Id: Ied4c62964e608d543f0bcf3b232c0df7b57bdf5d
2015-06-16 16:57:35 -07:00
d780c396ff
am 07973bf2: Merge "Fixing nullpointer when creating new DB" into ub-launcher3-burnaby
...
* commit '07973bf2534c496c0febc93c7ef2a3bd6b33d6dd':
Fixing nullpointer when creating new DB
2015-06-16 23:12:19 +00:00
07973bf253
Merge "Fixing nullpointer when creating new DB" into ub-launcher3-burnaby
2015-06-16 23:03:15 +00:00
3c22e76182
am d730f9d7: Making resultHandler protected to make it accessible from a subClass
...
* commit 'd730f9d74f87b90616e0f0a9c7b6a4c78976f41a':
Making resultHandler protected to make it accessible from a subClass
2015-06-16 22:58:59 +00:00
d730f9d74f
Making resultHandler protected to make it accessible from a subClass
...
Change-Id: Id11118b9f8b9782c44847ac82a03ea36bcb43963
2015-06-16 15:45:49 -07:00
b4cbea4ad4
Fixing nullpointer when creating new DB
...
LauncherProvider is not ready until the DBHelper is created
Change-Id: Iabd61005892f15fd4a31d882100d87df2b2a7b85
2015-06-16 15:18:41 -07:00
e67c34cabd
am 51832858: Using component key for app search results
...
* commit '5183285847816cee9d0db6a8a7ab1a5929163e4e':
Using component key for app search results
2015-06-16 20:44:07 +00:00
5183285847
Using component key for app search results
...
Change-Id: Idc610cde340331892a5fabfa8bf952d136675f81
2015-06-16 11:41:38 -07:00
Sunny Goyal
Hyunyoung Song
Winson Chung
Adam Cohen
Geoff Mendal
Jun Mukai