OSDN Git Service
Baligh Uddin [Thu, 13 Mar 2014 16:53:38 +0000 (16:53 +0000)]
am
c4a746a0: (-s ours) am
5f179e6e: (-s ours) am
441874b1: (-s ours) Import translations. DO NOT MERGE
* commit '
c4a746a0ef4a952bda3b16ebb53844a45f41b23c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 13 Mar 2014 16:50:59 +0000 (16:50 +0000)]
am
5f179e6e: (-s ours) am
441874b1: (-s ours) Import translations. DO NOT MERGE
* commit '
5f179e6eaf78eefe12dce74d37bf3c6fcaad73b7':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 13 Mar 2014 16:50:29 +0000 (16:50 +0000)]
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
Baligh Uddin [Thu, 13 Mar 2014 16:47:59 +0000 (09:47 -0700)]
am
441874b1: (-s ours) Import translations. DO NOT MERGE
* commit '
441874b19d79db51ea3488983f13b6e11b0cf796':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 13 Mar 2014 16:47:53 +0000 (16:47 +0000)]
am
f0bea657: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly
* commit '
f0bea657e9bc4abd0eee401d981cc4d339b41c1b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 13 Mar 2014 16:47:23 +0000 (16:47 +0000)]
am
b3f177b4: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-nova
* commit '
b3f177b455b58f351b3c34432503fc77db1bac2d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 13 Mar 2014 16:45:08 +0000 (16:45 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly
Baligh Uddin [Thu, 13 Mar 2014 16:45:07 +0000 (16:45 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-now-nova
Anjali Koppal [Thu, 13 Mar 2014 02:01:11 +0000 (02:01 +0000)]
am
5ad4484d: Add a setter/getter for Launcher.mAllAppsButton.
* commit '
5ad4484df3e477f9d8819605629b6e75a42e31ed':
Add a setter/getter for Launcher.mAllAppsButton.
Anjali Koppal [Tue, 11 Mar 2014 03:34:39 +0000 (20:34 -0700)]
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
Anjali Koppal [Thu, 13 Mar 2014 00:23:48 +0000 (00:23 +0000)]
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().
Anjali Koppal [Thu, 13 Mar 2014 00:21:51 +0000 (00:21 +0000)]
Merge "Make FolderIcon.getFolder() public and add Folder.getContent()." into ub-now-mister-ugly
Baligh Uddin [Wed, 12 Mar 2014 19:44:58 +0000 (12:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0dbcc43cb4daec6b0939e5c1973d3a74a639bb61
Auto-generated-cl: translation import
Baligh Uddin [Wed, 12 Mar 2014 19:44:33 +0000 (12:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie89bb39579db28c38425b05d1fa62cbcbf77696f
Auto-generated-cl: translation import
Baligh Uddin [Wed, 12 Mar 2014 19:44:12 +0000 (12:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I49d96e762bcf0c738d44b46faf5e8db20d005db5
Auto-generated-cl: translation import
Chris Wren [Tue, 11 Mar 2014 23:28:29 +0000 (23:28 +0000)]
am
42c725fe: enable launcher restore by default
* commit '
42c725fe683914885196914ec8bf1fa4b39f87a0':
enable launcher restore by default
Chris Wren [Tue, 11 Mar 2014 23:28:28 +0000 (23:28 +0000)]
am
76336cfc: Merge "update promise icon status" into ub-now-mister-ugly
* commit '
76336cfcd6e16c8bf8ac267974ce0577a60e8f72':
update promise icon status
Chris Wren [Tue, 11 Mar 2014 18:35:46 +0000 (14:35 -0400)]
enable launcher restore by default
shortcuts are wroking, widgets are todo
Bug:
10778992
Change-Id: I938b6d6ba5b68769628337955a17badaece1433f
Chris Wren [Tue, 11 Mar 2014 17:48:41 +0000 (17:48 +0000)]
Merge "update promise icon status" into ub-now-mister-ugly
Chris Wren [Fri, 14 Feb 2014 21:59:24 +0000 (16:59 -0500)]
update promise icon status
also fix a crash in LauncherModel.DEBUG_LOADERS
Bug:
10778992
Change-Id: Iafc28c1e0c2f2a1283783a7ce27e181634b62993
Anjali Koppal [Tue, 11 Mar 2014 02:18:43 +0000 (19:18 -0700)]
Make FolderIcon.getFolder() public and add Folder.getContent().
Change-Id: I21ad8b8178acbde2759cd2dfcd015d91e00b7505
Jason Monk [Mon, 10 Mar 2014 18:31:06 +0000 (18:31 +0000)]
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
Jason Monk [Mon, 10 Mar 2014 18:29:37 +0000 (18:29 +0000)]
Merge "Add support for uri favorites and resolve groups" into ub-now-mister-ugly
Dan Sandler [Fri, 7 Mar 2014 21:12:22 +0000 (21:12 +0000)]
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.
Dan Sandler [Fri, 7 Mar 2014 21:09:03 +0000 (13:09 -0800)]
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.
Dan Sandler [Fri, 7 Mar 2014 20:15:17 +0000 (20:15 +0000)]
Merge "Don't lose icons when migrating from different-sized hotseats." into ub-now-lunchbox
Jason Monk [Mon, 3 Mar 2014 21:11:30 +0000 (16:11 -0500)]
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
Selim Cinek [Fri, 7 Mar 2014 14:55:00 +0000 (14:55 +0000)]
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
Selim Cinek [Thu, 16 Jan 2014 18:38:38 +0000 (10:38 -0800)]
Disable wallpaper in -1 space in GEL and hack around window animations
Bug:
12978354
Change-Id: I8b5602ae434a9151b40d41defb891db1ad78ce81
Dan Sandler [Fri, 7 Mar 2014 04:48:04 +0000 (23:48 -0500)]
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
Adam Cohen [Fri, 7 Mar 2014 00:45:21 +0000 (00:45 +0000)]
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)"
Adam Cohen [Fri, 7 Mar 2014 00:42:28 +0000 (16:42 -0800)]
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)"
Adam Cohen [Fri, 7 Mar 2014 00:39:22 +0000 (00:39 +0000)]
Merge "Revert "Fix issue of extra blank screen after uninstall (issue
12372657)"" into ub-now-lunchbox
Adam Cohen [Thu, 6 Mar 2014 22:30:35 +0000 (22:30 +0000)]
Revert "Fix issue of extra blank screen after uninstall (issue
12372657)"
This reverts commit
b2603e3d3a32c90ca13458409561d025afdce399.
Change-Id: I81f8c5a4e3861b936ef9e1fbdb339c12d5aefc70
Winson Chung [Thu, 6 Mar 2014 19:59:11 +0000 (19:59 +0000)]
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)
Winson Chung [Thu, 6 Mar 2014 19:50:24 +0000 (11:50 -0800)]
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)
Winson Chung [Thu, 6 Mar 2014 19:48:29 +0000 (19:48 +0000)]
am
eb23cb2a: Properly releasing ContentProviderClient after LauncherModel check.
* commit '
eb23cb2a90a7f1fa794a375b9d7a111d7f630a02':
Properly releasing ContentProviderClient after LauncherModel check.
Winson Chung [Thu, 6 Mar 2014 18:39:43 +0000 (10:39 -0800)]
Properly releasing ContentProviderClient after LauncherModel check.
Change-Id: I0823ada46661b5ba0c36a0bb9f792969a1d04561
Winson Chung [Thu, 6 Mar 2014 18:12:02 +0000 (10:12 -0800)]
Disabling cling when the user moves the folder before launching it. (Bug
12963868)
Change-Id: Iddcdf655c78b7240be123bd549f3d45794d02c83
Anjali Koppal [Wed, 5 Mar 2014 22:21:48 +0000 (22:21 +0000)]
am
706ab0d0: Merge "Make classes that extend ItemInfo public." into ub-now-mister-ugly
* commit '
706ab0d07ada1694de78c573e342f4c64d75d45c':
Make classes that extend ItemInfo public.
Anjali Koppal [Wed, 5 Mar 2014 22:19:45 +0000 (22:19 +0000)]
Merge "Make classes that extend ItemInfo public." into ub-now-mister-ugly
Selim Cinek [Wed, 5 Mar 2014 14:01:08 +0000 (14:01 +0000)]
am
459875d0: Catching security exception when activity destroyed
* commit '
459875d09eca62e9f8511adcf269216a7f8d87ac':
Catching security exception when activity destroyed
Selim Cinek [Tue, 4 Mar 2014 20:29:40 +0000 (21:29 +0100)]
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
Anjali Koppal [Wed, 5 Mar 2014 01:16:11 +0000 (17:16 -0800)]
Make classes that extend ItemInfo public.
Also follow up on changes in ag/418520, adding Views to those method
params.
Change-Id: I93e0a3b30d10b969d1903a2f227f6744d709e89a
Selim Cinek [Tue, 4 Mar 2014 09:51:50 +0000 (09:51 +0000)]
am
10acea59: am
0c255a94: Merge "Changed behaviour of the wallpaper picker." into ub-now-lunchbox
* commit '
10acea596e3752d1eab693fd34209767e991c92d':
Changed behaviour of the wallpaper picker.
Selim Cinek [Tue, 4 Mar 2014 09:50:44 +0000 (01:50 -0800)]
am
0c255a94: Merge "Changed behaviour of the wallpaper picker." into ub-now-lunchbox
* commit '
0c255a946788499d7f169429890d5a423426593b':
Changed behaviour of the wallpaper picker.
Selim Cinek [Tue, 4 Mar 2014 09:48:31 +0000 (09:48 +0000)]
Merge "Changed behaviour of the wallpaper picker." into ub-now-lunchbox
Adam Cohen [Tue, 4 Mar 2014 00:36:54 +0000 (00:36 +0000)]
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)
Adam Cohen [Tue, 4 Mar 2014 00:32:59 +0000 (16:32 -0800)]
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)
Adam Cohen [Tue, 4 Mar 2014 00:14:38 +0000 (00:14 +0000)]
Merge "Fix issue of extra blank screen after uninstall (issue
12372657)" into ub-now-lunchbox
Adam Cohen [Tue, 4 Mar 2014 00:11:20 +0000 (16:11 -0800)]
Fix issue of extra blank screen after uninstall (issue
12372657)
Change-Id: I0326914821f68d789cb26767518ead1292d87db0
Adam Cohen [Mon, 3 Mar 2014 19:40:57 +0000 (19:40 +0000)]
Adam Cohen [Mon, 3 Mar 2014 19:39:35 +0000 (11:39 -0800)]
Adam Cohen [Mon, 3 Mar 2014 19:37:21 +0000 (11:37 -0800)]
Fix build
Change-Id: I17944c557970ed35e1bc67f6f3e3372ff88651ad
Adam Cohen [Mon, 3 Mar 2014 19:23:46 +0000 (19:23 +0000)]
am
6902916b: am
474a3573: Merge "Avoid stripping empty screens if the workspace is still loading (issue
12523285)" into ub-now-lunchbox
* commit '
6902916b07e5d2bb879746888deb2a567976b87a':
Avoid stripping empty screens if the workspace is still loading (issue
12523285)
Adam Cohen [Mon, 3 Mar 2014 19:19:36 +0000 (11:19 -0800)]
am
474a3573: Merge "Avoid stripping empty screens if the workspace is still loading (issue
12523285)" into ub-now-lunchbox
* commit '
474a35735ae758757dfd161a5c045d027bb9e033':
Avoid stripping empty screens if the workspace is still loading (issue
12523285)
Adam Cohen [Mon, 3 Mar 2014 19:07:23 +0000 (19:07 +0000)]
Merge "Avoid stripping empty screens if the workspace is still loading (issue
12523285)" into ub-now-lunchbox
Selim Cinek [Fri, 28 Feb 2014 16:18:59 +0000 (17:18 +0100)]
Changed behaviour of the wallpaper picker.
When opening the picker, the currently chosen wallpaper is
shown in the background.
In this change also the nullpointer was fixed when deleting
the currently selected wallpaper and setting it, because we
revert to the old wallpaper in that case.
When going into the same live wallpaper than the currently
selected we are going back to home if the user sets it or
goes back now, in order for the user not to loose state.
The real fix for this will be done later when the following
bug will be fixed: b/
13241760
Bug:
12063773
Bug:
13219612
Change-Id: I7c6abb25755eca99c3255278e0884d1ff4749b55
Christoph Studer [Mon, 3 Mar 2014 16:07:03 +0000 (16:07 +0000)]
am
db6f304d: am
8657bac9: Merge "Guard against null default wallpaper" into ub-now-lunchbox
* commit '
db6f304d6bc6a93a30b7b6f7ae4339f719c84797':
Guard against null default wallpaper
Christoph Studer [Mon, 3 Mar 2014 16:04:24 +0000 (08:04 -0800)]
am
8657bac9: Merge "Guard against null default wallpaper" into ub-now-lunchbox
* commit '
8657bac9b55a8db9ce587ea896a03325968498ea':
Guard against null default wallpaper
Christoph Studer [Mon, 3 Mar 2014 16:00:05 +0000 (16:00 +0000)]
Merge "Guard against null default wallpaper" into ub-now-lunchbox
Christoph Studer [Fri, 28 Feb 2014 14:57:18 +0000 (15:57 +0100)]
Guard against null default wallpaper
Deal with WallpaperManager.getBuiltInDrawable() returning null.
Bug:
13109487
Change-Id: Ib5665a0eb947e9784cdcd0e8dfab1a01b4deca82
Adam Cohen [Sat, 1 Mar 2014 20:12:59 +0000 (12:12 -0800)]
Avoid stripping empty screens if the workspace is still loading (issue
12523285)
-> This appears to be what may be causing data loss in some users during update.
A certain (seemingly) rare combination of life-cycle events and package events
seems to be the culprit (potentially why it's seen at update time).
Change-Id: Iea4f8aef012ba80b7ba568e0df264edb9284efbe
Anjali Koppal [Fri, 28 Feb 2014 22:34:28 +0000 (22:34 +0000)]
am
feec09d7: Merge "Make launcher implement PageSwitchListener." into ub-now-mister-ugly
* commit '
feec09d731782ca2e8b0fe9d59192fbc43f56e6c':
Make launcher implement PageSwitchListener.
Anjali Koppal [Fri, 28 Feb 2014 22:32:05 +0000 (22:32 +0000)]
Merge "Make launcher implement PageSwitchListener." into ub-now-mister-ugly
Anjali Koppal [Fri, 28 Feb 2014 21:33:27 +0000 (13:33 -0800)]
Make launcher implement PageSwitchListener.
Change-Id: Ief4b0cb4700aeace56a3c923a0a669a626c6506b
Selim Cinek [Fri, 28 Feb 2014 17:15:34 +0000 (17:15 +0000)]
am
ddace318: am
3aa28319: Changed inconsistency when selecting default wallpaper, where it did not go back to home.
* commit '
ddace3187d9792590d8b64de198f088541ab68f7':
Changed inconsistency when selecting default wallpaper, where it did not go back to home.
Selim Cinek [Fri, 28 Feb 2014 17:14:10 +0000 (09:14 -0800)]
am
3aa28319: Changed inconsistency when selecting default wallpaper, where it did not go back to home.
* commit '
3aa28319ceca347dfd4958ca95b94652bb8e2a3d':
Changed inconsistency when selecting default wallpaper, where it did not go back to home.
Selim Cinek [Fri, 28 Feb 2014 17:00:42 +0000 (18:00 +0100)]
Changed inconsistency when selecting default wallpaper, where it did not go back to home.
Bug:
13219313
Change-Id: I4961c6724a1550dbae126f97e45dc166cbe9a565
Jorim Jaggi [Fri, 28 Feb 2014 14:57:21 +0000 (14:57 +0000)]
am
e69746dc: am
4f462f4a: Merge "Revert "Disabled the wallpaper when completely in -1 Now space."" into ub-now-lunchbox
* commit '
e69746dc88d250cda8aebe3ec6634cdde18176c0':
Revert "Disabled the wallpaper when completely in -1 Now space."
Jorim Jaggi [Fri, 28 Feb 2014 14:55:56 +0000 (06:55 -0800)]
am
4f462f4a: Merge "Revert "Disabled the wallpaper when completely in -1 Now space."" into ub-now-lunchbox
* commit '
4f462f4a8b9fc6897d9fab9ad31c06e0b8f79373':
Revert "Disabled the wallpaper when completely in -1 Now space."
Jorim Jaggi [Fri, 28 Feb 2014 14:52:43 +0000 (14:52 +0000)]
Merge "Revert "Disabled the wallpaper when completely in -1 Now space."" into ub-now-lunchbox
Chris Wren [Thu, 27 Feb 2014 20:58:38 +0000 (20:58 +0000)]
am
71bc71fb: am
71144266: skip backup if launcher is in a bad state
* commit '
71bc71fb7e9a87717f67a2619a3a47f8de07f3e1':
skip backup if launcher is in a bad state
Chris Wren [Thu, 27 Feb 2014 20:57:07 +0000 (12:57 -0800)]
am
71144266: skip backup if launcher is in a bad state
* commit '
7114426665c21a11464147a8bb5e094b7949db42':
skip backup if launcher is in a bad state
Chris Wren [Thu, 27 Feb 2014 20:49:39 +0000 (15:49 -0500)]
skip backup if launcher is in a bad state
Bug:
13153542
Change-Id: I4312ebd200e8e652ef841f54301981c2a486b726
Jorim Jaggi [Thu, 27 Feb 2014 19:33:20 +0000 (20:33 +0100)]
Revert "Disabled the wallpaper when completely in -1 Now space."
This reverts commit
f3a8e8c0bd8b0dbe3991e5ad9d315e6e253e92eb.
Bug:
12978354
Change-Id: I11f1eeaab4fad9a2e4acf835144f0b0dc6fac54b
Winson Chung [Wed, 26 Feb 2014 20:03:23 +0000 (20:03 +0000)]
am
3dba141e: am
3de6ea86: Merge "Updating Read/Write settings permission protectionLevels. (Bug
11372484)" into ub-now-lunchbox
* commit '
3dba141e23c05c9b4ab3e48e66221324d06f00c7':
Updating Read/Write settings permission protectionLevels. (Bug
11372484)
Winson Chung [Wed, 26 Feb 2014 20:00:05 +0000 (12:00 -0800)]
am
3de6ea86: Merge "Updating Read/Write settings permission protectionLevels. (Bug
11372484)" into ub-now-lunchbox
* commit '
3de6ea8647882c507aaa8578a9fada88eadd0be9':
Updating Read/Write settings permission protectionLevels. (Bug
11372484)
Winson Chung [Wed, 26 Feb 2014 19:58:18 +0000 (19:58 +0000)]
Merge "Updating Read/Write settings permission protectionLevels. (Bug
11372484)" into ub-now-lunchbox
Winson Chung [Wed, 26 Feb 2014 19:50:46 +0000 (11:50 -0800)]
Updating Read/Write settings permission protectionLevels. (Bug
11372484)
Baligh Uddin [Wed, 26 Feb 2014 12:07:45 +0000 (12:07 +0000)]
am
5865f1a0: (-s ours) am
e8cc0905: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox
* commit '
5865f1a085af60a10eb48070bbdc8f6ff2d972fc':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 26 Feb 2014 12:04:43 +0000 (04:04 -0800)]
am
e8cc0905: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox
* commit '
e8cc0905e0cd083e2fe5aeb5967fb29cbe1bad1b':
Import translations. DO NOT MERGE
Selim Cinek [Tue, 25 Feb 2014 20:17:40 +0000 (20:17 +0000)]
am
cd58e223: am
d266d0fa: Merge "Fixed visibility issue of save button in case the url loading failed" into ub-now-lunchbox
* commit '
cd58e223d0c4828c7dd19d63faacde6941edd6fb':
Fixed visibility issue of save button in case the url loading failed
Selim Cinek [Tue, 25 Feb 2014 20:15:06 +0000 (12:15 -0800)]
am
d266d0fa: Merge "Fixed visibility issue of save button in case the url loading failed" into ub-now-lunchbox
* commit '
d266d0fae04e980a57c8e67c2b238b49cc1cf497':
Fixed visibility issue of save button in case the url loading failed
Baligh Uddin [Tue, 25 Feb 2014 18:25:04 +0000 (18:25 +0000)]
am
8fb904cc: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly
* commit '
8fb904cc2f916cea52439a19a0b71d5fef7d3964':
Import translations. DO NOT MERGE
Chris Wren [Tue, 25 Feb 2014 18:24:45 +0000 (18:24 +0000)]
am
0fe41883: am
0e4a365e: Merge "use restored icon for restored app shortcuts" into ub-now-lunchbox
* commit '
0fe418832ad2f2df4e80051076e205a5283c1424':
use restored icon for restored app shortcuts
Baligh Uddin [Tue, 25 Feb 2014 17:23:58 +0000 (17:23 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox
Baligh Uddin [Tue, 25 Feb 2014 17:23:55 +0000 (17:23 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly
Chris Wren [Tue, 25 Feb 2014 16:21:35 +0000 (08:21 -0800)]
am
0e4a365e: Merge "use restored icon for restored app shortcuts" into ub-now-lunchbox
* commit '
0e4a365e0d0220aff3cf60aa390fe9fcc05dbea1':
use restored icon for restored app shortcuts
Selim Cinek [Tue, 25 Feb 2014 13:26:06 +0000 (13:26 +0000)]
Merge "Fixed visibility issue of save button in case the url loading failed" into ub-now-lunchbox
Selim Cinek [Tue, 25 Feb 2014 13:12:07 +0000 (14:12 +0100)]
Fixed visibility issue of save button in case the url loading failed
Bug:
12953091
Change-Id: Idc640532e2c2c6143d49d330bd541682eca64ac5
Baligh Uddin [Mon, 24 Feb 2014 22:00:55 +0000 (14:00 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4bba74d1936a4a23bd4449e3fa699d3ad1ec36ce
Auto-generated-cl: translation import
Baligh Uddin [Mon, 24 Feb 2014 22:00:27 +0000 (14:00 -0800)]
Import translations. DO NOT MERGE
Change-Id: I695c7a40bf0130120d380c788841cedfc7b91c34
Auto-generated-cl: translation import
Baligh Uddin [Mon, 24 Feb 2014 21:59:57 +0000 (13:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2b7248218fe16856a9721b8b9169700977f19d00
Auto-generated-cl: translation import
Chris Wren [Mon, 24 Feb 2014 21:59:34 +0000 (21:59 +0000)]
Merge "use restored icon for restored app shortcuts" into ub-now-lunchbox
Adam Cohen [Fri, 21 Feb 2014 22:42:40 +0000 (22:42 +0000)]
am
1c471f4c: am
71e03b99: Fix issue where clings didn\'t appear after set up wizard (issue
13077829)
* commit '
1c471f4c3bd2336baabc147f9d22fffc9a880135':
Fix issue where clings didn't appear after set up wizard (issue
13077829)
Adam Cohen [Fri, 21 Feb 2014 22:40:50 +0000 (14:40 -0800)]
am
71e03b99: Fix issue where clings didn\'t appear after set up wizard (issue
13077829)
* commit '
71e03b9979b5ee4c30daa7eb0a704ec92b38431b':
Fix issue where clings didn't appear after set up wizard (issue
13077829)
Adam Cohen [Fri, 21 Feb 2014 22:09:53 +0000 (14:09 -0800)]
Fix issue where clings didn't appear after set up wizard (issue
13077829)
-> Also removed the db-created as a criteria for showing the clings
(this was a bit problematic in some cases and going forward)
-> Instead, we use database upgrade as a signal to not show the clings.
This is used instead of the above criteria (to prevent old users from
seeing the migration cling and losing their data.)
-> Stripped some old code related to custom clings that's no longer used.
Change-Id: Ib5e5285e5ddbc60e69eb998ee9fd092ae879150d
Baligh Uddin [Fri, 21 Feb 2014 11:16:17 +0000 (11:16 +0000)]
am
e638cdad: (-s ours) am
36c123ec: (-s ours) am
9594e887: (-s ours) am
37fe7d2b: (-s ours) am
f42cf7de: (-s ours) Import translations. DO NOT MERGE
* commit '
e638cdad1e244b787c2bcb7a1eae49854d8fcf30':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 21 Feb 2014 11:15:00 +0000 (03:15 -0800)]
am
36c123ec: (-s ours) am
9594e887: (-s ours) am
37fe7d2b: (-s ours) am
f42cf7de: (-s ours) Import translations. DO NOT MERGE
* commit '
36c123ec6b74be058702a37e8a01702b505da5c1':
Import translations. DO NOT MERGE