 Adam Skory
|
983daa1abc
|
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
am: 9c0a25b58c
* commit '9c0a25b58c0f1f620d57ecae170e5fb5e442fb41':
|
2015-10-20 03:23:26 +00:00 |
|
 Baligh Uddin
|
292c2f7174
|
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
am: 9d06c95c57
* commit '9d06c95c575248043e64821568a30131926f18b1':
|
2015-10-20 03:23:19 +00:00 |
|
|
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 |
|
|
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
|
96e7b9c759
|
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
* commit 'aa27d4ebde868c000b336df8066ca791fbb1cd75':
|
2015-10-20 02:24:16 +00:00 |
|
 Mark Ashdown
|
b1f7d716f6
|
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
* commit '128ffad040cec0beb965ec1392d8e556c8fbad23':
|
2015-10-20 02:24:13 +00:00 |
|
|
Huy Nguyen
|
856f970b80
|
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
* commit 'e1ac2ece027431e995b44d379cd03f636c95fb9c':
|
2015-10-20 02:24:09 +00:00 |
|
|
Mark Ashdown
|
3e5bae9519
|
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
* commit '5175506151c4b21798336120b84ef60b136091a1':
|
2015-10-20 02:24:04 +00:00 |
|
 Mathew Inwood
|
e1aa8a0a91
|
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
* commit 'f051b6136bc930609ef5053d24191f3b3f2b509b':
|
2015-10-20 02:23:58 +00:00 |
|
 Juan Silveira
|
ff6bb00bf5
|
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
* commit '608f1ee85e8b80710b3c60119480dd1241eed9a9':
|
2015-10-20 02:23:54 +00:00 |
|
 Anton Hansson
|
c009ae9374
|
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
* commit 'c314292efc6a0561af311dbbde90a24129c3d605':
|
2015-10-20 02:23:48 +00:00 |
|
|
Adam Skory
|
dfa6fd246a
|
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
* commit 'b0436f294f98545b3256dcbd15e5907539ee4cd9':
|
2015-10-20 02:23:42 +00:00 |
|
|
Adam Skory
|
5af66c53bf
|
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
* commit '02173b0c652488da5905c852f8b7870a5b2d5843':
|
2015-10-20 02:23:37 +00:00 |
|
|
Adam Skory
|
3519549f36
|
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
* commit 'f5437de7499125fde5cd318d3000e7d53802eb79':
|
2015-10-20 02:23:31 +00:00 |
|
 Adam Cohen
|
1f7673be44
|
am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am: e7afa51bd8 am: 6d0a93207e am: a5eae84cbf am: e4eadaaf37 am: 58de3e8c64
am: b161e4e46e
* commit 'b161e4e46eea6e458f5cb2e1801063b153f5ad8b':
|
2015-10-20 02:06:36 +00:00 |
|
|
Adam Cohen
|
855f74e976
|
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
* commit '2e1d9295f5953f5bed9c641f3f2ea25eb698f003':
|
2015-10-20 02:06:32 +00:00 |
|
 Sunny Goyal
|
8712269056
|
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
* commit 'a6e267f851a84919c655ca5084e7e673f5eb0ac0':
|
2015-10-20 02:06:29 +00:00 |
|
 Ian Parkinson
|
0af053b667
|
am 0c2918f4: Use View.generateViewId if available am: 3d78b80ecd am: 8374915b27 am: ceb823f9ec am: 35a3ca532b am: 0317b768f6
am: 1f177aee96
* commit '1f177aee96763dbd08f25c7af1bd9c0049299593':
|
2015-10-20 02:06:26 +00:00 |
|
|
Adam Cohen
|
75d44b69c2
|
am 4b8d11fc: Add missing xxhdpi asset am: 49e2f10ee2 am: a42854b9b4 am: 53e87e86c2 am: 11174f43bd am: 254e7b0a72
am: 7ad63c2b1e
* commit '7ad63c2b1e356ca659ab62e4d9c39298ccbf593a':
|
2015-10-20 02:06:22 +00:00 |
|
 Kenny Guy
|
652b89c123
|
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
* commit '37ad5ed201a3b5e6caa9933be3702adf4b877150':
|
2015-10-20 02:06:18 +00:00 |
|
|
Adam Cohen
|
b05dcc69ad
|
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
* commit '9a4f2f42c9a6518002547fff05109c9d8b110a6f':
|
2015-10-20 02:06:14 +00:00 |
|
 Bjorn Bringert
