6ab691b69e
am f57c1564: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f57c1564b53eab486a5ac006ac5be2a9e1e33cc8':
Import translations. DO NOT MERGE
2014-03-17 13:44:43 -07:00
eb266c31f9
am 74899e96: (-s ours) Import translations. DO NOT MERGE
...
* commit '74899e96b85fdb156394d75b9237df54015a0cfa':
Import translations. DO NOT MERGE
2014-03-17 20:44:22 +00:00
73a950602a
am f2e81836: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f2e81836dc190f584d3e2c1764c7cb9bb9066bff':
Import translations. DO NOT MERGE
2014-03-17 20:44:07 +00:00
74899e96b8
Import translations. DO NOT MERGE
...
Change-Id: I51d88d84ee4012efcc3383ad3ecb3a538d51dfe2
Auto-generated-cl: translation import
2014-03-17 13:23:59 -07:00
f2e81836dc
Import translations. DO NOT MERGE
...
Change-Id: I6bcf984e6fdb29a2a3b6f449e27bf2da2b7d95b3
Auto-generated-cl: translation import
2014-03-17 13:23:36 -07:00
f57c1564b5
Import translations. DO NOT MERGE
...
Change-Id: I861674b0b1872d2b7117aa38fef99c29b04730a1
Auto-generated-cl: translation import
2014-03-17 13:23:14 -07:00
9bf1b92928
am 3f3a79a2: am e04e8b2a: Fixed a crash when an image with an odd width/height was selected
...
* commit '3f3a79a2fdc3cd4c765ee967fe0c6b7fc87c4a23':
Fixed a crash when an image with an odd width/height was selected
2014-03-14 17:47:33 +00:00
3f3a79a2fd
am e04e8b2a: Fixed a crash when an image with an odd width/height was selected
...
* commit 'e04e8b2a142f22bfeb8729e542f51d5510327eb9':
Fixed a crash when an image with an odd width/height was selected
2014-03-14 17:45:16 +00:00
e04e8b2a14
Fixed a crash when an image with an odd width/height was selected
...
Due to an internal rounding in the renderer, the calculations
for the cropping area could be slightly offset, getting out
of the image boundaries. I sanitized the rect by ensuring they
are inside the image.
Bug: 12174629
Change-Id: I5e08c83fe3e9cd48254fa6c8ba9cef77ab8a51a6
2014-03-14 18:27:23 +01:00
6e8246dcb6
am 47bc68d2: am 04960cd2: Merge "also backup icon assets for shortcuts." into ub-now-mister-ugly
...
* commit '47bc68d27dcafd58dd5ff06b5858c3e3fe089d91':
also backup icon assets for shortcuts.
2014-03-13 20:25:32 +00:00
47bc68d27d
am 04960cd2: Merge "also backup icon assets for shortcuts." into ub-now-mister-ugly
...
* commit '04960cd2e5968e83b26f4fbab23713a5d62af2fc':
also backup icon assets for shortcuts.
2014-03-13 20:22:21 +00:00
04960cd2e5
Merge "also backup icon assets for shortcuts." into ub-now-mister-ugly
2014-03-13 20:20:01 +00:00
656c90c18b
am c4a746a0: (-s ours) am 5f179e6e: (-s ours) am 441874b1: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c4a746a0ef4a952bda3b16ebb53844a45f41b23c':
Import translations. DO NOT MERGE
2014-03-13 16:53:38 +00:00
c4a746a0ef
am 5f179e6e: (-s ours) am 441874b1: (-s ours) Import translations. DO NOT MERGE
...
* commit '5f179e6eaf78eefe12dce74d37bf3c6fcaad73b7':
Import translations. DO NOT MERGE
2014-03-13 16:50:59 +00:00
844e2a6a08
am 5e0a4a4e: (-s ours) am f0bea657: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly
...
* commit '5e0a4a4e8150caec3f28e0884ae95bf4e69b57dd':
Import translations. DO NOT MERGE
2014-03-13 16:50:29 +00:00
5f179e6eaf
am 441874b1: (-s ours) Import translations. DO NOT MERGE
...
* commit '441874b19d79db51ea3488983f13b6e11b0cf796':
Import translations. DO NOT MERGE
2014-03-13 09:47:59 -07:00
5e0a4a4e81
am f0bea657: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly
...
* commit 'f0bea657e9bc4abd0eee401d981cc4d339b41c1b':
Import translations. DO NOT MERGE
2014-03-13 16:47:53 +00:00
3aa1900655
am b3f177b4: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-nova
...
* commit 'b3f177b455b58f351b3c34432503fc77db1bac2d':
Import translations. DO NOT MERGE
2014-03-13 16:47:23 +00:00
f0bea657e9
Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly
2014-03-13 16:45:09 +00:00
b3f177b455
Merge "Import translations. DO NOT MERGE" into ub-now-nova
2014-03-13 16:45:07 +00:00
5160e96698
also backup icon assets for shortcuts.
...
Bug: 13449249
Change-Id: I8c5a9e907f668e105c2786b80f0c8e62bd5f8344
2014-03-13 11:41:59 -04:00
516b7ce010
am 5ad4484d: Add a setter/getter for Launcher.mAllAppsButton.
...
* commit '5ad4484df3e477f9d8819605629b6e75a42e31ed':
Add a setter/getter for Launcher.mAllAppsButton.
2014-03-13 02:01:11 +00:00
5ad4484df3
Add a setter/getter for Launcher.mAllAppsButton.
...
Also, handle clicks on the all apps button by using onClick() method in
Launcher instead of directly calling onClickAllAppsButton in Hotseat.java
Bug 12553852
Change-Id: I261c27d3e964bbb1f52c2ab610997defd99a59bd
2014-03-12 18:22:55 -07:00
ed273c22c4
am fc4787f7: Merge "Make FolderIcon.getFolder() public and add Folder.getContent()." into ub-now-mister-ugly
...
* commit 'fc4787f7be3f05a3e8ccb393be1aaa5c9610c154':
Make FolderIcon.getFolder() public and add Folder.getContent().
2014-03-13 00:23:48 +00:00
fc4787f7be
Merge "Make FolderIcon.getFolder() public and add Folder.getContent()." into ub-now-mister-ugly
2014-03-13 00:21:52 +00:00
680f0980a3
Import translations. DO NOT MERGE
...
Change-Id: I0dbcc43cb4daec6b0939e5c1973d3a74a639bb61
Auto-generated-cl: translation import
2014-03-12 12:44:58 -07:00
5902be0b67
Import translations. DO NOT MERGE
...
Change-Id: Ie89bb39579db28c38425b05d1fa62cbcbf77696f
Auto-generated-cl: translation import
2014-03-12 12:44:33 -07:00
441874b19d
Import translations. DO NOT MERGE
...
Change-Id: I49d96e762bcf0c738d44b46faf5e8db20d005db5
Auto-generated-cl: translation import
2014-03-12 12:44:12 -07:00
fe845c4ed1
am 42c725fe: enable launcher restore by default
...
* commit '42c725fe683914885196914ec8bf1fa4b39f87a0':
enable launcher restore by default
2014-03-11 23:28:29 +00:00
d143598695
am 76336cfc: Merge "update promise icon status" into ub-now-mister-ugly
...
* commit '76336cfcd6e16c8bf8ac267974ce0577a60e8f72':
update promise icon status
2014-03-11 23:28:28 +00:00
42c725fe68
enable launcher restore by default
...
shortcuts are wroking, widgets are todo
Bug: 10778992
Change-Id: I938b6d6ba5b68769628337955a17badaece1433f
2014-03-11 14:36:00 -04:00
76336cfcd6
Merge "update promise icon status" into ub-now-mister-ugly
2014-03-11 17:48:42 +00:00
aeff7ea434
update promise icon status
...
also fix a crash in LauncherModel.DEBUG_LOADERS
Bug: 10778992
Change-Id: Iafc28c1e0c2f2a1283783a7ce27e181634b62993
2014-03-11 13:41:05 -04:00
f05545fcc2
Make FolderIcon.getFolder() public and add Folder.getContent().
...
Change-Id: I21ad8b8178acbde2759cd2dfcd015d91e00b7505
2014-03-10 19:18:43 -07:00
32a8e55e26
am 9364986c: Merge "Add support for uri favorites and resolve groups" into ub-now-mister-ugly
...
* commit '9364986c83d275509229e5f24ff2b1a27c7842b7':
Add support for uri favorites and resolve groups
2014-03-10 18:31:06 +00:00
9364986c83
Merge "Add support for uri favorites and resolve groups" into ub-now-mister-ugly
2014-03-10 18:29:38 +00:00
8dc2ca68c1
Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release
2014-03-07 13:49:10 -08:00
d222703b18
am bfbd52a5: am eac828e0: Merge "Don\'t lose icons when migrating from different-sized hotseats." into ub-now-lunchbox
...
* commit 'bfbd52a5e618a86dc7a13bb5e4866759e181a7cb':
Don't lose icons when migrating from different-sized hotseats.
2014-03-07 21:12:22 +00:00
bfbd52a5e6
am eac828e0: Merge "Don\'t lose icons when migrating from different-sized hotseats." into ub-now-lunchbox
...
* commit 'eac828e0fec7085d0d6b670d578eaaf36ae2e3ca':
Don't lose icons when migrating from different-sized hotseats.
2014-03-07 13:09:03 -08:00
eac828e0fe
Merge "Don't lose icons when migrating from different-sized hotseats." into ub-now-lunchbox
2014-03-07 20:15:17 +00:00
41314973b4
Add support for uri favorites and resolve groups
...
Adds support for new types in default_workspace xml files.
Adds support to favorite that attempts to resolve an intent specified
by URI. If a logical choice can be found from the resolve, it adds the
shortcut.
Adds support for a resolve, which contains several favorites and attempts
to add the shortcuts until one is successful.
Bug: 10547358
Change-Id: Ia30341e77e7d4a0bd4a4f4e6a3d9ce2a48a46237
2014-03-07 13:35:34 -05:00
a2bc37722e
Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release
2014-03-07 15:33:44 +00:00
1041107737
am 3a8a8f7c: Disable wallpaper in -1 space in GEL and hack around window animations
...
* commit '3a8a8f7c2355863006208fced945f63c9bdb40b4':
Disable wallpaper in -1 space in GEL and hack around window animations
2014-03-07 14:55:00 +00:00
3a8a8f7c23
Disable wallpaper in -1 space in GEL and hack around window animations
...
Bug: 12978354
Change-Id: I8b5602ae434a9151b40d41defb891db1ad78ce81
2014-03-07 14:30:36 +01:00
ab5fa3a06a
Don't lose icons when migrating from different-sized hotseats.
...
Launcher2 on sw720dp devices had 8 hotseat slots; Launcher3
has only 6 on those same devices. When importing the old
hotseat, the empty slot (so technically there were 9)
occupied by the all apps button didn't line up with the new
all apps button, causing a hole on the hotseat. Furthermore,
the icon in old position 3 was clobbered by the new all apps
icon:
0 1 2 3 (#) 4 5 6 7 ==> 0 1 2 (:) _ 4 5
In this CL we introduce a separate sort-and-place step for
hotseat icons so that any icon colliding with the new
all-apps slot can be moved to the right to find the next
nearest open slot. This works well for the 8->6 case; it
will probably do something reasonable, if not ideal, for
other grid migration scenarios.
But those are not covered by this bug.
Bug: 13015468
Change-Id: I7edb3f27addc78ad02bbfcd1c39175ca56220007
2014-03-06 23:54:24 -05:00
4fa4b01daa
am 497ecbd3: am ac8180ac: Merge "Revert "Fix issue of extra blank screen after uninstall (issue 12372657)"" into ub-now-lunchbox
...
* commit '497ecbd311bce99d652f74492f623c8b93b2b5f9':
Revert "Fix issue of extra blank screen after uninstall (issue 12372657)"
2014-03-07 00:45:21 +00:00
497ecbd311
am ac8180ac: Merge "Revert "Fix issue of extra blank screen after uninstall (issue 12372657)"" into ub-now-lunchbox
...
* commit 'ac8180ac7856e4739c147bee3f419b19573c3dae':
Revert "Fix issue of extra blank screen after uninstall (issue 12372657)"
2014-03-06 16:42:28 -08:00
ac8180ac78
Merge "Revert "Fix issue of extra blank screen after uninstall (issue 12372657)"" into ub-now-lunchbox
2014-03-07 00:39:23 +00:00
6cb8ae4c16
Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release
2014-03-06 15:29:42 -08:00
8a4a731b0f
Revert "Fix issue of extra blank screen after uninstall (issue 12372657)"
...
This reverts commit b2603e3d3a
2014-03-06 22:30:35 +00:00
Geoff Mendal
Selim Cinek
Chris Wren
Baligh Uddin
Anjali Koppal
Jason Monk
Huy Nguyen
Dan Sandler
Mark Ashdown
Adam Cohen