 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 |
|
|
Sunny Goyal
|
152a252bcb
|
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
* commit 'dcb93ff314b957e371ba0cc8822486e840850956':
|
2015-10-20 01:49:22 +00:00 |
|
|
Huy Nguyen
|
1115f891dd
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16 am: 2feee6dec2 am: ab3847b8b3 am: 0cce0579a3 am: 8c9ef49ae5
am: cbdc96152e
* commit 'cbdc96152e0ebc390732320a54bc3e25f37d1076':
|
2015-10-20 01:49:22 +00:00 |
|
|
Baligh Uddin
|
04e030ea81
|
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
* commit '8c0efbe340110eef9b0b3d4fcd471bcc053f1ef9':
|
2015-10-20 01:49:17 +00:00 |
|
|
Mark Ashdown
|
f616a8e2d1
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f33481f am: 68c0bedde8 am: 59329359e7 am: daf2da93f6 am: 4cad8c7747
am: 1df97e4e4b
* commit '1df97e4e4b2cd1ca83f125131bf59eddc1008bb7':
|
2015-10-20 01:49:17 +00:00 |
|
|
Sunny Goyal
|
fd58ec9eff
|
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
* commit 'd5f09732299961917af57c4c1836d74e3f9ec2be':
|
2015-10-20 01:49:12 +00:00 |
|
|
Mathew Inwood
|
d2688e3c3a
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7c1 am: 52cced3ede am: 9cd759a5e1 am: a9d4118ab3 am: 8020ebf7bc
am: df112558f3
* commit 'df112558f378326e6ee7a8f49473384b30c6b10e':
|
2015-10-20 01:49:12 +00:00 |
|
|
Sunny Goyal
|
40811df9d4
|
am f876301d: UI Fixes am: 501414523e am: 2f22fa892b am: 718278e9f4 am: 2550c9f472
am: 9e095af394
* commit '9e095af39498d14298fcaa3e11c8c303d0863541':
|
2015-10-20 01:49:07 +00:00 |
|
|
Juan Silveira
|
8d9f5baea1
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c am: b6973a57c3 am: a379acb1cb am: 28c9e80cc0 am: abe2da3ed1
am: 67e3373948
* commit '67e3373948a94b360febb62a068e128703e30450':
|
2015-10-20 01:49:07 +00:00 |
|
|
Adam Cohen
|
99ee66568b
|
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
* commit '48431f52c238c8a987d905546d265d1ac88e2cce':
|
2015-10-20 01:49:02 +00:00 |
|
|
Anton Hansson
|
f882fb27b7
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c4274 am: 216a53f0b1 am: aeb301c7e5 am: 817bbecd42 am: 14861fae4d
am: 59fcb9ce40
* commit '59fcb9ce402c1bb5c9e833fec8c63e37047ab8da':
|
2015-10-20 01:49:01 +00:00 |
|
|
Baligh Uddin
|
522d4ac6fe
|
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
* commit '909bcceeb449284823d8fdbe4556f89b96577d75':
|
2015-10-20 01:48:55 +00:00 |
|
|
Adam Skory
|
d566d24f65
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b96e am: 61172868fd am: 157e6c57d6 am: d078023bce am: 5b55c46e01
am: 186a1a7060
* commit '186a1a7060308a383cd123fbdcd763d49587d99c':
|
2015-10-20 01:48:55 +00:00 |
|
|
Adam Skory
|
1497b879e4
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c95 am: d072686669 am: f351edd651 am: 49bc959e07 am: 9c3d1aee2f
am: 319c9ac41f
* commit '319c9ac41fb545e6ca7f81b6d1d8fe22b9554e15':
|
2015-10-20 01:48:50 +00:00 |
|
|
Adam Skory
|
6dc5663ab3
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d am: f8f29b43ff am: 92557c9596 am: a324418ece am: 8194e08397
am: f41815802e
* commit 'f41815802ef91385c7c4c345e687956fa3e6f3c1':
|
2015-10-20 01:48:43 +00:00 |
|
|
Baligh Uddin
|
446b98f4e4
|
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
* commit 'a34c8cc2ba2f8bf33ff80509dc487b9b475d5e9d':
Import translations. DO NOT MERGE
|
2015-10-20 01:31:54 +00:00 |
|
|
Baligh Uddin
|
3e1c84ad8c
|
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
* commit 'ed94b5520deed39c1d55f22d1281fb56433a3d28':
Import translations. DO NOT MERGE
|
2015-10-20 01:31:51 +00:00 |
|
|
Baligh Uddin
|
5168f039b3
|
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
* commit 'cfb6dac38f28f3a4519727ad63d35a3e9c75f1b0':
Import translations. DO NOT MERGE
|
2015-10-20 01:31:48 +00:00 |
|
|
Baligh Uddin
|
2573cb9c33
|
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
* commit '994502244e98d5ea7b5f59cad17db5736b54751b':
Import translations. DO NOT MERGE
|
2015-10-20 01:31:45 +00:00 |
|
|
Baligh Uddin
|
dc4f328c4d
|
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
* commit '1edcac1745cc34c1946a70ed8b64d33d4dd9b4bd':
Import translations. DO NOT MERGE
|
2015-10-20 01:31:42 +00:00 |
|
|
Baligh Uddin
|
21abe0d9f7
|
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
* commit '5148e0d456c3e33720b1ff9b8332ba1d2e371a3f':
Import translations. DO NOT MERGE
|
2015-10-20 01:31:39 +00:00 |
|
|
Baligh Uddin
|
f351d2d274
|
am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf am: 38bd557502 am: 0442deaee7
am: 5793b647fd
* commit '5793b647fd5a187a3e0e4257fb23b6cb611fd14c':
|
2015-10-20 01:31:37 +00:00 |
|
|
Huy Nguyen
|
f7f8df9f7c
|
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
* commit 'a107ef6e13b142d1eaffe879aa31d76292e357c3':
|
2015-10-20 01:31:34 +00:00 |
|
|
Mark Ashdown
|
e90e2b89bb
|
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
* commit '84138b152312dcdcfa387a797dbc7eca3bee7d6f':
|
2015-10-20 01:31:30 +00:00 |
|
|
Huy Nguyen
|
753cf130b9
|
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
* commit '6b7a1631f65318c70ec77c54d1acd532af19711d':
|
2015-10-20 01:31:27 +00:00 |
|
|
Mark Ashdown
|
9d494757cf
|
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
* commit '6060c10580453fcc74b6e6c49c3eccb16f3c46cc':
|
2015-10-20 01:31:23 +00:00 |
|
|
Adam Cohen
|
58de3e8c64
|
am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am: e7afa51bd8 am: 6d0a93207e am: a5eae84cbf
am: e4eadaaf37
* commit 'e4eadaaf3744e12221b459524c457046af678588':
|
2015-10-20 01:31:21 +00:00 |
|