 Mark Ashdown
|
1df97e4e4b
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f33481f am: 68c0bedde8 am: 59329359e7 am: daf2da93f6
am: 4cad8c7747
* commit '4cad8c7747e9d2c374eec5689f2af550e6044acd':
|
2015-10-20 01:30:50 +00:00 |
|
 Mathew Inwood
|
df112558f3
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7c1 am: 52cced3ede am: 9cd759a5e1 am: a9d4118ab3
am: 8020ebf7bc
* commit '8020ebf7bc648bd47aa40e48482bd5b1bbc4245f':
|
2015-10-20 01:30:46 +00:00 |
|
 Juan Silveira
|
67e3373948
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c am: b6973a57c3 am: a379acb1cb am: 28c9e80cc0
am: abe2da3ed1
* commit 'abe2da3ed1118861d5997c61d05018290f2a7e61':
|
2015-10-20 01:30:41 +00:00 |
|
 Anton Hansson
|
59fcb9ce40
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c4274 am: 216a53f0b1 am: aeb301c7e5 am: 817bbecd42
am: 14861fae4d
* commit '14861fae4d377d5a9b95b84bf6f247586ffd4401':
|
2015-10-20 01:30:37 +00:00 |
|
 Adam Skory
|
186a1a7060
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b96e am: 61172868fd am: 157e6c57d6 am: d078023bce
am: 5b55c46e01
* commit '5b55c46e015bd9bfe2fd72ae090add4eb189adb3':
|
2015-10-20 01:30:33 +00:00 |
|
|
Adam Skory
|
319c9ac41f
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c95 am: d072686669 am: f351edd651 am: 49bc959e07
am: 9c3d1aee2f
* commit '9c3d1aee2f0a74b30a44bb5b64e37e399db0c1cc':
|
2015-10-20 01:30:29 +00:00 |
|
|
Adam Skory
|
f41815802e
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d am: f8f29b43ff am: 92557c9596 am: a324418ece
am: 8194e08397
* commit '8194e0839760fd5e8eb785c0945b046dff5c7a7c':
|
2015-10-20 01:30:23 +00:00 |
|
 Adam Cohen
|
e4eadaaf37
|
am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am: e7afa51bd8 am: 6d0a93207e
am: a5eae84cbf
* commit 'a5eae84cbf218dc932dfaebcacceefe55fed18b8':
|
2015-10-20 01:13:14 +00:00 |
|
|
Adam Cohen
|
f9c3e8a6ae
|
am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop am: 84a79949a4 am: 313c1de1cc
am: 20053bc691
* commit '20053bc691fad846d7220d9aaa0ea62c9e864840':
|
2015-10-20 01:13:11 +00:00 |
|
 Sunny Goyal
|
dea24897a3
|
am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created am: fdbfba88d4 -s ours am: 852a96562a
am: 153ccdf5ee
* commit '153ccdf5ee6d9d97eb36597d5bed79e5d6a0c71a':
|
2015-10-20 01:13:08 +00:00 |
|
 Ian Parkinson
|
35a3ca532b
|
am 0c2918f4: Use View.generateViewId if available am: 3d78b80ecd am: 8374915b27
am: ceb823f9ec
* commit 'ceb823f9ece10570e1c10c8f8bfe0c517ed4d0e8':
|
2015-10-20 01:13:02 +00:00 |
|
|
Adam Cohen
|
11174f43bd
|
am 4b8d11fc: Add missing xxhdpi asset am: 49e2f10ee2 am: a42854b9b4
am: 53e87e86c2
* commit '53e87e86c2ff723a589f4704a1ae68a728fc7e73':
|
2015-10-20 01:12:58 +00:00 |
|
 Kenny Guy
|
0fa7200b5a
|
am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am: 5f2a520f0c am: 689cb6366b
am: e431703711
* commit 'e431703711bf883b139f41fdd21ecf3c34b79ea8':
|
2015-10-20 01:12:52 +00:00 |
|
|
Adam Cohen
|
29a81daa0d
|
am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop am: 91c11b28d5 am: 7e88e90afc
am: b75de587c5
* commit 'b75de587c52ee4f9ba5ada289c0675f1fafdc7f9':
|
2015-10-20 01:12:48 +00:00 |
|
 Bjorn Bringert
