PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
9,668 Commits 1 Branch 0 Tags
616facd74bea28fd88c2da240159cd87ec1972a5
Commit Graph

9668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Hansson 616facd74b am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568 
am: cb168d34ae

* commit 'cb168d34aef2da06f5d9110a07ceeca82b72f41d':
 2015-10-20 00:34:05 +00:00
Adam Skory 1dda00996a am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 5cc929caa0 
am: 5c597e4aba

* commit '5c597e4abaec26e4fa715f93f0f7db688cc07d0d':
 2015-10-20 00:34:00 +00:00
Baligh Uddin ce566c0e93 keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f 
am: 319e21ec62

* commit '319e21ec62f164af0ff9168de211d4b9baa4377b':
  Import translations. DO NOT MERGE
  Fix overlapping pages (issue 12551580)
  Properly saving migration cling keys.
  Tightening migration conditions. (Bug 11973614)
  Import translations. DO NOT MERGE
  Fix build
  Import translations. DO NOT MERGE
  Initial empty repository
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  override Launcher2 (aosp)
 2015-10-20 00:33:56 +00:00
Huy Nguyen 8acd2748b2 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1 
am: a59ef0ba69

* commit 'a59ef0ba69f7b1346616a5c6896351ad85ed9b88':
 2015-10-20 00:33:49 +00:00
Mark Ashdown ca2bafc86f Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc37722e 
am: b7b834bde1

* commit 'b7b834bde170c2b444e0b031f5ec703620252240':
 2015-10-20 00:33:45 +00:00
Huy Nguyen ab3847b8b3 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16 
am: 2feee6dec2

* commit '2feee6dec261eb70a83e30fb10620b29b5a8cf54':
 2015-10-20 00:33:41 +00:00
Mark Ashdown 59329359e7 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f33481f 
am: 68c0bedde8

* commit '68c0bedde806eedfd25b4b726fa520c2a5c32a7a':
 2015-10-20 00:33:37 +00:00
Mathew Inwood 9cd759a5e1 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7c1 
am: 52cced3ede

* commit '52cced3edefa36f5be919f40327cef6f22d55bee':
 2015-10-20 00:33:33 +00:00
Juan Silveira a379acb1cb Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c 
am: b6973a57c3

* commit 'b6973a57c35f4ff27034b088b4778b1bcbdb404b':
 2015-10-20 00:33:30 +00:00
Anton Hansson aeb301c7e5 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c4274 
am: 216a53f0b1

* commit '216a53f0b12c048a531dd7bdf3a02f59e18a808d':
 2015-10-20 00:33:25 +00:00
Adam Skory 157e6c57d6 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b96e 
am: 61172868fd

* commit '61172868fde38da7f7ec8dcb84288d51095948e1':
 2015-10-20 00:33:21 +00:00
Adam Skory f351edd651 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c95 
am: d072686669

* commit 'd0726866694356f674ee80ca83ad97ff930bce20':
 2015-10-20 00:33:17 +00:00
Adam Skory 92557c9596 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d 
am: f8f29b43ff

* commit 'f8f29b43ff7ecf9346e12e965ee90480617525bf':
 2015-10-20 00:33:10 +00:00
Anton Hansson cb168d34ae am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 0274f0a568

* commit '0274f0a568fed5aa57d0c40acfb74bea67cba29a':
 2015-10-20 00:28:46 +00:00
Adam Skory 5c597e4aba am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 5cc929caa0

* commit '5cc929caa0922e0b80dbf3f6c099d841c3797c20':
 2015-10-20 00:28:39 +00:00
Baligh Uddin 319e21ec62 keep history after reset to ub-now-lunchbox-release@1069658 
am: 2b8dbe3a5f

* commit '2b8dbe3a5f5f673e87aa4b13133a4d3bf2b98b3c':
  Import translations. DO NOT MERGE
  Fix overlapping pages (issue 12551580)
  Properly saving migration cling keys.
  Tightening migration conditions. (Bug 11973614)
  Import translations. DO NOT MERGE
  Fix build
  Import translations. DO NOT MERGE
  Initial empty repository
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  override Launcher2 (aosp)
 2015-10-20 00:28:33 +00:00
Huy Nguyen a59ef0ba69 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 8dc2ca68c1

* commit '8dc2ca68c1ccf1570caec3e52c2671b323cf7102':
 2015-10-20 00:28:28 +00:00
Mark Ashdown b7b834bde1 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: a2bc37722e

* commit 'a2bc37722e9fa0af9d67986038aec58af5308771':
 2015-10-20 00:28:23 +00:00
Huy Nguyen 2feee6dec2 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 6cb8ae4c16

* commit '6cb8ae4c16cb3b0105ebfbb23be23e0fb1131496':
 2015-10-20 00:28:15 +00:00
Mark Ashdown 68c0bedde8 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 7c9f33481f

* commit '7c9f33481fd3c063495813b2772e198ed696e3ce':
 2015-10-20 00:28:10 +00:00
Mathew Inwood 52cced3ede Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 56ca86b7c1

* commit '56ca86b7c177fd6fb330d6cb3631070e8689cd87':
 2015-10-20 00:28:05 +00:00
Juan Silveira b6973a57c3 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 07130d400c

* commit '07130d400c52518e413e58334525f1598c3b8f1a':
 2015-10-20 00:28:01 +00:00
Anton Hansson 216a53f0b1 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: d0642c4274

* commit 'd0642c4274abcbede9177d61b0f072689db889a9':
 2015-10-20 00:27:55 +00:00
Adam Skory 61172868fd Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 853b55b96e

* commit '853b55b96e4af7a4f949a22cc084bd333e528c1c':
 2015-10-20 00:27:51 +00:00
Adam Skory d072686669 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 9e3ebf3c95

