Sunny Goyal
6abc8ff0bb
Merge "Handling IllegalStateException which can be thrown by the system when the user is locked" into ub-launcher3-calgary
...
am: a42b283028
Change-Id: I4ecf1e8540e23210117ad71977535e45aa9d3558
2016-08-02 17:17:58 +00:00
Sunny Goyal
b0a0765ac0
Handling IllegalStateException which can be thrown by the system when the user is locked
...
am: 49f4f03dc8
Change-Id: I4ba92f62d5e4714fcb89b3cd9a0cf4effdd2d8f2
2016-08-02 17:17:57 +00:00
Sunny Goyal
a42b283028
Merge "Handling IllegalStateException which can be thrown by the system when the user is locked" into ub-launcher3-calgary
2016-08-02 17:04:44 +00:00
Bill Yi
91f949008b
Merge "Import translations. DO NOT MERGE" into ub-launcher3-calgary
...
am: 73a0a726a6 -s ours
Change-Id: I410c82c057cc2683263d49afeef5b3e89e052d41
2016-08-02 10:05:05 +00:00
Bill Yi
3e0ae1d74c
Import translations. DO NOT MERGE
...
am: b22c174a2e -s ours
Change-Id: Iff89271315880c168fb26e3f4387f0d84eb9b154
2016-08-02 10:05:04 +00:00
TreeHugger Robot
3e1b4a8aa0
Merge "Import translations. DO NOT MERGE" into ub-launcher3-master
2016-08-02 09:53:45 +00:00
TreeHugger Robot
73a0a726a6
Merge "Import translations. DO NOT MERGE" into ub-launcher3-calgary
2016-08-02 09:53:38 +00:00
Bill Yi
a8bf0434c9
Import translations. DO NOT MERGE
...
Change-Id: I66f83332bff8966941998be370eeb821d145a5e5
Auto-generated-cl: translation import
2016-08-01 18:27:06 -07:00
Bill Yi
b22c174a2e
Import translations. DO NOT MERGE
...
Change-Id: I221a6a62f6329ddac3e71461bb381820ed239873
Auto-generated-cl: translation import
2016-08-01 18:26:24 -07:00
Tony Wickham
6e492e0e5e
Merge "Add logging for shortcuts opening." into ub-launcher3-calgary
...
am: 6d9b072bdd
Change-Id: Ia31a1d865d8af05de25ec799386a39ea97828437
2016-08-02 01:07:04 +00:00
Tony Wickham
54b62332b9
Add logging for shortcuts opening.
...
am: 55c6691e3a
Change-Id: I780076409a7ed5eb5c8086450c386ac5a544d66f
2016-08-02 01:07:03 +00:00
Tony Wickham
6d9b072bdd
Merge "Add logging for shortcuts opening." into ub-launcher3-calgary
2016-08-02 00:56:57 +00:00
Tony Wickham
55c6691e3a
Add logging for shortcuts opening.
...
- Log as long press with child type DEEPSHORTCUTS container
- Parent type can be one of WORKSPACE, HOTSEAT, FOLDER,
ALLAPPS, PREDICTION, or SEARCHRESULT.
Bug: 30537079
Change-Id: Ie62e4889ee06c845f959ca998781787a7fdaf00e
2016-08-01 17:55:07 -07:00
Sunny Goyal
49f4f03dc8
Handling IllegalStateException which can be thrown by the system when the user is locked
...
Bug: 30411561
Change-Id: I0d7fc0aaecba01b1aaac95b98654f6e3ee090ce8
2016-08-01 16:13:28 -07:00
Sunny Goyal
dfe88e7d26
Merge "Adding quiet mode support for shortcuts" into ub-launcher3-calgary
...
am: f8d2a70e0f
Change-Id: I002543899baaef4842cdcb3a5ec5bd7573dc5985
2016-08-01 22:29:20 +00:00
Sunny Goyal
2a80dfd0d8
Adding quiet mode support for shortcuts
...
am: d3b87ef196
Change-Id: I9f782108419525f778936fe61e04073c81881f54
2016-08-01 22:29:20 +00:00
Sunny Goyal
f8d2a70e0f
Merge "Adding quiet mode support for shortcuts" into ub-launcher3-calgary
2016-08-01 22:04:11 +00:00
Sunny Goyal
252f595d36
Merge \"Build fix: Updating SDK for tests\" into ub-launcher3-calgary
...
am: 0843675e93
Change-Id: I0c7863bd507f64b00f1c5d497f56c4ac82064a3a
2016-08-01 17:14:29 +00:00
Sunny Goyal
c149bf0b46
Build fix: Updating SDK for tests
...
am: ec944ad7b0
Change-Id: I1ba91de248e319e01a54bafc252e7a40496dd1ae
2016-08-01 17:14:29 +00:00
Sunny Goyal
0843675e93
Merge "Build fix: Updating SDK for tests" into ub-launcher3-calgary
2016-08-01 17:09:03 +00:00
Sunny Goyal
ec944ad7b0
Build fix: Updating SDK for tests
...
Change-Id: I1377dce808335f65eb0799b7053c84853f57980a
2016-08-01 10:08:27 -07:00
Tony Wickham
cbb1f5984e
Merge \"Set shortcuts arrow pivot to side connected to container.\" into ub-launcher3-calgary
...
am: 1460475626
Change-Id: I9bf77425b52b74c3904d5fcb41ef7a233bbc5253
2016-07-30 05:13:19 +00:00
Tony Wickham
706034e85b
Set shortcuts arrow pivot to side connected to container.
...
am: 4d5887bd8c
Change-Id: I677309debc91c5a7af3dece0e076cc9182c1c7d4
2016-07-30 05:13:19 +00:00
Sunny Goyal
11177ac928
Merge \"Badging shortcuts with app icons\" into ub-launcher3-calgary
...
am: 66d17ca32d
Change-Id: I726a35f9267c2e1561a6da91eff77a32a07b772b
2016-07-30 05:13:18 +00:00
Sunny Goyal
a4c7c13e2a
Badging shortcuts with app icons
...
am: 79cf718fcd
Change-Id: I970ef85a1b6296d7f6d1387d5d7e283ef3ab6639
2016-07-30 05:13:18 +00:00
Tony Wickham
1bd6a5b6f8
Filter shortcuts down to 4 if there are more.
...
am: c39edf54e6
Change-Id: Ib5374fb977b53242faac4f759f9d5cee7d9c618e
2016-07-30 05:13:17 +00:00
Tony Wickham
1460475626
Merge "Set shortcuts arrow pivot to side connected to container." into ub-launcher3-calgary
2016-07-30 00:04:14 +00:00
Tony Wickham
4d5887bd8c
Set shortcuts arrow pivot to side connected to container.
...
Bug: 30508528
Change-Id: Iddc733d79b680010785d21b347d151bc23bffc23
2016-07-29 16:34:17 -07:00
Sunny Goyal
66d17ca32d
Merge "Badging shortcuts with app icons" into ub-launcher3-calgary
2016-07-29 23:14:51 +00:00
Tony Wickham
c39edf54e6
Filter shortcuts down to 4 if there are more.
...
- We take the first 4 in sorted order, except we remove up to 2
static shortcuts to make room for dynamic ones if they exist.
- Added ShortcutFilterTest with testSortAndFilterShortcuts().
This asserts that the filtered list is sorted and has the
expected number of static and dynamic shortcuts based on
inputs with various amounts of each.
Bug: 28980830
Change-Id: I832b6b21144f17c74bb8b90a840d6620e99911b8
2016-07-29 16:10:43 -07:00
Sunny Goyal
d3b87ef196
Adding quiet mode support for shortcuts
...
> LauncherApps returns empty list when the user is locked. Not relying on
LauncherApps in this case
> When the user is locked, removing all dynamic shortcuts
> Loading shortcuts from DB when the user is locked
> Verifying the shortcuts again when the user is available
Bug: 30411561
Change-Id: Ib6eb372c5b009cadb86a8f6e781f3f3cbf787ceb
2016-07-29 16:10:31 -07:00
Sunny Goyal
79cf718fcd
Badging shortcuts with app icons
...
Change-Id: I3fa005ece20a54b31f823acb28c384ecdf1eafb1
2016-07-29 16:06:36 -07:00
Hyunyoung Song
0cb41fbb8d
Merge \"Cancel exit spring loaded runnable when launcher state is set to APPS or WIDGETS b/29645452\" into ub-launcher3-calgary
...
am: 72dc60c576
Change-Id: Ida309677c84d067f012841aa9edeb21ec03594fe
2016-07-29 21:38:30 +00:00
Hyunyoung Song
59272eba29
Cancel exit spring loaded runnable when launcher state is set to APPS or WIDGETS b/29645452
...
am: 06ca7568c6
Change-Id: I17e8718fc30f3afe405b85095f30818e2369bd2f
2016-07-29 21:38:30 +00:00
Hyunyoung Song
72dc60c576
Merge "Cancel exit spring loaded runnable when launcher state is set to APPS or WIDGETS b/29645452" into ub-launcher3-calgary
2016-07-29 21:32:48 +00:00
Hyunyoung Song
06ca7568c6
Cancel exit spring loaded runnable when launcher state is set to APPS or WIDGETS
...
b/29645452
By cancelling the runnable, we are enabling transition:
state1 -> state3 instead of state1-> state2-> state3.
Transition state1->state3 is a viable transition that is
supported by our model.
Launcher Workspace
--------------------------------------------
state1 APPS_SPRING_LOADED SPRING_LOADED
state2 WORKSPACE NORMAL
state3 APPS NORMAL_HIDDEN
Change-Id: If27905567efe439324494e0091a4b42fcbf01448
2016-07-29 13:03:54 -07:00
Winson
3d00028c63
Merge changes I33da0d7f,I36c31609 into ub-launcher3-calgary
...
am: c42087e5c0
Change-Id: Ic169d18dab27357283b16dd1d705821052874b38
2016-07-29 05:56:08 +00:00
Winson
907da97059
Working around incorrect wallpaper offsets being calculated in RTL.
...
am: c7d2e83c15
Change-Id: I6477d7e7ed8686c8ccc5deab06621dc6496351e1
2016-07-29 05:56:06 +00:00
Winson
37fbc6dbf9
Fixing RTL wallpaper scrolling.
...
am: d96fa13369
Change-Id: Iad37d794d8d22ec178888e20fb97b117b3de22b8
2016-07-29 05:56:04 +00:00
Winson Chung
c42087e5c0
Merge changes I33da0d7f,I36c31609 into ub-launcher3-calgary
...
* changes:
Working around incorrect wallpaper offsets being calculated in RTL.
Fixing RTL wallpaper scrolling.
2016-07-29 05:49:20 +00:00
Bill Yi
d9cc08d505
Import translations. DO NOT MERGE am: 3c654c199e -s ours
...
am: fdaa46fb50 -s ours
Change-Id: Ie03014fa0180bbfc1636b7362dc040c72e41828a
2016-07-29 04:15:28 +00:00
Bill Yi
fdaa46fb50
Import translations. DO NOT MERGE
...
am: 3c654c199e -s ours
Change-Id: I509897896e4a9930da187f4f2270050063073d46
2016-07-29 04:12:28 +00:00
Bill Yi
b734dcdd9d
Merge \"Import translations. DO NOT MERGE\" into ub-launcher3-calgary
...
am: bf6e01ced5 -s ours
Change-Id: I00e17922016c5ff66d433948e4e294fc530e5121
2016-07-29 04:12:28 +00:00
Bill Yi
9f9c05e7a8
Import translations. DO NOT MERGE
...
am: 6c5025a9f5 -s ours
Change-Id: Icc53bd9754405e04fb6e639afae16c3ea805738c
2016-07-29 04:12:28 +00:00
TreeHugger Robot
bf6e01ced5
Merge "Import translations. DO NOT MERGE" into ub-launcher3-calgary
2016-07-29 04:04:30 +00:00
TreeHugger Robot
8577a17791
Merge "Import translations. DO NOT MERGE" into ub-launcher3-master
2016-07-29 04:04:11 +00:00
Bill Yi
a21401ad9e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 30413963
Change-Id: Ia648babe5145a5d82113993a4bc408e4e0b8c23f
2016-07-28 18:58:07 -07:00
Bill Yi
6c5025a9f5
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 30413963
Change-Id: I356f01214564a37fd27810a4bbd51a433ef5514d
2016-07-28 18:52:23 -07:00
Tony Wickham
864e1f926b
Merge \"Prevent opening shortcuts container if one is already open.\" into ub-launcher3-calgary
...
am: 6257bc327b
Change-Id: I770e0fcd8b7c82776137467a1419a559defbd58f
2016-07-29 01:33:48 +00:00
Tony Wickham
d5f5433f55
Prevent opening shortcuts container if one is already open.
...
am: 8141d63ed1
Change-Id: I0263738c17b069edc7295f67f1f5b00e1bfeae0d
2016-07-29 01:33:48 +00:00