git.osdn.net Git - android-x86/packages-apps-Trebuchet.git/log

(root) / android-x86 / packages-apps-Trebuchet.git / log

Baligh Uddin [Tue, 20 Oct 2015 03:19:03 +0000 (03:19 +0000)]

keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62 am: ce566c0e93 am: 1c30b578e1 am: 9fa7ca7d65
am: dcc908e147 -s ours

* commit 'dcc908e147853cf5e0552bcf387c22616f89fe16':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 01:49:32 +0000 (01:49 +0000)]

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':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 01:49:27 +0000 (01:49 +0000)]

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':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 01:49:22 +0000 (01:49 +0000)]

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':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 01:49:17 +0000 (01:49 +0000)]

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':

commit | commitdiff | tree

Mathew Inwood [Tue, 20 Oct 2015 01:49:12 +0000 (01:49 +0000)]

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':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 01:49:07 +0000 (01:49 +0000)]

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':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 01:49:01 +0000 (01:49 +0000)]

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':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 01:48:55 +0000 (01:48 +0000)]

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':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 01:48:50 +0000 (01:48 +0000)]

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':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 01:48:43 +0000 (01:48 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d am: f8f29b43ff am: 92557c9596 am: a324418ece am: 8194e08397
am: f41815802e

* commit 'f41815802ef91385c7c4c345e687956fa3e6f3c1':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 01:31:21 +0000 (01:31 +0000)]

am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am: e7afa51bd8 am: 6d0a93207e am: a5eae84cbf
am: e4eadaaf37

* commit 'e4eadaaf3744e12221b459524c457046af678588':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 01:31:18 +0000 (01:31 +0000)]

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':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 01:31:15 +0000 (01:31 +0000)]

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':

commit | commitdiff | tree

Ian Parkinson [Tue, 20 Oct 2015 01:31:11 +0000 (01:31 +0000)]

am 0c2918f4: Use View.generateViewId if available am: 3d78b80ecd am: 8374915b27 am: ceb823f9ec
am: 35a3ca532b

* commit '35a3ca532b474917523a49af076073942258938c':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 01:31:08 +0000 (01:31 +0000)]

am 4b8d11fc: Add missing xxhdpi asset am: 49e2f10ee2 am: a42854b9b4 am: 53e87e86c2
am: 11174f43bd

* commit '11174f43bd189de95cf61c3177991935a6ace486':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 01:31:06 +0000 (01:31 +0000)]

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)

commit | commitdiff | tree

Kenny Guy [Tue, 20 Oct 2015 01:31:05 +0000 (01:31 +0000)]

am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am: 5f2a520f0c am: 689cb6366b am: e431703711
am: 0fa7200b5a

* commit '0fa7200b5ac94f4ed45a1849ff26da3a5a65cb53':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 01:31:02 +0000 (01:31 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1 am: a59ef0ba69 am: 8acd2748b2 am: 52599958f4
am: 1c13c13722

* commit '1c13c13722af37a9677b11c9c6b7bfbb6002bab9':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 01:31:01 +0000 (01:31 +0000)]

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':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 01:30:58 +0000 (01:30 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc37722e am: b7b834bde1 am: ca2bafc86f am: 9774281221
am: 6df4bd8b7f

* commit '6df4bd8b7fc75d524c7eeb3237e9a7d76ad989d8':

commit | commitdiff | tree

Bjorn Bringert [Tue, 20 Oct 2015 01:30:57 +0000 (01:30 +0000)]

am 2ed99e86: Build Launcher3 against prebuilt SDK 21 am: c656245b9c am: 867cd087e3 am: 5a7f0e0527
am: 326e88800d

* commit '326e88800db5580e7121492c0a4b052241ea3b00':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 01:30:53 +0000 (01:30 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16 am: 2feee6dec2 am: ab3847b8b3 am: 0cce0579a3
am: 8c9ef49ae5

* commit '8c9ef49ae5a10e011d214cede771042434f28691':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 01:30:53 +0000 (01:30 +0000)]

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':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 01:30:50 +0000 (01:30 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f33481f am: 68c0bedde8 am: 59329359e7 am: daf2da93f6
am: 4cad8c7747

* commit '4cad8c7747e9d2c374eec5689f2af550e6044acd':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 01:30:49 +0000 (01:30 +0000)]

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':

commit | commitdiff | tree

Mathew Inwood [Tue, 20 Oct 2015 01:30:46 +0000 (01:30 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7c1 am: 52cced3ede am: 9cd759a5e1 am: a9d4118ab3
am: 8020ebf7bc

* commit '8020ebf7bc648bd47aa40e48482bd5b1bbc4245f':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 01:30:44 +0000 (01:30 +0000)]

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':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 01:30:41 +0000 (01:30 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c am: b6973a57c3 am: a379acb1cb am: 28c9e80cc0
am: abe2da3ed1

* commit 'abe2da3ed1118861d5997c61d05018290f2a7e61':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 01:30:39 +0000 (01:30 +0000)]

