Commit Graph

78507 Commits

Author SHA1 Message Date
Adam Skory 9c0a25b58c am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 5cc929caa0 am: 5c597e4aba am: 1dda00996a am: b523cc1e4f am: 622880c0b9 am: 65f484b1fc
am: 7c811ecaaf

* commit '7c811ecaaf91dc102e45d9055e91270d04140c29':
2015-10-20 03:21:23 +00:00
Baligh Uddin 9d06c95c57 keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62 am: ce566c0e93 am: 1c30b578e1 am: 9fa7ca7d65 am: dcc908e147 -s ours
am: af265461f1

* commit 'af265461f1c56e3a7adc42f34032f45b8522722a':
2015-10-20 03:21:19 +00:00
Baligh Uddin 90022fd4c9 Import translations. DO NOT MERGE am: 2c29ac6eb5 -s ours am: b58e5fbc57 -s ours am: 2aa01afb35 -s ours am: 25c42a0937 -s ours am: a34c8cc2ba -s ours
am: 446b98f4e4  -s ours

* commit '446b98f4e451813247a4b4d8aac690ee936c634d':
  Import translations. DO NOT MERGE
2015-10-20 03:19:50 +00:00
Baligh Uddin 4c6f47c15e am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am: 35424cc2a6 -s ours am: 8a901a6133 -s ours am: 6cf8795a68 -s ours am: 2d714406cd -s ours am: ed94b5520d -s ours
am: 3e1c84ad8c  -s ours

* commit '3e1c84ad8cecb69a3b417eced3ae6fbe219cc520':
  Import translations. DO NOT MERGE
2015-10-20 03:19:47 +00:00
Baligh Uddin 83e41764c1 Import translations. DO NOT MERGE am: c81b0617a6 -s ours am: 431d174f26 -s ours am: 8eef658cf9 -s ours am: 1e6e698881 -s ours am: cfb6dac38f -s ours
am: 5168f039b3  -s ours

* commit '5168f039b3befcbf9fcd2f5b0ed316af10fb5acb':
  Import translations. DO NOT MERGE
2015-10-20 03:19:44 +00:00
Baligh Uddin 1e52e4df04 Import translations. DO NOT MERGE am: 81403969d1 -s ours am: bbe424e584 -s ours am: 5b53a47d02 -s ours am: 9b7386403a -s ours am: 994502244e -s ours
am: 2573cb9c33  -s ours

* commit '2573cb9c33f4a1009635baec48cc3ddf4b42df09':
  Import translations. DO NOT MERGE
2015-10-20 03:19:41 +00:00
Baligh Uddin 7cdd35ca3c Import translations. DO NOT MERGE am: 01614d6ba5 -s ours am: 8454595cf3 -s ours am: 3f3f0fbc02 -s ours am: 2693dd2cd9 -s ours am: 1edcac1745 -s ours
am: dc4f328c4d  -s ours

* commit 'dc4f328c4d90a36287c5b4f3137ead7e5d0efee7':
  Import translations. DO NOT MERGE
2015-10-20 03:19:38 +00:00
Baligh Uddin 9c2588976f Import translations. DO NOT MERGE am: c4d66cf035 -s ours am: 3209b2bc4d -s ours am: 69830841ec -s ours am: 4baaf3241f -s ours am: 5148e0d456 -s ours
am: 21abe0d9f7  -s ours

* commit '21abe0d9f7f65cb45e87845cb8e6b84c1260b7ea':
  Import translations. DO NOT MERGE
2015-10-20 03:19:35 +00:00
Baligh Uddin cf067a9a44 am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf am: 38bd557502 am: 0442deaee7 am: 5793b647fd
am: f351d2d274

* commit 'f351d2d274ec47bff368fa91b157739c399cda5d':
2015-10-20 03:19:32 +00:00
Huy Nguyen 94fd0e00d1 am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 149268d869 am: 70aa099f23 am: eadf9b6782 am: 24483f0498 am: a107ef6e13
am: f7f8df9f7c

