Adam Cohen
1c8bd2e9af
am 89d0bf07: am 65e43032: Fix build
...
* commit '89d0bf071378d29e1009b56a8cb368b9b727af7b':
Fix build
2014-03-03 19:40:57 +00:00
Adam Cohen
89d0bf0713
am 65e43032: Fix build
...
* commit '65e43032c8962765a3e89826d4312042a03ee3be':
Fix build
2014-03-03 11:39:35 -08:00
Adam Cohen
65e43032c8
Fix build
...
Change-Id: I17944c557970ed35e1bc67f6f3e3372ff88651ad
2014-03-03 11:37:27 -08:00
Adam Cohen
6c353d71d8
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)
2014-03-03 19:23:46 +00:00
Adam Cohen
6902916b07
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)
2014-03-03 11:19:36 -08:00
Adam Cohen
474a35735a
Merge "Avoid stripping empty screens if the workspace is still loading (issue 12523285)" into ub-now-lunchbox
2014-03-03 19:07:23 +00:00
Selim Cinek
ffed65886e
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
2014-03-03 18:09:06 +01:00
Christoph Studer
5c40ee50ff
am db6f304d: am 8657bac9: Merge "Guard against null default wallpaper" into ub-now-lunchbox
...
* commit 'db6f304d6bc6a93a30b7b6f7ae4339f719c84797':
Guard against null default wallpaper
2014-03-03 16:07:03 +00:00
Christoph Studer
db6f304d6b
am 8657bac9: Merge "Guard against null default wallpaper" into ub-now-lunchbox
...
* commit '8657bac9b55a8db9ce587ea896a03325968498ea':
Guard against null default wallpaper
2014-03-03 08:04:24 -08:00
Christoph Studer
8657bac9b5
Merge "Guard against null default wallpaper" into ub-now-lunchbox
2014-03-03 16:00:06 +00:00
Christoph Studer
7084c606eb
Guard against null default wallpaper
...
Deal with WallpaperManager.getBuiltInDrawable() returning null.
Bug: 13109487
Change-Id: Ib5665a0eb947e9784cdcd0e8dfab1a01b4deca82
2014-03-03 15:35:25 +01:00
Adam Cohen
517a7f5fd0
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
2014-03-01 12:17:44 -08:00
Anjali Koppal
fa81e73ea2
am feec09d7: Merge "Make launcher implement PageSwitchListener." into ub-now-mister-ugly
...
* commit 'feec09d731782ca2e8b0fe9d59192fbc43f56e6c':
Make launcher implement PageSwitchListener.
2014-02-28 22:34:28 +00:00
Anjali Koppal
feec09d731
Merge "Make launcher implement PageSwitchListener." into ub-now-mister-ugly
2014-02-28 22:32:06 +00:00
Anjali Koppal
f5d29130b9
Make launcher implement PageSwitchListener.
...
Change-Id: Ief4b0cb4700aeace56a3c923a0a669a626c6506b
2014-02-28 13:33:27 -08:00
Selim Cinek
92cba61c45
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.
2014-02-28 17:15:34 +00:00
Selim Cinek
ddace3187d
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.
2014-02-28 09:14:10 -08:00
Selim Cinek
3aa28319ce
Changed inconsistency when selecting default wallpaper, where it did not go back to home.
...
Bug: 13219313
Change-Id: I4961c6724a1550dbae126f97e45dc166cbe9a565
2014-02-28 18:03:15 +01:00
Jorim Jaggi
83274fd67a
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."
2014-02-28 14:57:21 +00:00
Jorim Jaggi
e69746dc88
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."
2014-02-28 06:55:56 -08:00
Jorim Jaggi
4f462f4a8b
Merge "Revert "Disabled the wallpaper when completely in -1 Now space."" into ub-now-lunchbox
2014-02-28 14:52:44 +00:00
Chris Wren
15518ec6f0
am 71bc71fb: am 71144266: skip backup if launcher is in a bad state
...
* commit '71bc71fb7e9a87717f67a2619a3a47f8de07f3e1':
skip backup if launcher is in a bad state
2014-02-27 20:58:38 +00:00
Chris Wren
71bc71fb7e
am 71144266: skip backup if launcher is in a bad state
...
* commit '7114426665c21a11464147a8bb5e094b7949db42':
skip backup if launcher is in a bad state
2014-02-27 12:57:07 -08:00
Chris Wren
7114426665
skip backup if launcher is in a bad state
...
Bug: 13153542
Change-Id: I4312ebd200e8e652ef841f54301981c2a486b726
2014-02-27 15:49:39 -05:00
Jorim Jaggi
b45b65e1e5
Revert "Disabled the wallpaper when completely in -1 Now space."
...
This reverts commit f3a8e8c0bd .
Bug: 12978354
Change-Id: I11f1eeaab4fad9a2e4acf835144f0b0dc6fac54b
2014-02-27 20:33:46 +01:00
Winson Chung
35f78310ec
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)
2014-02-26 20:03:23 +00:00
Winson Chung
3dba141e23
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)
2014-02-26 12:00:05 -08:00
Winson Chung
3de6ea8647
Merge "Updating Read/Write settings permission protectionLevels. (Bug 11372484)" into ub-now-lunchbox
2014-02-26 19:58:19 +00:00
Winson Chung
c66109caf6
Updating Read/Write settings permission protectionLevels. (Bug 11372484)
2014-02-26 11:50:46 -08:00
Baligh Uddin
6aebb777c6
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
2014-02-26 12:07:45 +00:00
Baligh Uddin
5865f1a085
am e8cc0905: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox
...
* commit 'e8cc0905e0cd083e2fe5aeb5967fb29cbe1bad1b':
Import translations. DO NOT MERGE
2014-02-26 04:04:43 -08:00
Selim Cinek
827317adf7
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
2014-02-25 20:17:40 +00:00
Selim Cinek
cd58e223d0
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
2014-02-25 12:15:06 -08:00
Baligh Uddin
32451e1a0a
am 8fb904cc: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly
...
* commit '8fb904cc2f916cea52439a19a0b71d5fef7d3964':
Import translations. DO NOT MERGE
2014-02-25 18:25:04 +00:00
Chris Wren
c054b3aeb6
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
2014-02-25 18:24:45 +00:00
Baligh Uddin
e8cc0905e0
Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox
2014-02-25 17:23:59 +00:00
Baligh Uddin
8fb904cc2f
Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly
2014-02-25 17:23:55 +00:00
Chris Wren
0fe418832a
am 0e4a365e: Merge "use restored icon for restored app shortcuts" into ub-now-lunchbox
...
* commit '0e4a365e0d0220aff3cf60aa390fe9fcc05dbea1':
use restored icon for restored app shortcuts
2014-02-25 08:21:35 -08:00
Selim Cinek
d266d0fae0
Merge "Fixed visibility issue of save button in case the url loading failed" into ub-now-lunchbox
2014-02-25 13:26:07 +00:00
Selim Cinek
c13e0a5cf1
Fixed visibility issue of save button in case the url loading failed
...
Bug: 12953091
Change-Id: Idc640532e2c2c6143d49d330bd541682eca64ac5
2014-02-25 14:23:57 +01:00
Mathew Inwood
56ca86b7c1
Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release
2014-02-25 10:30:34 +00:00
Baligh Uddin
bb6094ed3c
Import translations. DO NOT MERGE
...
Change-Id: I4bba74d1936a4a23bd4449e3fa699d3ad1ec36ce
Auto-generated-cl: translation import
2014-02-24 14:00:55 -08:00
Baligh Uddin
77f40b46b2
Import translations. DO NOT MERGE
...
Change-Id: I695c7a40bf0130120d380c788841cedfc7b91c34
Auto-generated-cl: translation import
2014-02-24 14:00:27 -08:00
Baligh Uddin
10addc3e0e
Import translations. DO NOT MERGE
...
Change-Id: I2b7248218fe16856a9721b8b9169700977f19d00
Auto-generated-cl: translation import
2014-02-24 13:59:57 -08:00
Chris Wren
0e4a365e0d
Merge "use restored icon for restored app shortcuts" into ub-now-lunchbox
2014-02-24 21:59:34 +00:00
Adam Cohen
c757e6c884
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)
2014-02-21 22:42:40 +00:00
Adam Cohen
1c471f4c3b
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)
2014-02-21 14:40:50 -08:00
Adam Cohen
71e03b9979
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
2014-02-21 14:37:53 -08:00
Baligh Uddin
a6c57fc5b4
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
2014-02-21 11:16:17 +00:00
Baligh Uddin
e638cdad1e
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
2014-02-21 03:15:00 -08:00