am f876301d: UI Fixes am: 501414523e am: 2f22fa892b am: 718278e9f4
am: 2550c9f472

* commit '2550c9f47257680e979b156ff02d2014ffcbe7df':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 01:30:37 +0000 (01:30 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c4274 am: 216a53f0b1 am: aeb301c7e5 am: 817bbecd42
am: 14861fae4d

* commit '14861fae4d377d5a9b95b84bf6f247586ffd4401':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 01:30:35 +0000 (01:30 +0000)]

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':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 01:30:33 +0000 (01:30 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b96e am: 61172868fd am: 157e6c57d6 am: d078023bce
am: 5b55c46e01

* commit '5b55c46e015bd9bfe2fd72ae090add4eb189adb3':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 01:30:31 +0000 (01:30 +0000)]

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':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 01:30:29 +0000 (01:30 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c95 am: d072686669 am: f351edd651 am: 49bc959e07
am: 9c3d1aee2f

* commit '9c3d1aee2f0a74b30a44bb5b64e37e399db0c1cc':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 01:30:23 +0000 (01:30 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d am: f8f29b43ff am: 92557c9596 am: a324418ece
am: 8194e08397

* commit '8194e0839760fd5e8eb785c0945b046dff5c7a7c':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 01:13:14 +0000 (01:13 +0000)]

am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am: e7afa51bd8 am: 6d0a93207e
am: a5eae84cbf

* commit 'a5eae84cbf218dc932dfaebcacceefe55fed18b8':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 01:13:11 +0000 (01:13 +0000)]

am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop am: 84a79949a4 am: 313c1de1cc
am: 20053bc691

* commit '20053bc691fad846d7220d9aaa0ea62c9e864840':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 01:13:08 +0000 (01:13 +0000)]

am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created am: fdbfba88d4 -s ours am: 852a96562a
am: 153ccdf5ee

* commit '153ccdf5ee6d9d97eb36597d5bed79e5d6a0c71a':

commit | commitdiff | tree

Ian Parkinson [Tue, 20 Oct 2015 01:13:02 +0000 (01:13 +0000)]

am 0c2918f4: Use View.generateViewId if available am: 3d78b80ecd am: 8374915b27
am: ceb823f9ec

* commit 'ceb823f9ece10570e1c10c8f8bfe0c517ed4d0e8':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 01:12:58 +0000 (01:12 +0000)]

am 4b8d11fc: Add missing xxhdpi asset am: 49e2f10ee2 am: a42854b9b4
am: 53e87e86c2

* commit '53e87e86c2ff723a589f4704a1ae68a728fc7e73':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 01:12:54 +0000 (01:12 +0000)]

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)

commit | commitdiff | tree

Kenny Guy [Tue, 20 Oct 2015 01:12:52 +0000 (01:12 +0000)]

am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am: 5f2a520f0c am: 689cb6366b
am: e431703711

* commit 'e431703711bf883b139f41fdd21ecf3c34b79ea8':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 01:12:50 +0000 (01:12 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1 am: a59ef0ba69 am: 8acd2748b2
am: 52599958f4

* commit '52599958f4afef66bc0eed3c3532489857467e2c':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 01:12:48 +0000 (01:12 +0000)]

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':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 01:12:46 +0000 (01:12 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc37722e am: b7b834bde1 am: ca2bafc86f
am: 9774281221

* commit '9774281221d560dc61383c1d55a1aea77944485d':

commit | commitdiff | tree

Bjorn Bringert [Tue, 20 Oct 2015 01:12:44 +0000 (01:12 +0000)]

am 2ed99e86: Build Launcher3 against prebuilt SDK 21 am: c656245b9c am: 867cd087e3
am: 5a7f0e0527

* commit '5a7f0e05273a92a36a496f6241bee48c49fbba1f':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 01:12:42 +0000 (01:12 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16 am: 2feee6dec2 am: ab3847b8b3
am: 0cce0579a3

* commit '0cce0579a3630ccbaea6f8b3ad1685ec5e3c1e86':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 01:12:40 +0000 (01:12 +0000)]

am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop am: e7599d6943 am: 5d36c5b03b
am: ab1bfbf928

* commit 'ab1bfbf9285e6d917c94ec1b4c57c66d57cb6c23':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 01:12:36 +0000 (01:12 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f33481f am: 68c0bedde8 am: 59329359e7
am: daf2da93f6

* commit 'daf2da93f60f775e611a75572f64390bc7b18eb5':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 01:12:33 +0000 (01:12 +0000)]

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':

commit | commitdiff | tree

