PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,925 Commits 1 Branch 0 Tags
ccf503c0a16f5180cd8e2d4136660beab94deef7
Commit Graph

49925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sunny Goyal ead4ab9655 Using UiSelector instead of BySelector 
Change-Id: Ie912cc7291a2533f6686bdb34e108be15ce244ac
 2015-10-19 17:32:10 -07:00
Baligh Uddin b58e5fbc57 Import translations. DO NOT MERGE 
am: 2c29ac6eb5  -s ours

* commit '2c29ac6eb52a767f77541a739a492d60d600e29a':
  Import translations. DO NOT MERGE
 2015-10-20 00:30:06 +00:00
Baligh Uddin 8a901a6133 am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE 
am: 35424cc2a6  -s ours

* commit '35424cc2a6643609f82349c6903e1ee7c2d073dc':
  Import translations. DO NOT MERGE
 2015-10-20 00:30:02 +00:00
Baligh Uddin 431d174f26 Import translations. DO NOT MERGE 
am: c81b0617a6  -s ours

* commit 'c81b0617a6224e30e0294986c7d5f59542165591':
  Import translations. DO NOT MERGE
 2015-10-20 00:29:53 +00:00
Baligh Uddin bbe424e584 Import translations. DO NOT MERGE 
am: 81403969d1  -s ours

* commit '81403969d1da3026b3d61b6e9ef72c9ffd7e2312':
  Import translations. DO NOT MERGE
 2015-10-20 00:29:49 +00:00
Baligh Uddin 8454595cf3 Import translations. DO NOT MERGE 
am: 01614d6ba5  -s ours

* commit '01614d6ba5de7484310e14b2ab19ae6161c48562':
  Import translations. DO NOT MERGE
 2015-10-20 00:29:40 +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
Adam Cohen 6d0a93207e am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop 
am: e7afa51bd8

* commit 'e7afa51bd8f0f0b9f21bd63a9ceeb9f330259fc2':
 2015-10-20 00:29:19 +00:00
Adam Cohen 313c1de1cc am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop 
am: 84a79949a4

* commit '84a79949a478f8b91c7fcc9346525f7dd187f548':
 2015-10-20 00:29:15 +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
Sunny Goyal 852a96562a am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created 
am: fdbfba88d4  -s ours

* commit 'fdbfba88d4f08d7a721d91b7e3d30ee5a290be6e':
 2015-10-20 00:29:10 +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
Ian Parkinson 8374915b27 am 0c2918f4: Use View.generateViewId if available 
am: 3d78b80ecd

* commit '3d78b80ecdfeec7704b2aa82ce39823fa903ea61':
 2015-10-20 00:29:04 +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
Adam Cohen a42854b9b4 am 4b8d11fc: Add missing xxhdpi asset 
am: 49e2f10ee2

* commit '49e2f10ee205d6190f0d4c589ba31b6763e9b0d3':
 2015-10-20 00:28:59 +00:00
Kenny Guy 689cb6366b am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop 
am: 5f2a520f0c

* commit '5f2a520f0cd47b274bdf809d7b665c956c2717ed':
 2015-10-20 00:28:53 +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 Cohen 7e88e90afc am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop 
am: 91c11b28d5

* commit '91c11b28d57c026d507488c58feedebf7fee6f31':
 2015-10-20 00:28:44 +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
Bjorn Bringert 867cd087e3 am 2ed99e86: Build Launcher3 against prebuilt SDK 21 
am: c656245b9c

* commit 'c656245b9cbc370537afb18e7fb38ea87c233fd1':
 2015-10-20 00:28:36 +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
Sunny Goyal 5d36c5b03b am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop 
am: e7599d6943

* commit 'e7599d694313845a41221dfa0d7f6dca3aedd02c':
 2015-10-20 00:28:30 +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
Baligh Uddin eb8ce94244 am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop 
am: ab474588ce  -s ours

* commit 'ab474588ce7d9cddff2b2dc0a2fd91b4ae532e05':
 2015-10-20 00:28:25 +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
Sunny Goyal ffe21b3129 am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons 
am: e43f0d646c

* commit 'e43f0d646c60c6f59333224686725717cdf2ccbc':
 2015-10-20 00:28:19 +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
Sunny Goyal 2f22fa892b am f876301d: UI Fixes 
am: 501414523e

* commit '501414523ef1e3dc394746ea01489a934e826865':
 2015-10-20 00:28:14 +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
Adam Cohen 86b4730bb5 am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop 
am: cb20616a18

* commit 'cb20616a180de2855cc35e6c1ce8dfb8082ea41c':
 2015-10-20 00:28:06 +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
Baligh Uddin bfe4347964 am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop 
am: 6317598a19  -s ours

* commit '6317598a196ada3f32950c7f4a8d5cfe005acf42':
 2015-10-20 00:28:00 +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
Sunny Goyal b84046dacf Scaling down the icon before applying the user badge 
> This also saves memory only create one new bitmap while loading instead of two

Bug: 25027252
Change-Id: Ia594dd65a30f32e99404190f649b334615c9e17f
 2015-10-19 14:05:25 -07:00
Geoff Mendal 531b25c76b Import translations. DO NOT MERGE am: f58538672a -s ours 
am: 705b4abd57  -s ours

* commit '705b4abd5793f2b989bca9c53220ffff3014a6ec':
  Import translations. DO NOT MERGE
 2015-10-19 16:29:23 +00:00
Geoff Mendal 705b4abd57 Import translations. DO NOT MERGE 
am: f58538672a  -s ours

* commit 'f58538672aaeb1d0d00a9c65a773f5e251003c3b':
  Import translations. DO NOT MERGE
 2015-10-19 16:25:53 +00:00
Geoff Mendal f415b0033a Import translations. DO NOT MERGE 
am: 8c23c2d2ba  -s ours

* commit '8c23c2d2ba4b7067afca5a28df2709450d29c5bf':
  Import translations. DO NOT MERGE
 2015-10-19 16:25:53 +00:00
Geoff Mendal a667bb0aa7 Import translations. DO NOT MERGE 
Change-Id: Iab62cd0b92f647d639aea075133a9168dd7ee462
Auto-generated-cl: translation import
 2015-10-19 08:52:02 -07:00
Geoff Mendal 8c23c2d2ba Import translations. DO NOT MERGE 
Change-Id: If930ef94a3abe3e27123d1fe3553b0a3a453ffec
Auto-generated-cl: translation import
 2015-10-19 08:50:56 -07:00
Geoff Mendal f58538672a Import translations. DO NOT MERGE 
Change-Id: Iee53921c75c785c7d73dd375b4e044761a5a7246
Auto-generated-cl: translation import
 2015-10-19 08:49:51 -07:00