* commit 'f7f8df9f7c11210c412c07106032c25618911746':
2015-10-20 03:19:28 +00:00
Mark Ashdown 26e7cd5b94 am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: b1a081221e am: 1bd8f7e460 am: 7661d33379 am: 7e5ec74df0 am: 84138b1523
am: e90e2b89bb

* commit 'e90e2b89bb19f8eff4a878816c4501094bb18048':
2015-10-20 03:19:25 +00:00
Huy Nguyen bbf5c27346 am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d am: 27b99c86e9 am: 078afac399 am: 94b7ee378f am: 6b7a1631f6
am: 753cf130b9

* commit '753cf130b9e1e1b840a4aead09a00f31011bb55f':
2015-10-20 03:19:22 +00:00
Mark Ashdown daf82e6d8c am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 64b83ce632 am: 346da07c80 am: 78a44d4726 am: 8abc959461 am: 6060c10580
am: 9d494757cf

* commit '9d494757cfb8b7ecc9766425d787661857506bb2':
2015-10-20 03:19:19 +00:00
Mathew Inwood e147ed8705 am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1d8 am: 7748c94d25 am: 4396cc1fff am: a267cb6dde am: f289060a04
am: 3b678d2e58

* commit '3b678d2e58d57e05bcb1d6c9213dadcffec1a181':
2015-10-20 03:19:16 +00:00
Juan Silveira f5e5e1270d am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6adda am: 3f39cc45d8 am: 6120e6096a am: d9ba2b56db am: 8dc63a93c6
am: b897ea777e

* commit 'b897ea777eb4b889122a5f2f9604f36ef6ee182f':
2015-10-20 03:19:13 +00:00
Anton Hansson 5c02e22455 am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568 am: cb168d34ae am: 616facd74b am: 4c5dbc52b3 am: ed0c3623a9
am: bf4e852f95

* commit 'bf4e852f95d430bcea11e903337ddae07c013572':
2015-10-20 03:19:10 +00:00
Adam Skory 7c811ecaaf am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 5cc929caa0 am: 5c597e4aba am: 1dda00996a am: b523cc1e4f am: 622880c0b9
am: 65f484b1fc

* commit '65f484b1fc2c0a7b41478fabf5a0321443df7ab8':
2015-10-20 03:19:06 +00:00
Baligh Uddin af265461f1 keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62 am: ce566c0e93 am: 1c30b578e1 am: 9fa7ca7d65
am: dcc908e147  -s ours

* commit 'dcc908e147853cf5e0552bcf387c22616f89fe16':
2015-10-20 03:19:03 +00:00
Huy Nguyen b406a581e6 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1 am: a59ef0ba69 am: 8acd2748b2 am: 52599958f4 am: 1c13c13722 am: d848ca4869 am: 4cb42d165f am: aa27d4ebde am: 96e7b9c759
am: 7c1c0fcdca

* commit '7c1c0fcdcabb747c7b16e1592242e03e5f27e155':
2015-10-20 03:07:36 +00:00
Mark Ashdown 87ca2c2317 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc37722e am: b7b834bde1 am: ca2bafc86f am: 9774281221 am: 6df4bd8b7f am: 7f4c5f364f am: 22c5b7f57d am: 128ffad040 am: b1f7d716f6
am: 7ef659884d

* commit '7ef659884d3152b1b499fe4c4ed4e847bc949e8c':
2015-10-20 03:07:32 +00:00
Huy Nguyen 3e37b94e86 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16 am: 2feee6dec2 am: ab3847b8b3 am: 0cce0579a3 am: 8c9ef49ae5 am: cbdc96152e am: 1115f891dd am: e1ac2ece02 am: 856f970b80
am: 94d220ca6a