Mathew Inwood [Tue, 20 Oct 2015 01:12:29 +0000 (01:12 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7c1 am: 52cced3ede am: 9cd759a5e1
am: a9d4118ab3

* commit 'a9d4118ab36d15dbb14fbd38c55e00905b4a5250':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 01:12:27 +0000 (01:12 +0000)]

am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons am: e43f0d646c am: ffe21b3129
am: f321db6800

* commit 'f321db6800bbfc1e95f82ca6f01002f7d3e5bf2d':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 01:12:24 +0000 (01:12 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c am: b6973a57c3 am: a379acb1cb
am: 28c9e80cc0

* commit '28c9e80cc092358330c5f42449739c208400c666':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 01:12:23 +0000 (01:12 +0000)]

am f876301d: UI Fixes am: 501414523e am: 2f22fa892b
am: 718278e9f4

* commit '718278e9f4323700267f0a04aeb55b532f6aeeec':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 01:12:18 +0000 (01:12 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c4274 am: 216a53f0b1 am: aeb301c7e5
am: 817bbecd42

* commit '817bbecd42d21efe787b2bc90432f2f85edd4b28':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 01:12:17 +0000 (01:12 +0000)]

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':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 01:12:14 +0000 (01:12 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b96e am: 61172868fd am: 157e6c57d6
am: d078023bce

* commit 'd078023bcee35457d2bbd804c58b89ee7eec9d17':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 01:12:12 +0000 (01:12 +0000)]

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':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 01:12:08 +0000 (01:12 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c95 am: d072686669 am: f351edd651
am: 49bc959e07

* commit '49bc959e074295009b5024d43519f8ba3e20d0bb':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 01:12:02 +0000 (01:12 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d am: f8f29b43ff am: 92557c9596
am: a324418ece

* commit 'a324418ecef0fff08695f29b6bf191049bf79598':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 00:54:55 +0000 (00:54 +0000)]

am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am: e7afa51bd8
am: 6d0a93207e

* commit '6d0a93207ebb2ed8380e398ca3ecc5965975c778':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 00:54:51 +0000 (00:54 +0000)]

am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop am: 84a79949a4
am: 313c1de1cc

* commit '313c1de1cc69d9d4b59fd2b2f88fdba26bc8d4de':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 00:54:48 +0000 (00:54 +0000)]

am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created am: fdbfba88d4 -s ours
am: 852a96562a

* commit '852a96562af274cb6768f7370436d632fcf7ed05':

commit | commitdiff | tree

Ian Parkinson [Tue, 20 Oct 2015 00:54:44 +0000 (00:54 +0000)]

am 0c2918f4: Use View.generateViewId if available am: 3d78b80ecd
am: 8374915b27

* commit '8374915b27e98f02a6a0a3e61ad3085c7635226d':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 00:54:41 +0000 (00:54 +0000)]

am 4b8d11fc: Add missing xxhdpi asset am: 49e2f10ee2
am: a42854b9b4

* commit 'a42854b9b44a188f76ffa41f5e2fa0f54a39b2f6':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:54:39 +0000 (00:54 +0000)]

keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62
am: ce566c0e93

* commit 'ce566c0e93436dd819e6910f08bf7575f20c2a19':
  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)

commit | commitdiff | tree

Kenny Guy [Tue, 20 Oct 2015 00:54:37 +0000 (00:54 +0000)]

am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am: 5f2a520f0c
am: 689cb6366b

* commit '689cb6366b4cc4a205ad7a3696c04fe6f5ec28c3':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 00:54:31 +0000 (00:54 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1 am: a59ef0ba69
am: 8acd2748b2

* commit '8acd2748b24de6535e8992494831e2c03937b61b':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 00:54:31 +0000 (00:54 +0000)]

am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop am: 91c11b28d5
am: 7e88e90afc

* commit '7e88e90afc2fce3e64735ee0f11b9098193253d3':

commit | commitdiff | tree

Bjorn Bringert [Tue, 20 Oct 2015 00:54:27 +0000 (00:54 +0000)]

am 2ed99e86: Build Launcher3 against prebuilt SDK 21 am: c656245b9c
am: 867cd087e3

* commit '867cd087e32ac224ad87145f0b446a5606de0afe':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 00:54:26 +0000 (00:54 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc37722e am: b7b834bde1
am: ca2bafc86f

* commit 'ca2bafc86f947b1fe3bb3a2a21933329320d1a91':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 00:54:23 +0000 (00:54 +0000)]

am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop am: e7599d6943
am: 5d36c5b03b

* commit '5d36c5b03bbbd2906a74e4c9c17faa74f5d4c4ec':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 00:54:21 +0000 (00:54 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16 am: 2feee6dec2
am: ab3847b8b3

* commit 'ab3847b8b34a691cd829bfdf0776521349049adf':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:54:18 +0000 (00:54 +0000)]

