Commit Graph

49925 Commits

Author SHA1 Message Date
Winson Chung 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
Winson Chung 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
Winson Chung 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
Winson Chung eb23cb2a90 Properly releasing ContentProviderClient after LauncherModel check.
Change-Id: I0823ada46661b5ba0c36a0bb9f792969a1d04561
2014-03-06 18:41:51 +00:00
Winson Chung 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
Anjali Koppal 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
Anjali Koppal 706ab0d07a Merge "Make classes that extend ItemInfo public." into ub-now-mister-ugly 2014-03-05 22:19:46 +00:00
Selim Cinek 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
Selim Cinek 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
Anjali Koppal 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
Mark Ashdown 7c9f33481f Merge remote-tracking branch 'goog/ub-now-lunchbox' into lunchbox-release 2014-03-04 10:25:42 +00:00
Selim Cinek 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
Selim Cinek 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
Selim Cinek 0c255a9467 Merge "Changed behaviour of the wallpaper picker." into ub-now-lunchbox 2014-03-04 09:48:32 +00:00
Adam Cohen 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
Adam Cohen 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
Adam Cohen 7da05a506c Merge "Fix issue of extra blank screen after uninstall (issue 12372657)" into ub-now-lunchbox 2014-03-04 00:14:38 +00:00
Adam Cohen b2603e3d3a Fix issue of extra blank screen after uninstall (issue 12372657)
Change-Id: I0326914821f68d789cb26767518ead1292d87db0
2014-03-03 16:12:35 -08:00
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