 Adam Skory
|
97567d6a48
|
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
* commit '5af66c53bf800684b41cd7cf6c6eab6566ee46e9':
|
2015-10-20 03:01:41 +00:00 |
|
|
Adam Skory
|
95fb7b3ca5
|
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
* commit '3519549f36985b84ccf4e2b5ec41879c89f4d058':
|
2015-10-20 03:01:37 +00:00 |
|
 Adam Cohen
|
b36b22b4b8
|
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
* commit '170e9f8c7d9ea68d0aae05eb33e0faa79bceb60e':
|
2015-10-20 03:01:06 +00:00 |
|
|
Adam Cohen
|
be90136432
|
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
* commit '0f4d6d894c41eeeec3af04e2cc6443fe9d618438':
|
2015-10-20 03:01:02 +00:00 |
|
 Sunny Goyal
|
524f13402b
|
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
* commit 'ab9c3f929134bdf39ebc132979491330c5aa2163':
|
2015-10-20 03:00:59 +00:00 |
|
 Ian Parkinson
|
d7657922f8
|
am 0c2918f4: Use View.generateViewId if available am: 3d78b80ecd am: 8374915b27 am: ceb823f9ec am: 35a3ca532b am: 0317b768f6 am: 1f177aee96 am: 0af053b667
am: c7f40c9394
* commit 'c7f40c93944d3b2a81f5ea5164e551e7d0f53dfd':
|
2015-10-20 03:00:55 +00:00 |
|
|
Adam Cohen
|
89cfdf376b
|
am 4b8d11fc: Add missing xxhdpi asset am: 49e2f10ee2 am: a42854b9b4 am: 53e87e86c2 am: 11174f43bd am: 254e7b0a72 am: 7ad63c2b1e am: 75d44b69c2
am: 7c5b24f93a
* commit '7c5b24f93a44fb7e35e26143911158c6445bc6e6':
|
2015-10-20 03:00:52 +00:00 |
|
 Kenny Guy
|
119351ec52
|
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
* commit 'b95849feefab6e8fa40bbd56f522ed5de4184707':
|
2015-10-20 03:00:47 +00:00 |
|
|
Adam Cohen
|
7eff21047d
|
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
* commit '1c38f7e1d3a18b6c5ac84f9600a3db9667f34591':
|
2015-10-20 03:00:42 +00:00 |
|
 Bjorn Bringert
|
0c968f4f8a
|
am 2ed99e86: Build Launcher3 against prebuilt SDK 21 am: c656245b9c am: 867cd087e3 am: 5a7f0e0527 am: 326e88800d am: bd92113aa4 am: 6a8773d116 am: 836d372b84
am: c46a3e64c5
* commit 'c46a3e64c533ce61e44f7d8ac0e44cbfd0baab6a':
|
2015-10-20 03:00:39 +00:00 |
|
|
Sunny Goyal
|
71642109fd
|
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
* commit 'ede1afb55b187d602d46fb835acd9c17ecc60bd6':
|
2015-10-20 03:00:36 +00:00 |
|
 Baligh Uddin
