 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 |
|
 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 |
|
 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 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 |
|
|
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 |
|
|
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 |
|
|
Mathew Inwood
|
9cd759a5e1
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7c1
am: 52cced3ede
* commit '52cced3edefa36f5be919f40327cef6f22d55bee':
|
2015-10-20 00:33:33 +00:00 |
|
|
Juan Silveira
|
a379acb1cb
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c
am: b6973a57c3
* commit 'b6973a57c35f4ff27034b088b4778b1bcbdb404b':
|
2015-10-20 00:33:30 +00:00 |
|
|
Anton Hansson
|
aeb301c7e5
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c4274
am: 216a53f0b1
* commit '216a53f0b12c048a531dd7bdf3a02f59e18a808d':
|
2015-10-20 00:33:25 +00:00 |
|
|
Adam Skory
|
157e6c57d6
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b96e
am: 61172868fd
* commit '61172868fde38da7f7ec8dcb84288d51095948e1':
|
2015-10-20 00:33:21 +00:00 |
|
|
Adam Skory
|
f351edd651
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c95
am: d072686669
* commit 'd0726866694356f674ee80ca83ad97ff930bce20':
|
2015-10-20 00:33:17 +00:00 |
|
|
Adam Skory
|
92557c9596
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d
am: f8f29b43ff
* commit 'f8f29b43ff7ecf9346e12e965ee90480617525bf':
|
2015-10-20 00:33:10 +00:00 |
|
|
Adam Cohen
|
6d0a93207e
|
am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop
am: e7afa51bd8
* commit 'e7afa51bd8f0f0b9f21bd63a9ceeb9f330259fc2':
|
2015-10-20 00:29:19 +00:00 |
|
|
Adam Cohen
|
313c1de1cc
|
am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop
am: 84a79949a4
* commit '84a79949a478f8b91c7fcc9346525f7dd187f548':
|
2015-10-20 00:29:15 +00:00 |
|
|
Sunny Goyal
|
852a96562a
|
am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created
am: fdbfba88d4 -s ours
* commit 'fdbfba88d4f08d7a721d91b7e3d30ee5a290be6e':
|
2015-10-20 00:29:10 +00:00 |
|
|
Ian Parkinson
|
8374915b27
|
am 0c2918f4: Use View.generateViewId if available
am: 3d78b80ecd
* commit '3d78b80ecdfeec7704b2aa82ce39823fa903ea61':
|
2015-10-20 00:29:04 +00:00 |
|
|
Adam Cohen
|
a42854b9b4
|
am 4b8d11fc: Add missing xxhdpi asset
am: 49e2f10ee2
* commit '49e2f10ee205d6190f0d4c589ba31b6763e9b0d3':
|
2015-10-20 00:28:59 +00:00 |
|
|
Kenny Guy
|
689cb6366b
|
am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop
am: 5f2a520f0c
* commit '5f2a520f0cd47b274bdf809d7b665c956c2717ed':
|
2015-10-20 00:28:53 +00:00 |
|
|
Adam Cohen
|
7e88e90afc
|
am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop
am: 91c11b28d5
* commit '91c11b28d57c026d507488c58feedebf7fee6f31':
|
2015-10-20 00:28:44 +00:00 |
|
|
Bjorn Bringert
|
867cd087e3
|
am 2ed99e86: Build Launcher3 against prebuilt SDK 21
am: c656245b9c
* commit 'c656245b9cbc370537afb18e7fb38ea87c233fd1':
|
2015-10-20 00:28:36 +00:00 |
|
|
Sunny Goyal
|
5d36c5b03b
|
am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop
am: e7599d6943
* commit 'e7599d694313845a41221dfa0d7f6dca3aedd02c':
|
2015-10-20 00:28:30 +00:00 |
|
|
Baligh Uddin
|
eb8ce94244
|
am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
am: ab474588ce -s ours
* commit 'ab474588ce7d9cddff2b2dc0a2fd91b4ae532e05':
|
2015-10-20 00:28:25 +00:00 |
|
|
Sunny Goyal
|
ffe21b3129
|
am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons
am: e43f0d646c
* commit 'e43f0d646c60c6f59333224686725717cdf2ccbc':
|
2015-10-20 00:28:19 +00:00 |
|
|
Sunny Goyal
|
2f22fa892b
|
am f876301d: UI Fixes
am: 501414523e
* commit '501414523ef1e3dc394746ea01489a934e826865':
|
2015-10-20 00:28:14 +00:00 |
|
|
Adam Cohen
|
86b4730bb5
|
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
* commit 'cb20616a180de2855cc35e6c1ce8dfb8082ea41c':
|
2015-10-20 00:28:06 +00:00 |
|
|
Mathew Inwood
|
52cced3ede
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am: 56ca86b7c1
* commit '56ca86b7c177fd6fb330d6cb3631070e8689cd87':
|
2015-10-20 00:28:05 +00:00 |
|
|
Juan Silveira
|
b6973a57c3
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am: 07130d400c
* commit '07130d400c52518e413e58334525f1598c3b8f1a':
|
2015-10-20 00:28:01 +00:00 |
|
|
Baligh Uddin
|
bfe4347964
|
am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
am: 6317598a19 -s ours
* commit '6317598a196ada3f32950c7f4a8d5cfe005acf42':
|
2015-10-20 00:28:00 +00:00 |
|
|
Anton Hansson
|
216a53f0b1
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am: d0642c4274
* commit 'd0642c4274abcbede9177d61b0f072689db889a9':
|
2015-10-20 00:27:55 +00:00 |
|
|
Adam Skory
|
61172868fd
|
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am: 853b55b96e
* commit '853b55b96e4af7a4f949a22cc084bd333e528c1c':
|
2015-10-20 00:27:51 +00:00 |
|