* commit '94d220ca6a5012dcb18e5cee8de0f12d80b99efe':
2015-10-20 03:07:29 +00:00
Mark Ashdown 6af83d1c4c Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f33481f am: 68c0bedde8 am: 59329359e7 am: daf2da93f6 am: 4cad8c7747 am: 1df97e4e4b am: f616a8e2d1 am: 5175506151 am: 3e5bae9519
am: 338bcd2bf1

* commit '338bcd2bf152b38d6235d373fd4560210d6a7adc':
2015-10-20 03:07:26 +00:00
Mathew Inwood f82ff953b0 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7c1 am: 52cced3ede am: 9cd759a5e1 am: a9d4118ab3 am: 8020ebf7bc am: df112558f3 am: d2688e3c3a am: f051b6136b am: e1aa8a0a91
am: d8f4de51e2

* commit 'd8f4de51e2859b3ec139a97ecf3fd1352a027558':
2015-10-20 03:07:22 +00:00
Juan Silveira b4d431652b Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c am: b6973a57c3 am: a379acb1cb am: 28c9e80cc0 am: abe2da3ed1 am: 67e3373948 am: 8d9f5baea1 am: 608f1ee85e am: ff6bb00bf5
am: eb2a652497

* commit 'eb2a652497979bb66680b79f2befada82ca0366d':
2015-10-20 03:07:18 +00:00
Anton Hansson bdc9386e11 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c4274 am: 216a53f0b1 am: aeb301c7e5 am: 817bbecd42 am: 14861fae4d am: 59fcb9ce40 am: f882fb27b7 am: c314292efc am: c009ae9374
am: 6c1651728c

* commit '6c1651728c0191d64b745aec18605b140e5c8b3c':
2015-10-20 03:07:15 +00:00
Adam Skory 0f93780b43 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b96e am: 61172868fd am: 157e6c57d6 am: d078023bce am: 5b55c46e01 am: 186a1a7060 am: d566d24f65 am: b0436f294f am: dfa6fd246a
am: eb243d0c8f

* commit 'eb243d0c8f2f28d698d97424ee1b729e74be537c':
2015-10-20 03:07:11 +00:00
Adam Skory 7a6c3a7737 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c95 am: d072686669 am: f351edd651 am: 49bc959e07 am: 9c3d1aee2f am: 319c9ac41f am: 1497b879e4 am: 02173b0c65 am: 5af66c53bf
am: 97567d6a48

* commit '97567d6a48f6c246ef1977fa933f759de7e5b47f':
2015-10-20 03:07:07 +00:00
Adam Skory 07c3f75892 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d am: f8f29b43ff am: 92557c9596 am: a324418ece am: 8194e08397 am: f41815802e am: 6dc5663ab3 am: f5437de749 am: 3519549f36
am: 95fb7b3ca5

* commit '95fb7b3ca580318ed3535c1baf85cc78d5f55815':
2015-10-20 03:07:03 +00:00
Adam Cohen 33d9880d57 am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am: e7afa51bd8 am: 6d0a93207e am: a5eae84cbf am: e4eadaaf37 am: 58de3e8c64 am: b161e4e46e am: 1f7673be44 am: 170e9f8c7d
am: b36b22b4b8

* commit 'b36b22b4b8d61302ec63f7a0d25622319879ca31':
2015-10-20 03:06:33 +00:00
Adam Cohen 7868a650c7 am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop am: 84a79949a4 am: 313c1de1cc am: 20053bc691 am: f9c3e8a6ae am: cd4afe29cb am: 2e1d9295f5 am: 855f74e976 am: 0f4d6d894c
am: be90136432

* commit 'be90136432c6996ab19681367a3ee1b5b8d55db5':
2015-10-20 03:06:30 +00:00
Sunny Goyal 355edead8e am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created am: fdbfba88d4 -s ours am: 852a96562a am: 153ccdf5ee am: dea24897a3 -s ours am: 11164db134 am: a6e267f851 am: 8712269056 am: ab9c3f9291
am: 524f13402b  -s ours

