Commit Graph

78507 Commits

Author SHA1 Message Date
Mathew Inwood 3b678d2e58 am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1d8 am: 7748c94d25 am: 4396cc1fff am: a267cb6dde
am: f289060a04

* commit 'f289060a0462da83e73b1b7c107f950178f083fc':
2015-10-20 01:31:19 +00:00
Adam Cohen cd4afe29cb am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop am: 84a79949a4 am: 313c1de1cc am: 20053bc691
am: f9c3e8a6ae

* commit 'f9c3e8a6ae82235c03c6d8095d7e33c15cd9213b':
2015-10-20 01:31:18 +00:00
Juan Silveira b897ea777e am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6adda am: 3f39cc45d8 am: 6120e6096a am: d9ba2b56db
am: 8dc63a93c6

* commit '8dc63a93c64471ea0fdb79d1b216b07fa38799cb':
2015-10-20 01:31:16 +00:00
Sunny Goyal 11164db134 am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created am: fdbfba88d4 -s ours am: 852a96562a am: 153ccdf5ee
am: dea24897a3  -s ours

* commit 'dea24897a3bd2913e76bed63be398d1ad4514d62':
2015-10-20 01:31:15 +00:00
Anton Hansson bf4e852f95 am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568 am: cb168d34ae am: 616facd74b am: 4c5dbc52b3
am: ed0c3623a9

* commit 'ed0c3623a9e4e99735149384c43fbb1f23888986':
2015-10-20 01:31:13 +00:00
Ian Parkinson 0317b768f6 am 0c2918f4: Use View.generateViewId if available am: 3d78b80ecd am: 8374915b27 am: ceb823f9ec
am: 35a3ca532b

* commit '35a3ca532b474917523a49af076073942258938c':
2015-10-20 01:31:11 +00:00
Adam Skory 65f484b1fc 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

* commit '622880c0b90e91599568f00af9ed373f87dc88ed':
2015-10-20 01:31:09 +00:00
Adam Cohen 254e7b0a72 am 4b8d11fc: Add missing xxhdpi asset am: 49e2f10ee2 am: a42854b9b4 am: 53e87e86c2
am: 11174f43bd

* commit '11174f43bd189de95cf61c3177991935a6ace486':
2015-10-20 01:31:08 +00:00
Baligh Uddin dcc908e147 keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62 am: ce566c0e93 am: 1c30b578e1
am: 9fa7ca7d65

* commit '9fa7ca7d656039e3621385acbbfaaec2dead888d':
  Import translations. DO NOT MERGE
  Fix overlapping pages (issue 12551580)
  Properly saving migration cling keys.
  Tightening migration conditions. (Bug 11973614)
  Import translations. DO NOT MERGE
  Fix build
  Import translations. DO NOT MERGE
  Initial empty repository
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  override Launcher2 (aosp)
2015-10-20 01:31:06 +00:00
Kenny Guy afc9a931cb am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am: 5f2a520f0c am: 689cb6366b am: e431703711
am: 0fa7200b5a

* commit '0fa7200b5ac94f4ed45a1849ff26da3a5a65cb53':
2015-10-20 01:31:05 +00:00
Huy Nguyen d848ca4869 Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1 am: a59ef0ba69 am: 8acd2748b2 am: 52599958f4
am: 1c13c13722

* commit '1c13c13722af37a9677b11c9c6b7bfbb6002bab9':
2015-10-20 01:31:02 +00:00
Adam Cohen d077b9d137 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

* commit '29a81daa0d2faecca8fbaa36e04d85ac94242088':
2015-10-20 01:31:01 +00:00
Mark Ashdown 7f4c5f364f Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc37722e am: b7b834bde1 am: ca2bafc86f am: 9774281221
am: 6df4bd8b7f

* commit '6df4bd8b7fc75d524c7eeb3237e9a7d76ad989d8':
2015-10-20 01:30:58 +00:00
Bjorn Bringert bd92113aa4 am 2ed99e86: Build Launcher3 against prebuilt SDK 21 am: c656245b9c am: 867cd087e3 am: 5a7f0e0527
am: 326e88800d

* commit '326e88800db5580e7121492c0a4b052241ea3b00':
2015-10-20 01:30:57 +00:00
Sunny Goyal dcb93ff314 am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop am: e7599d6943 am: 5d36c5b03b am: ab1bfbf928
am: b1250ad81d

* commit 'b1250ad81d3dc08933c3c3b63d5f215ddfe0c072':
2015-10-20 01:30:53 +00:00
Huy Nguyen cbdc96152e Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16 am: 2feee6dec2 am: ab3847b8b3 am: 0cce0579a3
am: 8c9ef49ae5

* commit '8c9ef49ae5a10e011d214cede771042434f28691':
2015-10-20 01:30:53 +00:00
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
Baligh Uddin 8c0efbe340 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

* commit 'a03da71ae30ee04f2bcdb3edf1b7e362c54f2d45':
2015-10-20 01:30:49 +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
Sunny Goyal d5f0973229 am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons am: e43f0d646c am: ffe21b3129 am: f321db6800
am: d090146ad8

* commit 'd090146ad86f0cecf3c76abd8b2deeae37582aa1':
2015-10-20 01:30:44 +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
Sunny Goyal 9e095af394 am f876301d: UI Fixes am: 501414523e am: 2f22fa892b am: 718278e9f4
am: 2550c9f472