|
326e88800d
|
am 2ed99e86: Build Launcher3 against prebuilt SDK 21 am: c656245b9c am: 867cd087e3
am: 5a7f0e0527
* commit '5a7f0e05273a92a36a496f6241bee48c49fbba1f':
|
2015-10-20 01:12:44 +00:00 |
|
|
Sunny Goyal
|
b1250ad81d
|
am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop am: e7599d6943 am: 5d36c5b03b
am: ab1bfbf928
* commit 'ab1bfbf9285e6d917c94ec1b4c57c66d57cb6c23':
|
2015-10-20 01:12:40 +00:00 |
|
|
Mark Ashdown
|
4cad8c7747
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f33481f am: 68c0bedde8 am: 59329359e7
am: daf2da93f6
* commit 'daf2da93f60f775e611a75572f64390bc7b18eb5':
|
2015-10-20 01:12:36 +00:00 |
|
 Baligh Uddin
|
a03da71ae3
|
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
* commit '56985a1867525557fd15a1b74fc768945ebc56c6':
|
2015-10-20 01:12:33 +00:00 |
|
|
Mathew Inwood
|
8020ebf7bc
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7c1 am: 52cced3ede am: 9cd759a5e1
am: a9d4118ab3
* commit 'a9d4118ab36d15dbb14fbd38c55e00905b4a5250':
|
2015-10-20 01:12:29 +00:00 |
|
|
Sunny Goyal
|
d090146ad8
|
am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons am: e43f0d646c am: ffe21b3129
am: f321db6800
* commit 'f321db6800bbfc1e95f82ca6f01002f7d3e5bf2d':
|
2015-10-20 01:12:27 +00:00 |
|
|
Juan Silveira
|
abe2da3ed1
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c am: b6973a57c3 am: a379acb1cb
am: 28c9e80cc0
* commit '28c9e80cc092358330c5f42449739c208400c666':
|
2015-10-20 01:12:24 +00:00 |
|
|
Sunny Goyal
|
2550c9f472
|
am f876301d: UI Fixes am: 501414523e am: 2f22fa892b
am: 718278e9f4
* commit '718278e9f4323700267f0a04aeb55b532f6aeeec':
|
2015-10-20 01:12:23 +00:00 |
|
|
Anton Hansson
|
14861fae4d
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c4274 am: 216a53f0b1 am: aeb301c7e5
am: 817bbecd42
* commit '817bbecd42d21efe787b2bc90432f2f85edd4b28':
|
2015-10-20 01:12:18 +00:00 |
|
|
Adam Cohen
|
9975db3a5e
|
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
* commit '278d4d2d5af5abff45633301976e861196bd90ac':
|
2015-10-20 01:12:17 +00:00 |
|
|
Adam Skory
|
5b55c46e01
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b96e am: 61172868fd am: 157e6c57d6
am: d078023bce
* commit 'd078023bcee35457d2bbd804c58b89ee7eec9d17':
|
2015-10-20 01:12:14 +00:00 |
|
|
Baligh Uddin
|
03937ac5d7
|
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
* commit '669ef65afbb3799333b4e961371b920653ec870f':
|
2015-10-20 01:12:12 +00:00 |
|
|
Adam Skory
|
9c3d1aee2f
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c95 am: d072686669 am: f351edd651
am: 49bc959e07
* commit '49bc959e074295009b5024d43519f8ba3e20d0bb':
|
2015-10-20 01:12:08 +00:00 |
|
|
Adam Skory
|
8194e08397
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d am: f8f29b43ff am: 92557c9596
am: a324418ece
* commit 'a324418ecef0fff08695f29b6bf191049bf79598':
|
2015-10-20 01:12:02 +00:00 |
|
|
Adam Cohen
|
a5eae84cbf
|
am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am: e7afa51bd8
am: 6d0a93207e
* commit '6d0a93207ebb2ed8380e398ca3ecc5965975c778':
|
2015-10-20 00:54:55 +00:00 |
|
|
Adam Cohen
|
20053bc691
|
am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop am: 84a79949a4
am: 313c1de1cc
* commit '313c1de1cc69d9d4b59fd2b2f88fdba26bc8d4de':
|
2015-10-20 00:54:51 +00:00 |
|
|
Sunny Goyal
|
153ccdf5ee
|
am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created am: fdbfba88d4 -s ours
am: 852a96562a
* commit '852a96562af274cb6768f7370436d632fcf7ed05':
|
2015-10-20 00:54:48 +00:00 |
|
|
Ian Parkinson
|
ceb823f9ec
|
am 0c2918f4: Use View.generateViewId if available am: 3d78b80ecd
am: 8374915b27
* commit '8374915b27e98f02a6a0a3e61ad3085c7635226d':
|
2015-10-20 00:54:44 +00:00 |
|
|
Adam Cohen
|
53e87e86c2
|
am 4b8d11fc: Add missing xxhdpi asset am: 49e2f10ee2
am: a42854b9b4
* commit 'a42854b9b44a188f76ffa41f5e2fa0f54a39b2f6':
|
2015-10-20 00:54:41 +00:00 |
|
|
Kenny Guy
|
e431703711
|
am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am: 5f2a520f0c
am: 689cb6366b
* commit '689cb6366b4cc4a205ad7a3696c04fe6f5ec28c3':
|
2015-10-20 00:54:37 +00:00 |
|
|
Adam Cohen
|
b75de587c5
|
am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop am: 91c11b28d5
am: 7e88e90afc
* commit '7e88e90afc2fce3e64735ee0f11b9098193253d3':
|
2015-10-20 00:54:31 +00:00 |
|
|
Bjorn Bringert
|
5a7f0e0527
|
am 2ed99e86: Build Launcher3 against prebuilt SDK 21 am: c656245b9c
am: 867cd087e3
* commit '867cd087e32ac224ad87145f0b446a5606de0afe':
|
2015-10-20 00:54:27 +00:00 |
|
|
Sunny Goyal
|
ab1bfbf928
|
am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop am: e7599d6943
am: 5d36c5b03b
* commit '5d36c5b03bbbd2906a74e4c9c17faa74f5d4c4ec':
|
2015-10-20 00:54:23 +00:00 |
|
|
Baligh Uddin
|
56985a1867
|
am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: ab474588ce -s ours
am: eb8ce94244 -s ours
* commit 'eb8ce94244706fd12d41740ad949469a10c5ab43':
|
2015-10-20 00:54:18 +00:00 |
|
|
Mark Ashdown
|
daf2da93f6
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f33481f am: 68c0bedde8
am: 59329359e7
* commit '59329359e7530d5dee78c50b2c6c5b4993c7f02d':
|
2015-10-20 00:54:16 +00:00 |
|
|
Sunny Goyal
|
f321db6800
|
am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons am: e43f0d646c
am: ffe21b3129
* commit 'ffe21b31295b2195b219372394096253dda64e89':
|
2015-10-20 00:54:14 +00:00 |
|
|
Mathew Inwood
|
a9d4118ab3
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7c1 am: 52cced3ede
am: 9cd759a5e1
* commit '9cd759a5e130244b045ce42ca7155cf6dc829652':
|
2015-10-20 00:54:10 +00:00 |
|
|
Sunny Goyal
|
718278e9f4
|
am f876301d: UI Fixes am: 501414523e
am: 2f22fa892b
* commit '2f22fa892bb4cc40d26353cb8946d2a00a26eac4':
|
2015-10-20 00:54:08 +00:00 |
|
|
Juan Silveira
|
28c9e80cc0
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c am: b6973a57c3
am: a379acb1cb
* commit 'a379acb1cbe729b44362666bf5a9ac8f27108622':
|
2015-10-20 00:54:05 +00:00 |
|
|
Adam Cohen
|
278d4d2d5a
|
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
* commit '86b4730bb5217268c3abd4444c34b2876a7c3ebc':
|
2015-10-20 00:54:03 +00:00 |
|
|
Anton Hansson
|
817bbecd42
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c4274 am: 216a53f0b1
am: aeb301c7e5
* commit 'aeb301c7e5c7d4727b3da4b67de46bcac7d2619d':
|
2015-10-20 00:54:00 +00:00 |
|
|
Baligh Uddin
|
669ef65afb
|
am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: 6317598a19 -s ours
am: bfe4347964 -s ours
* commit 'bfe43479643fece25c8aeabb64b90ca9d6c028be':
|
2015-10-20 00:53:58 +00:00 |
|
|
Adam Skory
|
d078023bce
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b96e am: 61172868fd
am: 157e6c57d6
* commit '157e6c57d6b9093e2d491b979b4744fe35052242':
|
2015-10-20 00:53:54 +00:00 |
|
|
Adam Skory
|
49bc959e07
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c95 am: d072686669
am: f351edd651
* commit 'f351edd6519615d60cb646a6976bc69caa5e7dc2':
|
2015-10-20 00:53:49 +00:00 |
|
|
Adam Skory
|
a324418ece
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d am: f8f29b43ff
am: 92557c9596
* commit '92557c9596e2568336fe5f6d4bb36d579205feb2':
|
2015-10-20 00:53:44 +00:00 |
|
|
Mark Ashdown
|
59329359e7
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f33481f
am: 68c0bedde8
* commit '68c0bedde806eedfd25b4b726fa520c2a5c32a7a':
|
2015-10-20 00:33:37 +00:00 |
|