* commit '524f13402b504183ed25d64b1c1a6861958b2a4f':
2015-10-20 03:06:27 +00:00
Ian Parkinson 723a9907c8 am 0c2918f4: Use View.generateViewId if available am: 3d78b80ecd am: 8374915b27 am: ceb823f9ec am: 35a3ca532b am: 0317b768f6 am: 1f177aee96 am: 0af053b667 am: c7f40c9394
am: d7657922f8

* commit 'd7657922f8112d203d28ee5dc0d418316100ddd2':
2015-10-20 03:06:24 +00:00
Adam Cohen a9a043f08f am 4b8d11fc: Add missing xxhdpi asset am: 49e2f10ee2 am: a42854b9b4 am: 53e87e86c2 am: 11174f43bd am: 254e7b0a72 am: 7ad63c2b1e am: 75d44b69c2 am: 7c5b24f93a
am: 89cfdf376b

* commit '89cfdf376bfe7b1e994856b49c887d9652c928a6':
2015-10-20 03:06:21 +00:00
Kenny Guy 5a7e87f6fd am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am: 5f2a520f0c am: 689cb6366b am: e431703711 am: 0fa7200b5a am: afc9a931cb am: 37ad5ed201 am: 652b89c123 am: b95849feef
am: 119351ec52

* commit '119351ec52c14d78bd96ade384f7ed974e5cf1e9':
2015-10-20 03:06:18 +00:00
Adam Cohen b1a92a811c am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop am: 91c11b28d5 am: 7e88e90afc am: b75de587c5 am: 29a81daa0d am: d077b9d137 am: 9a4f2f42c9 am: b05dcc69ad am: 1c38f7e1d3
am: 7eff21047d

* commit '7eff21047dd663d6322d0c65a3e3ed453dfd54a4':
2015-10-20 03:06:14 +00:00
Bjorn Bringert 190e461035 am 2ed99e86: Build Launcher3 against prebuilt SDK 21 am: c656245b9c am: 867cd087e3 am: 5a7f0e0527 am: 326e88800d am: bd92113aa4 am: 6a8773d116 am: 836d372b84 am: c46a3e64c5
am: 0c968f4f8a

* commit '0c968f4f8a8fe2e7d4aea00046512d8399ea3b01':
2015-10-20 03:06:11 +00:00
Sunny Goyal 3d63ae4d2b am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop am: e7599d6943 am: 5d36c5b03b am: ab1bfbf928 am: b1250ad81d am: dcb93ff314 am: 152a252bcb am: 3f61431dab am: ede1afb55b
am: 71642109fd

* commit '71642109fd761daf507b7303e5c34475920036e0':
2015-10-20 03:06:08 +00:00
Baligh Uddin e0497966ec am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: ab474588ce -s ours am: eb8ce94244 -s ours am: 56985a1867 -s ours am: a03da71ae3 -s ours am: 8c0efbe340 -s ours am: 04e030ea81 -s ours am: 00d2190a26 -s ours am: 6f7a528b43 -s ours
am: f843147265  -s ours

* commit 'f8431472655117f98124556640142b50f5cb7857':
2015-10-20 03:06:05 +00:00
Sunny Goyal 091153b7a2 am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons am: e43f0d646c am: ffe21b3129 am: f321db6800 am: d090146ad8 am: d5f0973229 am: fd58ec9eff am: 58e3869dbf am: 30c6512973
am: 20367a4a6d

* commit '20367a4a6d6927b907d1f0bdc63c273c49733e90':
2015-10-20 03:06:01 +00:00
Sunny Goyal b8981e5a16 am f876301d: UI Fixes am: 501414523e am: 2f22fa892b am: 718278e9f4 am: 2550c9f472 am: 9e095af394 am: 40811df9d4 am: 4e10620cad am: a46379919d
am: 7c042792b3

