PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
9,700 Commits 1 Branch 0 Tags
69830841ec9b764074e9d0bb6156cb6dffda5ce2
Commit Graph

9700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin 69830841ec Import translations. DO NOT MERGE am: c4d66cf035 -s ours 
am: 3209b2bc4d  -s ours

* commit '3209b2bc4d975f92a2d1b060de273da0789dbfce':
  Import translations. DO NOT MERGE
 2015-10-20 00:34:33 +00:00
Baligh Uddin 38bd557502 am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc 
am: 5d6886a1cf

* commit '5d6886a1cf1387a86f6ed2abd0c0d139d0690eab':
 2015-10-20 00:34:30 +00:00
Huy Nguyen eadf9b6782 am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 149268d869 
am: 70aa099f23

* commit '70aa099f2381c7635e3f350335c55a0d038aded9':
 2015-10-20 00:34:26 +00:00
Mark Ashdown 7661d33379 am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: b1a081221e 
am: 1bd8f7e460

* commit '1bd8f7e4607eb43c153c6bdc9285f42a32bdc200':
 2015-10-20 00:34:22 +00:00
Huy Nguyen 078afac399 am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d 
am: 27b99c86e9

* commit '27b99c86e9451e9aee5b73c00073e270d3f08361':
 2015-10-20 00:34:19 +00:00
Mark Ashdown 78a44d4726 am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 64b83ce632 
am: 346da07c80

* commit '346da07c80e2691060df29f66878cb63542fcf21':
 2015-10-20 00:34:16 +00:00
Mathew Inwood 4396cc1fff am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1d8 
am: 7748c94d25

* commit '7748c94d25f9593cb2951876f2f6888f2b4b5e05':
 2015-10-20 00:34:12 +00:00
Juan Silveira 6120e6096a am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6adda 
am: 3f39cc45d8

* commit '3f39cc45d8b0e5a6cb3fa2ebe70af9aeb1af8085':
 2015-10-20 00:34:09 +00:00
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
Baligh Uddin 3209b2bc4d Import translations. DO NOT MERGE 
am: c4d66cf035  -s ours

* commit 'c4d66cf035e138222abf18e3b76775904e1a41f2':
  Import translations. DO NOT MERGE
 2015-10-20 00:29:33 +00:00
Baligh Uddin 5d6886a1cf am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 
am: 7fd445f4cc

* commit '7fd445f4ccdde932505319bf3a45d3a7523c6494':
 2015-10-20 00:29:27 +00:00
Huy Nguyen 70aa099f23 am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 149268d869

* commit '149268d8698f316a70cce2515e7787334e62d23d':
 2015-10-20 00:29:21 +00:00
Mark Ashdown 1bd8f7e460 am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: b1a081221e

* commit 'b1a081221e3d9e937d2b629e6ec083c3c5a4aa55':
 2015-10-20 00:29:15 +00:00
Huy Nguyen 27b99c86e9 am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: fb1a32a63d

* commit 'fb1a32a63d59d65419e0b0db0124cec445b992cc':
 2015-10-20 00:29:10 +00:00
Mark Ashdown 346da07c80 am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 64b83ce632

* commit '64b83ce632c424f09dbce504be60f5ef9c249e45':
 2015-10-20 00:29:06 +00:00
Mathew Inwood 7748c94d25 am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: d5da3cc1d8

* commit 'd5da3cc1d8e534f60925514bbc7d1e72b225cd97':
 2015-10-20 00:29:00 +00:00
Juan Silveira 3f39cc45d8 am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 
am: 524ed6adda

* commit '524ed6addab4294f3be29cfbef5ef571077ca3a4':
 2015-10-20 00:28:52 +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