|
f843147265
|
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
* commit '6f7a528b43a3e5b22e96fd4f18bdd7d3812d22e6':
|
2015-10-20 03:00:32 +00:00 |
|
|
Sunny Goyal
|
20367a4a6d
|
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
* commit '30c651297316564dfd20af17353a2059d95a00b3':
|
2015-10-20 03:00:29 +00:00 |
|
|
Sunny Goyal
|
7c042792b3
|
am f876301d: UI Fixes am: 501414523e am: 2f22fa892b am: 718278e9f4 am: 2550c9f472 am: 9e095af394 am: 40811df9d4 am: 4e10620cad
am: a46379919d
* commit 'a46379919deae13e9a3f8802bcb5939b52cd2ef6':
|
2015-10-20 03:00:25 +00:00 |
|
|
Adam Cohen
|
b3d6e58260
|
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
* commit 'e35bcf5d813529c5c59bddff1348e2c130bf79e4':
|
2015-10-20 03:00:20 +00:00 |
|
|
Baligh Uddin
|
e7a344a5bd
|
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
* commit 'af6b00a8a0f1ccab15eda19b46bc2e31d5c70543':
|
2015-10-20 03:00:16 +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 |
|
|
Adam Cohen
|
170e9f8c7d
|
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
* commit '1f7673be44a16106a5db62f1c845e1b6aed6ae7e':
|
2015-10-20 02:23:58 +00:00 |
|
|
Adam Cohen
|
0f4d6d894c
|
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
* commit '855f74e97619dc07db0fcaa7e7b49e28ebff1117':
|
2015-10-20 02:23:55 +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 |
|
|
Sunny Goyal
|
ab9c3f9291
|
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
* commit '8712269056303624b4367aae334cbb305b984a87':
|
2015-10-20 02:23:52 +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 |
|
|
Ian Parkinson
|
c7f40c9394
|
am 0c2918f4: Use View.generateViewId if available am: 3d78b80ecd am: 8374915b27 am: ceb823f9ec am: 35a3ca532b am: 0317b768f6 am: 1f177aee96
am: 0af053b667
* commit '0af053b6670cb72a47be369c67baba429f713c73':
|
2015-10-20 02:23:45 +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 Cohen
|
7c5b24f93a
|
am 4b8d11fc: Add missing xxhdpi asset am: 49e2f10ee2 am: a42854b9b4 am: 53e87e86c2 am: 11174f43bd am: 254e7b0a72 am: 7ad63c2b1e
am: 75d44b69c2
* commit '75d44b69c2be8bc1d121aac22b8114e4b11cea03':
|
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 |
|
|
Kenny Guy
|
b95849feef
|
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
* commit '652b89c1233c38c94b95e7be684621d3283fbbd5':
|
2015-10-20 02:23:35 +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
|
1c38f7e1d3
|
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
* commit 'b05dcc69adc6b2ee08cd6ab619e6592a1668aca4':
|
2015-10-20 02:23:31 +00:00 |
|
|
Bjorn Bringert
|
c46a3e64c5
|
am 2ed99e86: Build Launcher3 against prebuilt SDK 21 am: c656245b9c am: 867cd087e3 am: 5a7f0e0527 am: 326e88800d am: bd92113aa4 am: 6a8773d116
am: 836d372b84
* commit '836d372b84b94d31795f1bc5ad218a231929b40d':
|
2015-10-20 02:23:28 +00:00 |
|
|
Sunny Goyal
|
ede1afb55b
|
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
* commit '3f61431dab766cd2b8a92aa34abe0c44304862ae':
|
2015-10-20 02:23:23 +00:00 |
|
|
Baligh Uddin
|
6f7a528b43
|
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
* commit '00d2190a26c66fe9053b1fcbd612cc410ddd864d':
|
2015-10-20 02:23:19 +00:00 |
|
|
Sunny Goyal
|
30c6512973
|
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
* commit '58e3869dbfa188dad46aef00320613a0cda439e7':
|
2015-10-20 02:23:13 +00:00 |
|
|
Sunny Goyal
|
a46379919d
|
am f876301d: UI Fixes am: 501414523e am: 2f22fa892b am: 718278e9f4 am: 2550c9f472 am: 9e095af394 am: 40811df9d4
am: 4e10620cad
* commit '4e10620cad678a43425ef43262fc1515df6dbe1e':
|
2015-10-20 02:23:10 +00:00 |
|
|
Adam Cohen
|
e35bcf5d81
|
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
* commit 'bc4aed2eec92820341d08fa32eb4bdcda1214242':
|
2015-10-20 02:23:05 +00:00 |
|
|
Baligh Uddin
|
af6b00a8a0
|
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
* commit '3eaeafbebf191a5ea5c98592f2042424b3610fbd':
|
2015-10-20 02:23:01 +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 |
|