* commit '2550c9f47257680e979b156ff02d2014ffcbe7df':
2015-10-20 01:30:39 +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 Cohen 48431f52c2 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

* commit '9975db3a5ee777a0752a8b94cc4d666bc1f9bbfc':
2015-10-20 01:30:35 +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
Baligh Uddin 909bcceeb4 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

* commit '03937ac5d7c2dae4d730bc6cea6d42c63ad13181':
2015-10-20 01:30:31 +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
Baligh Uddin a34c8cc2ba Import translations. DO NOT MERGE am: 2c29ac6eb5 -s ours am: b58e5fbc57 -s ours am: 2aa01afb35 -s ours
am: 25c42a0937  -s ours

* commit '25c42a09370a96264a84bc44e7ab502bc687bc45':
  Import translations. DO NOT MERGE
2015-10-20 01:13:47 +00:00
Baligh Uddin ed94b5520d 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

* commit '2d714406cd10431c3b6581377d76b373a227ca76':
  Import translations. DO NOT MERGE
2015-10-20 01:13:43 +00:00
Baligh Uddin cfb6dac38f Import translations. DO NOT MERGE am: c81b0617a6 -s ours am: 431d174f26 -s ours am: 8eef658cf9 -s ours
am: 1e6e698881  -s ours

* commit '1e6e69888109fa24da71e8c859ff12d5a16ca657':
  Import translations. DO NOT MERGE
2015-10-20 01:13:40 +00:00
Baligh Uddin 994502244e Import translations. DO NOT MERGE am: 81403969d1 -s ours am: bbe424e584 -s ours am: 5b53a47d02 -s ours
am: 9b7386403a  -s ours

* commit '9b7386403aedf53b1cc92e68d87ece2b9ddcc2c1':
  Import translations. DO NOT MERGE
2015-10-20 01:13:37 +00:00
Baligh Uddin 1edcac1745 Import translations. DO NOT MERGE am: 01614d6ba5 -s ours am: 8454595cf3 -s ours am: 3f3f0fbc02 -s ours
am: 2693dd2cd9  -s ours

* commit '2693dd2cd982150a7f3354ca57151a6021417f08':
  Import translations. DO NOT MERGE
2015-10-20 01:13:34 +00:00
Baligh Uddin 5148e0d456 Import translations. DO NOT MERGE am: c4d66cf035 -s ours am: 3209b2bc4d -s ours am: 69830841ec -s ours
am: 4baaf3241f  -s ours

* commit '4baaf3241faa20d74e890760f634424cc531c2a3':
  Import translations. DO NOT MERGE
2015-10-20 01:13:31 +00:00
Baligh Uddin 5793b647fd am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf am: 38bd557502
am: 0442deaee7

* commit '0442deaee7de92a0e6e929de53845bb165fb3562':
2015-10-20 01:13:27 +00:00
Huy Nguyen a107ef6e13 am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 149268d869 am: 70aa099f23 am: eadf9b6782
am: 24483f0498

* commit '24483f04982a10ed72cca92e3f8e396300e13730':
2015-10-20 01:13:24 +00:00
Mark Ashdown 84138b1523 am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: b1a081221e am: 1bd8f7e460 am: 7661d33379
am: 7e5ec74df0

* commit '7e5ec74df0d58e20732d0056e44c51b3ade9faf2':
2015-10-20 01:13:21 +00:00
Huy Nguyen 6b7a1631f6 am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d am: 27b99c86e9 am: 078afac399
am: 94b7ee378f

* commit '94b7ee378f29b5539559019d35ba96734cf66692':
2015-10-20 01:13:18 +00:00
Mark Ashdown 6060c10580 am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 64b83ce632 am: 346da07c80 am: 78a44d4726
am: 8abc959461

* commit '8abc959461e82023a7d92135c9003d031049edc1':
2015-10-20 01:13:15 +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
Mathew Inwood f289060a04 am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1d8 am: 7748c94d25 am: 4396cc1fff
am: a267cb6dde

* commit 'a267cb6ddef45a2293b70bd544919e0d8f1b27d0':
2015-10-20 01:13:12 +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
Juan Silveira 8dc63a93c6 am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6adda am: 3f39cc45d8 am: 6120e6096a
am: d9ba2b56db

* commit 'd9ba2b56dbb70f04310f87228a25b3cf04587d2f':
2015-10-20 01:13:09 +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
Anton Hansson ed0c3623a9 am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568 am: cb168d34ae am: 616facd74b
am: 4c5dbc52b3

* commit '4c5dbc52b3415966720f83c1a95a0b9fb3928b8f':
2015-10-20 01:13:05 +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 Skory 622880c0b9 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

* commit 'b523cc1e4f258fe4bd4d1ab1f78d97daceae239e':
2015-10-20 01:13:00 +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
Baligh Uddin 9fa7ca7d65 keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62 am: ce566c0e93
am: 1c30b578e1

* commit '1c30b578e104035a7da6879e1722a2e99bfc11cf':
  Import translations. DO NOT MERGE
  Fix overlapping pages (issue 12551580)
  Properly saving migration cling keys.
  Tightening migration conditions. (Bug 11973614)
  Import translations. DO NOT MERGE
  Fix build
  Import translations. DO NOT MERGE
  Initial empty repository
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  override Launcher2 (aosp)
2015-10-20 01:12:54 +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