|
836d372b84
|
am 2ed99e86: Build Launcher3 against prebuilt SDK 21 am: c656245b9c am: 867cd087e3 am: 5a7f0e0527 am: 326e88800d am: bd92113aa4
am: 6a8773d116
* commit '6a8773d116a88b3ecc8ee97de5934635b4b0b7c7':
|
2015-10-20 02:06:10 +00:00 |
|
|
Sunny Goyal
|
3f61431dab
|
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
* commit '152a252bcb810910171065e9e26e6047382b0839':
|
2015-10-20 02:06:04 +00:00 |
|
|
Huy Nguyen
|
aa27d4ebde
|
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
* commit '4cb42d165f221403fa377e70dbe83ac7dabb3bfa':
|
2015-10-20 02:06:02 +00:00 |
|
|
Mark Ashdown
|
128ffad040
|
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
* commit '22c5b7f57d64cdcc38682cb1605a42faa6e1f104':
|
2015-10-20 02:05:57 +00:00 |
|
|
Baligh Uddin
|
00d2190a26
|
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
* commit '04e030ea81ad4beb16e93e02aa71049387645741':
|
2015-10-20 02:05:57 +00:00 |
|
|
Sunny Goyal
|
58e3869dbf
|
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
* commit 'fd58ec9eff0481782d1f4d1611a5cc4bc1ddabe6':
|
2015-10-20 02:05:52 +00:00 |
|
|
Huy Nguyen
|
e1ac2ece02
|
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
* commit '1115f891dd6fe65078c50ef9c6ac9b1ce415d082':
|
2015-10-20 02:05:50 +00:00 |
|
|
Mark Ashdown
|
5175506151
|
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
* commit 'f616a8e2d14fa05ccc5c6e73ca57e9f454b7fd92':
|
2015-10-20 02:05:46 +00:00 |
|
|
Sunny Goyal
|
4e10620cad
|
am f876301d: UI Fixes am: 501414523e am: 2f22fa892b am: 718278e9f4 am: 2550c9f472 am: 9e095af394
am: 40811df9d4
* commit '40811df9d4da51c73b97ac0dbb439aefae2fa09e':
|
2015-10-20 02:05:46 +00:00 |
|
|
Adam Cohen
|
bc4aed2eec
|
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
* commit '99ee66568bb94e2d4f4392101a1a9eb32c086c83':
|
2015-10-20 02:05:41 +00:00 |
|
|
Mathew Inwood
|
f051b6136b
|
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
* commit 'd2688e3c3aaadc96e99f6b1c935140f1821818e0':
|
2015-10-20 02:05:40 +00:00 |
|
|
Baligh Uddin
|
3eaeafbebf
|
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
* commit '522d4ac6fe7e174b24e01fa7764ca7cfba2c2f12':
|
2015-10-20 02:05:28 +00:00 |
|
|
Juan Silveira
|
608f1ee85e
|
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
* commit '8d9f5baea199ac79746d1467a5838b8a21dc040d':
|
2015-10-20 02:05:26 +00:00 |
|
|
Anton Hansson
|
c314292efc
|
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
* commit 'f882fb27b75fbfe76cb2321d0706f5aae28c828b':
|
2015-10-20 02:05:23 +00:00 |
|
|
Adam Skory
|
b0436f294f
|
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
* commit 'd566d24f650d44765c47ac7db86532bace621181':
|
2015-10-20 02:05:19 +00:00 |
|
|
Adam Skory
|
02173b0c65
|
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
* commit '1497b879e4cc9845a1a424fa51a89f7cbdfe1a5a':
|
2015-10-20 02:05:15 +00:00 |
|
|
Adam Skory
|
f5437de749
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d am: f8f29b43ff am: 92557c9596 am: a324418ece am: 8194e08397 am: f41815802e
am: 6dc5663ab3
* commit '6dc5663ab3df6633278a04e9a4a23447b896062b':
|
2015-10-20 02:05:09 +00:00 |
|
|
Adam Cohen
|
b161e4e46e
|
am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am: e7afa51bd8 am: 6d0a93207e am: a5eae84cbf am: e4eadaaf37
am: 58de3e8c64
* commit '58de3e8c64c7f102c1c940b75f71ee5ab8071177':
|
2015-10-20 01:49:54 +00:00 |
|
|
Adam Cohen
|
2e1d9295f5
|
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
* commit 'cd4afe29cb500d53c1fe77f93def97b2f11e0205':
|
2015-10-20 01:49:49 +00:00 |
|
|
Sunny Goyal
|
a6e267f851
|
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
* commit '11164db134012c57d41f58b7a88544b50f5c1729':
|
2015-10-20 01:49:46 +00:00 |
|
|
Ian Parkinson
|
1f177aee96
|
am 0c2918f4: Use View.generateViewId if available am: 3d78b80ecd am: 8374915b27 am: ceb823f9ec am: 35a3ca532b
am: 0317b768f6
* commit '0317b768f6adf7c3b6bf5bd969fe8af62177957a':
|
2015-10-20 01:49:43 +00:00 |
|
|
Adam Cohen
|
7ad63c2b1e
|
am 4b8d11fc: Add missing xxhdpi asset am: 49e2f10ee2 am: a42854b9b4 am: 53e87e86c2 am: 11174f43bd
am: 254e7b0a72
* commit '254e7b0a725ed655a0be25a63823b55b704d7579':
|
2015-10-20 01:49:39 +00:00 |
|
|
Kenny Guy
|
37ad5ed201
|
am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am: 5f2a520f0c am: 689cb6366b am: e431703711 am: 0fa7200b5a
am: afc9a931cb
* commit 'afc9a931cbabf849d79d55cc6bcd4dda6e728821':
|
2015-10-20 01:49:36 +00:00 |
|
|
Huy Nguyen
|
4cb42d165f
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1 am: a59ef0ba69 am: 8acd2748b2 am: 52599958f4 am: 1c13c13722
am: d848ca4869
* commit 'd848ca4869b4f0ae1ddc0ee7abe00984d6162cc1':
|
2015-10-20 01:49:32 +00:00 |
|
|
Adam Cohen
|
9a4f2f42c9
|
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
* commit 'd077b9d13700e9ce2271cb557b8788185ad2bbe9':
|
2015-10-20 01:49:31 +00:00 |
|
|
Bjorn Bringert
|
6a8773d116
|
am 2ed99e86: Build Launcher3 against prebuilt SDK 21 am: c656245b9c am: 867cd087e3 am: 5a7f0e0527 am: 326e88800d
am: bd92113aa4
* commit 'bd92113aa4b4f39c1e958985bdc5fe5b0ce3c254':
|
2015-10-20 01:49:27 +00:00 |
|
|
Mark Ashdown
|
22c5b7f57d
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc37722e am: b7b834bde1 am: ca2bafc86f am: 9774281221 am: 6df4bd8b7f
am: 7f4c5f364f
* commit '7f4c5f364fcc1a375688c9906b53786208785006':
|
2015-10-20 01:49:27 +00:00 |
|