am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: ab474588ce -s ours
am: eb8ce94244 -s ours

* commit 'eb8ce94244706fd12d41740ad949469a10c5ab43':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 00:54:16 +0000 (00:54 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f33481f am: 68c0bedde8
am: 59329359e7

* commit '59329359e7530d5dee78c50b2c6c5b4993c7f02d':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 00:54:14 +0000 (00:54 +0000)]

am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons am: e43f0d646c
am: ffe21b3129

* commit 'ffe21b31295b2195b219372394096253dda64e89':

commit | commitdiff | tree

Mathew Inwood [Tue, 20 Oct 2015 00:54:10 +0000 (00:54 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7c1 am: 52cced3ede
am: 9cd759a5e1

* commit '9cd759a5e130244b045ce42ca7155cf6dc829652':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 00:54:08 +0000 (00:54 +0000)]

am f876301d: UI Fixes am: 501414523e
am: 2f22fa892b

* commit '2f22fa892bb4cc40d26353cb8946d2a00a26eac4':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 00:54:05 +0000 (00:54 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c am: b6973a57c3
am: a379acb1cb

* commit 'a379acb1cbe729b44362666bf5a9ac8f27108622':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 00:54:03 +0000 (00:54 +0000)]

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':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 00:54:00 +0000 (00:54 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c4274 am: 216a53f0b1
am: aeb301c7e5

* commit 'aeb301c7e5c7d4727b3da4b67de46bcac7d2619d':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:53:58 +0000 (00:53 +0000)]

am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: 6317598a19 -s ours
am: bfe4347964 -s ours

* commit 'bfe43479643fece25c8aeabb64b90ca9d6c028be':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 00:53:54 +0000 (00:53 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b96e am: 61172868fd
am: 157e6c57d6

* commit '157e6c57d6b9093e2d491b979b4744fe35052242':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 00:53:49 +0000 (00:53 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c95 am: d072686669
am: f351edd651

* commit 'f351edd6519615d60cb646a6976bc69caa5e7dc2':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 00:53:44 +0000 (00:53 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d am: f8f29b43ff
am: 92557c9596

* commit '92557c9596e2568336fe5f6d4bb36d579205feb2':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:33:56 +0000 (00:33 +0000)]

keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f
am: 319e21ec62

* commit '319e21ec62f164af0ff9168de211d4b9baa4377b':
  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)

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 00:33:49 +0000 (00:33 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1
am: a59ef0ba69

* commit 'a59ef0ba69f7b1346616a5c6896351ad85ed9b88':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 00:33:45 +0000 (00:33 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc37722e
am: b7b834bde1

* commit 'b7b834bde170c2b444e0b031f5ec703620252240':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 00:33:41 +0000 (00:33 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16
am: 2feee6dec2

* commit '2feee6dec261eb70a83e30fb10620b29b5a8cf54':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 00:33:37 +0000 (00:33 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f33481f
am: 68c0bedde8

* commit '68c0bedde806eedfd25b4b726fa520c2a5c32a7a':

commit | commitdiff | tree

Mathew Inwood [Tue, 20 Oct 2015 00:33:33 +0000 (00:33 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7c1
am: 52cced3ede

* commit '52cced3edefa36f5be919f40327cef6f22d55bee':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 00:33:30 +0000 (00:33 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c
am: b6973a57c3

* commit 'b6973a57c35f4ff27034b088b4778b1bcbdb404b':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 00:33:25 +0000 (00:33 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c4274
am: 216a53f0b1

* commit '216a53f0b12c048a531dd7bdf3a02f59e18a808d':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 00:33:21 +0000 (00:33 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b96e
am: 61172868fd

* commit '61172868fde38da7f7ec8dcb84288d51095948e1':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 00:33:17 +0000 (00:33 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c95
am: d072686669

* commit 'd0726866694356f674ee80ca83ad97ff930bce20':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 00:33:10 +0000 (00:33 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d
am: f8f29b43ff

* commit 'f8f29b43ff7ecf9346e12e965ee90480617525bf':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 00:29:19 +0000 (00:29 +0000)]

am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop
am: e7afa51bd8

* commit 'e7afa51bd8f0f0b9f21bd63a9ceeb9f330259fc2':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 00:29:15 +0000 (00:29 +0000)]

am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop
am: 84a79949a4

* commit '84a79949a478f8b91c7fcc9346525f7dd187f548':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 00:29:10 +0000 (00:29 +0000)]

am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created
am: fdbfba88d4 -s ours

* commit 'fdbfba88d4f08d7a721d91b7e3d30ee5a290be6e':

packages/apps/Trebuchet

RSS Atom

About OSDN

Find Software

Develop Software

Help