* commit '7c042792b30e820fafdba53556c461a9b6e5d89c':
2015-10-20 03:05:57 +00:00
Adam Cohen 52f5cca74f 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 am: 86b4730bb5 am: 278d4d2d5a am: 9975db3a5e am: 48431f52c2 am: 99ee66568b am: bc4aed2eec am: e35bcf5d81
am: b3d6e58260

* commit 'b3d6e58260c3468d3503a880d5ce4be7fe1f774b':
2015-10-20 03:05:54 +00:00
Baligh Uddin 9d3071e2e4 am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: 6317598a19 -s ours am: bfe4347964 -s ours am: 669ef65afb -s ours am: 03937ac5d7 -s ours am: 909bcceeb4 -s ours am: 522d4ac6fe -s ours am: 3eaeafbebf -s ours am: af6b00a8a0 -s ours
am: e7a344a5bd  -s ours

* commit 'e7a344a5bd6f2c04f39683849d905c88676e25b0':
2015-10-20 03:05:51 +00:00
Huy Nguyen 7c1c0fcdca Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1 am: a59ef0ba69 am: 8acd2748b2 am: 52599958f4 am: 1c13c13722 am: d848ca4869 am: 4cb42d165f am: aa27d4ebde
am: 96e7b9c759

* commit '96e7b9c7594c97fe5d4a698b435d6ec9ea57dbdb':
2015-10-20 03:02:11 +00:00
Mark Ashdown 7ef659884d Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc37722e am: b7b834bde1 am: ca2bafc86f am: 9774281221 am: 6df4bd8b7f am: 7f4c5f364f am: 22c5b7f57d am: 128ffad040
am: b1f7d716f6

* commit 'b1f7d716f69fb2eab670ffdb2ae74c5818e4d536':
2015-10-20 03:02:07 +00:00
Huy Nguyen 94d220ca6a Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16 am: 2feee6dec2 am: ab3847b8b3 am: 0cce0579a3 am: 8c9ef49ae5 am: cbdc96152e am: 1115f891dd am: e1ac2ece02
am: 856f970b80

* commit '856f970b80196bfacad5d3bd878645f79a97fad4':
2015-10-20 03:02:04 +00:00
Mark Ashdown 338bcd2bf1 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f33481f am: 68c0bedde8 am: 59329359e7 am: daf2da93f6 am: 4cad8c7747 am: 1df97e4e4b am: f616a8e2d1 am: 5175506151
am: 3e5bae9519

* commit '3e5bae9519d4e9312ff7a4561a1ab47b7623376f':
2015-10-20 03:02:00 +00:00
Mathew Inwood d8f4de51e2 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7c1 am: 52cced3ede am: 9cd759a5e1 am: a9d4118ab3 am: 8020ebf7bc am: df112558f3 am: d2688e3c3a am: f051b6136b
am: e1aa8a0a91

* commit 'e1aa8a0a91b1981e3e1bee74c0aadc75a0491dfb':
2015-10-20 03:01:56 +00:00
Juan Silveira eb2a652497 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c am: b6973a57c3 am: a379acb1cb am: 28c9e80cc0 am: abe2da3ed1 am: 67e3373948 am: 8d9f5baea1 am: 608f1ee85e
am: ff6bb00bf5

* commit 'ff6bb00bf57440dccf16529dd8b0efe0f97d0edf':
2015-10-20 03:01:52 +00:00
Anton Hansson 6c1651728c Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c4274 am: 216a53f0b1 am: aeb301c7e5 am: 817bbecd42 am: 14861fae4d am: 59fcb9ce40 am: f882fb27b7 am: c314292efc
am: c009ae9374

* commit 'c009ae93749d80797cb256149c1a275c6fcac369':
2015-10-20 03:01:48 +00:00
Adam Skory eb243d0c8f Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b96e am: 61172868fd am: 157e6c57d6 am: d078023bce am: 5b55c46e01 am: 186a1a7060 am: d566d24f65 am: b0436f294f
am: dfa6fd246a

* commit 'dfa6fd246aeb0430729c69dd1689b6c014950f0c':
2015-10-20 03:01:45 +00:00