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
771f9c5b99
am 19e213f6: am c6c03671: Disabling cling when the user moves the folder before launching it. (Bug 12963868)
...
* commit '19e213f60dd8d44286612868789d1df08ee92c30':
Disabling cling when the user moves the folder before launching it. (Bug 12963868)
2014-03-06 19:59:11 +00:00
19e213f60d
am c6c03671: Disabling cling when the user moves the folder before launching it. (Bug 12963868)
...
* commit 'c6c0367111e587c7f19cb8185dcda550aa94a848':
Disabling cling when the user moves the folder before launching it. (Bug 12963868)
2014-03-06 11:50:24 -08:00
22e5844214
am eb23cb2a: Properly releasing ContentProviderClient after LauncherModel check.
...
* commit 'eb23cb2a90a7f1fa794a375b9d7a111d7f630a02':
Properly releasing ContentProviderClient after LauncherModel check.
2014-03-06 19:48:29 +00:00
eb23cb2a90
Properly releasing ContentProviderClient after LauncherModel check.
...
Change-Id: I0823ada46661b5ba0c36a0bb9f792969a1d04561
2014-03-06 18:41:51 +00:00
c6c0367111
Disabling cling when the user moves the folder before launching it. (Bug 12963868)
...
Change-Id: Iddcdf655c78b7240be123bd549f3d45794d02c83
2014-03-06 10:33:41 -08:00
6c2672925b
am 706ab0d0: Merge "Make classes that extend ItemInfo public." into ub-now-mister-ugly
...
* commit '706ab0d07ada1694de78c573e342f4c64d75d45c':
Make classes that extend ItemInfo public.
2014-03-05 22:21:48 +00:00
706ab0d07a
Merge "Make classes that extend ItemInfo public." into ub-now-mister-ugly
2014-03-05 22:19:46 +00:00
c5357ade72
am 459875d0: Catching security exception when activity destroyed
...
* commit '459875d09eca62e9f8511adcf269216a7f8d87ac':
Catching security exception when activity destroyed
2014-03-05 14:01:08 +00:00
459875d09e
Catching security exception when activity destroyed
...
Fixed a bug where an asynctask tried to load an image
even after the activity was destroyed leading to a
security exception since the permission could not be granted anymore.
Bug: 12760267
Change-Id: I76ee2c0ab268b0ab4bde606706046caf0e39f1e9
2014-03-05 14:56:42 +01:00
7b168a1bb9
Make classes that extend ItemInfo public.
...
Also follow up on changes in ag/418520, adding Views to those method
params.
Change-Id: I93e0a3b30d10b969d1903a2f227f6744d709e89a
2014-03-04 17:16:11 -08:00
7c9f33481f
Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release
2014-03-04 10:25:42 +00:00
de0e91f3b7
am 10acea59: am 0c255a94: Merge "Changed behaviour of the wallpaper picker." into ub-now-lunchbox
...
* commit '10acea596e3752d1eab693fd34209767e991c92d':
Changed behaviour of the wallpaper picker.
2014-03-04 09:51:50 +00:00
10acea596e
am 0c255a94: Merge "Changed behaviour of the wallpaper picker." into ub-now-lunchbox
...
* commit '0c255a946788499d7f169429890d5a423426593b':
Changed behaviour of the wallpaper picker.
2014-03-04 01:50:44 -08:00
0c255a9467
Merge "Changed behaviour of the wallpaper picker." into ub-now-lunchbox
2014-03-04 09:48:32 +00:00
6c68e58802
am 919ce780: am 7da05a50: Merge "Fix issue of extra blank screen after uninstall (issue 12372657)" into ub-now-lunchbox
...
* commit '919ce78038836547480c37a444fe90b68f9c943f':
Fix issue of extra blank screen after uninstall (issue 12372657)
2014-03-04 00:36:54 +00:00
919ce78038
am 7da05a50: Merge "Fix issue of extra blank screen after uninstall (issue 12372657)" into ub-now-lunchbox
...
* commit '7da05a506cdc651a77df918ec20d6aa881ca51b2':
Fix issue of extra blank screen after uninstall (issue 12372657)
2014-03-03 16:32:59 -08:00
7da05a506c
Merge "Fix issue of extra blank screen after uninstall (issue 12372657)" into ub-now-lunchbox
2014-03-04 00:14:38 +00:00
b2603e3d3a
Fix issue of extra blank screen after uninstall (issue 12372657)
...
Change-Id: I0326914821f68d789cb26767518ead1292d87db0
2014-03-03 16:12:35 -08:00
Baligh Uddin
Chris Wren
Anjali Koppal
Jason Monk
Huy Nguyen
Dan Sandler
Mark Ashdown
Selim Cinek
Adam Cohen
Winson Chung