* commit '9e3ebf3c95fbf4b7a96b6080802ca23e5098fe40':
 2015-10-20 00:27:43 +00:00
Adam Skory f8f29b43ff Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release 
am: 381fa3fb2d

* commit '381fa3fb2d990f7976a898c16f3675dbb325b848':
 2015-10-20 00:27:39 +00:00
Adam Cohen e7afa51bd8 am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop 
* commit 'ae5f7ce8ed2e385cba8d65a67d9b108c9c3590e8':
  Fixing typo from previous CL
 2014-10-18 16:05:48 +00:00
Adam Cohen 84a79949a4 am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop 
* commit '755dd70238162d0b631a8a17c42047c61318be30':
  Fix missing screen when adding widget directly to provider
 2014-10-18 16:05:47 +00:00
Sunny Goyal fdbfba88d4 am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created 
* commit '8cce9dd83aecd90920db751ab3f8fb6969f087c5':
  DO NOT MERGE Rechecking unrestored items when launcher gets created
 2014-10-18 16:05:47 +00:00
Ian Parkinson 3d78b80ecd am 0c2918f4: Use View.generateViewId if available 
* commit '0c2918f4f4c4a9a6609b82cf23155ed51840f2c8':
  Use View.generateViewId if available
 2014-10-18 16:05:46 +00:00
Adam Cohen 49e2f10ee2 am 4b8d11fc: Add missing xxhdpi asset 
* commit '4b8d11fcb396760eca75cf2b055a7acd05c594ec':
  Add missing xxhdpi asset
 2014-10-18 16:05:46 +00:00
Kenny Guy 5f2a520f0c am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop 
* commit '0cd271918a7c7baa69e872f7128351a0c7dbbbae':
  Remove reference to CODENAME from compat code.
 2014-10-18 16:05:45 +00:00
Adam Cohen 91c11b28d5 am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop 
* commit '52077b7a951153ce77e7354c6096b3bcfbec8c3e':
  Don't let old Launcher activity interfere with new one
 2014-10-18 16:05:45 +00:00
Bjorn Bringert c656245b9c am 2ed99e86: Build Launcher3 against prebuilt SDK 21 
* commit '2ed99e861b4be73620fd6fdc24a13230e096921c':
  Build Launcher3 against prebuilt SDK 21
 2014-10-18 16:05:44 +00:00
Sunny Goyal e7599d6943 am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop 
* commit '6d467e27b7e16442d3fb56af2aa3d94e657dff25':
  Resetting launcherProvider data if restore set was empty
 2014-10-18 16:05:44 +00:00
Baligh Uddin ab474588ce am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop 
* commit '1004713867fa4476201c02c95f35c64361a6dcf2':
  Import translations. DO NOT MERGE
 2014-10-18 16:05:43 +00:00
Sunny Goyal e43f0d646c am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons 
* commit 'c5fb59fb9a36180ce962f565d85aa92f9991da1a':
  Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons
 2014-10-18 16:05:43 +00:00
Sunny Goyal 501414523e am f876301d: UI Fixes 
* commit 'f876301d0a460bec260a3c7a6ab260a06d5817ba':
  UI Fixes
 2014-10-18 16:05:42 +00:00
Adam Cohen cb20616a18 am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop 
* commit 'd8f6253e67d23dcdcf521b0558f193ae832743b2':
  When ensuring screen exists, make sure it's actually referring to a screen, not a rank
 2014-10-18 16:05:42 +00:00
Baligh Uddin 6317598a19 am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop 
* commit '68207e2532b2059e513a1c4e33c3c52e1ac1e559':
  Import translations. DO NOT MERGE
 2014-10-18 16:05:41 +00:00
Adam Cohen ae5f7ce8ed Merge "Fixing typo from previous CL" into ub-now-porkchop 2014-10-14 22:09:00 +00:00
Adam Cohen d61a638e99 Fixing typo from previous CL 
Bug 17969770

Change-Id: I4ea04864000d2ed8368ca81ba8cff42b4208d13d
 2014-10-14 15:06:54 -07:00
Adam Cohen 755dd70238 Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop 2014-10-14 22:00:42 +00:00
Sunny Goyal 8cce9dd83a DO NOT MERGE 
Rechecking unrestored items when launcher gets created

Bug: 17941096
Change-Id: Ic54464a9c64442d6784cda44ef22fa3d08e22f1f
 2014-10-14 14:02:31 -07:00
Adam Cohen eb1ac42fd4 Fix missing screen when adding widget directly to provider 
bug: 17969770
Change-Id: Icbd8451d8adde0519917a7bf06365517405759fe
 2014-10-14 10:36:27 -07:00
Ian Parkinson 0c2918f4f4 Use View.generateViewId if available 
Bug: 17456181
Change-Id: Ib7e310ba38ed5e392c5c9b8734f197212f518389
 2014-10-06 14:27:16 +01:00
Adam Cohen 4b8d11fcb3 Add missing xxhdpi asset 
Bug: 17813013
Change-Id: If1e3448fb109e3f7f0c1ae6562a795fecf3bdf42
 2014-10-03 13:47:11 -07:00
Kenny Guy 0cd271918a Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop 2014-10-03 12:16:59 +00:00
Kenny Guy 92d6d3b275 Remove reference to CODENAME from compat code. 
Fixes bug with uninstalling apps for managed profile
as codename check means it fails to include the user
when uninstalling the app.

Bug: 17800161
Change-Id: I6901eff5aa8f00fb3b859e8db37930b95f031625
 2014-10-03 12:15:53 +01:00
Adam Cohen 52077b7a95 Merge "Don't let old Launcher activity interfere with new one" into ub-now-porkchop 2014-09-30 23:03:40 +00:00