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:21:56 +0000 (03:21 +0000)]

am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf am: 38bd557502 am: 0442deaee7 am: 5793b647fd am: f351d2d274
am: cf067a9a44

* commit 'cf067a9a44f00315d11c72432602fb8b9e03cf73':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 03:21:53 +0000 (03:21 +0000)]

am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 149268d869 am: 70aa099f23 am: eadf9b6782 am: 24483f0498 am: a107ef6e13 am: f7f8df9f7c
am: 94fd0e00d1

* commit '94fd0e00d115fb60eba1cfbf94e72fb841188587':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 03:21:48 +0000 (03:21 +0000)]

am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: b1a081221e am: 1bd8f7e460 am: 7661d33379 am: 7e5ec74df0 am: 84138b1523 am: e90e2b89bb
am: 26e7cd5b94

* commit '26e7cd5b94130811fd5557174b8ed023780d429e':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 03:21:45 +0000 (03:21 +0000)]

am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d am: 27b99c86e9 am: 078afac399 am: 94b7ee378f am: 6b7a1631f6 am: 753cf130b9
am: bbf5c27346

* commit 'bbf5c273465e266ab26f02110f54991f4850af30':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 03:21:39 +0000 (03:21 +0000)]

am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 64b83ce632 am: 346da07c80 am: 78a44d4726 am: 8abc959461 am: 6060c10580 am: 9d494757cf
am: daf82e6d8c

* commit 'daf82e6d8c35b1b09dfce13998eb77ddb7840622':

commit | commitdiff | tree

Mathew Inwood [Tue, 20 Oct 2015 03:21:35 +0000 (03:21 +0000)]

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 am: 3b678d2e58
am: e147ed8705

* commit 'e147ed87056f616c4798eb243615f6f9de5380e9':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 03:21:31 +0000 (03:21 +0000)]

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 am: b897ea777e
am: f5e5e1270d

* commit 'f5e5e1270d7186ccbca50a8515145d01c5cf2689':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 03:21:28 +0000 (03:21 +0000)]

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 am: bf4e852f95
am: 5c02e22455

* commit '5c02e224552e9df198bd49b4c82906c6078999a2':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 03:21:23 +0000 (03:21 +0000)]

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 am: 65f484b1fc
am: 7c811ecaaf

* commit '7c811ecaaf91dc102e45d9055e91270d04140c29':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:21:19 +0000 (03:21 +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
am: af265461f1

* commit 'af265461f1c56e3a7adc42f34032f45b8522722a':

commit | commitdiff | tree

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

am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf am: 38bd557502 am: 0442deaee7 am: 5793b647fd
am: f351d2d274

* commit 'f351d2d274ec47bff368fa91b157739c399cda5d':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 03:19:28 +0000 (03:19 +0000)]

am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 149268d869 am: 70aa099f23 am: eadf9b6782 am: 24483f0498 am: a107ef6e13
am: f7f8df9f7c

* commit 'f7f8df9f7c11210c412c07106032c25618911746':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 03:19:25 +0000 (03:19 +0000)]

am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: b1a081221e am: 1bd8f7e460 am: 7661d33379 am: 7e5ec74df0 am: 84138b1523
am: e90e2b89bb

* commit 'e90e2b89bb19f8eff4a878816c4501094bb18048':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 03:19:22 +0000 (03:19 +0000)]

am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d am: 27b99c86e9 am: 078afac399 am: 94b7ee378f am: 6b7a1631f6
am: 753cf130b9

* commit '753cf130b9e1e1b840a4aead09a00f31011bb55f':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 03:19:19 +0000 (03:19 +0000)]

am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 64b83ce632 am: 346da07c80 am: 78a44d4726 am: 8abc959461 am: 6060c10580
am: 9d494757cf

* commit '9d494757cfb8b7ecc9766425d787661857506bb2':

commit | commitdiff | tree

Mathew Inwood [Tue, 20 Oct 2015 03:19:16 +0000 (03:19 +0000)]

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
am: 3b678d2e58

* commit '3b678d2e58d57e05bcb1d6c9213dadcffec1a181':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 03:19:13 +0000 (03:19 +0000)]

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
am: b897ea777e

* commit 'b897ea777eb4b889122a5f2f9604f36ef6ee182f':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 03:19:10 +0000 (03:19 +0000)]

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
am: bf4e852f95

* commit 'bf4e852f95d430bcea11e903337ddae07c013572':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 03:19:06 +0000 (03:19 +0000)]

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
am: 65f484b1fc

* commit '65f484b1fc2c0a7b41478fabf5a0321443df7ab8':

commit | commitdiff | tree

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 02:06:02 +0000 (02:06 +0000)]

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

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 02:05:57 +0000 (02:05 +0000)]

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

* commit '22c5b7f57d64cdcc38682cb1605a42faa6e1f104':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 02:05:50 +0000 (02:05 +0000)]

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

* commit '1115f891dd6fe65078c50ef9c6ac9b1ce415d082':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 02:05:46 +0000 (02:05 +0000)]

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

* commit 'f616a8e2d14fa05ccc5c6e73ca57e9f454b7fd92':

commit | commitdiff | tree

Mathew Inwood [Tue, 20 Oct 2015 02:05:40 +0000 (02:05 +0000)]

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

* commit 'd2688e3c3aaadc96e99f6b1c935140f1821818e0':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 02:05:26 +0000 (02:05 +0000)]

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

* commit '8d9f5baea199ac79746d1467a5838b8a21dc040d':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 02:05:23 +0000 (02:05 +0000)]

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

* commit 'f882fb27b75fbfe76cb2321d0706f5aae28c828b':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 02:05:19 +0000 (02:05 +0000)]

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

* commit 'd566d24f650d44765c47ac7db86532bace621181':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 02:05:15 +0000 (02:05 +0000)]

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

* commit '1497b879e4cc9845a1a424fa51a89f7cbdfe1a5a':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 02:05:09 +0000 (02:05 +0000)]

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

* commit '6dc5663ab3df6633278a04e9a4a23447b896062b':

commit | commitdiff | tree

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

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

* commit '58de3e8c64c7f102c1c940b75f71ee5ab8071177':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 01:49:49 +0000 (01:49 +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
am: cd4afe29cb

* commit 'cd4afe29cb500d53c1fe77f93def97b2f11e0205':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 01:49:46 +0000 (01:49 +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
am: 11164db134

* commit '11164db134012c57d41f58b7a88544b50f5c1729':

commit | commitdiff | tree

Ian Parkinson [Tue, 20 Oct 2015 01:49:43 +0000 (01:49 +0000)]

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

* commit '0317b768f6adf7c3b6bf5bd969fe8af62177957a':

commit | commitdiff | tree

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

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

* commit '254e7b0a725ed655a0be25a63823b55b704d7579':

commit | commitdiff | tree

Kenny Guy [Tue, 20 Oct 2015 01:49:36 +0000 (01:49 +0000)]

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

* commit 'afc9a931cbabf849d79d55cc6bcd4dda6e728821':

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

Adam Cohen [Tue, 20 Oct 2015 01:49:31 +0000 (01:49 +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
am: d077b9d137

* commit 'd077b9d13700e9ce2271cb557b8788185ad2bbe9':

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

Bjorn Bringert [Tue, 20 Oct 2015 01:49:27 +0000 (01:49 +0000)]

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

* commit 'bd92113aa4b4f39c1e958985bdc5fe5b0ce3c254':

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

Sunny Goyal [Tue, 20 Oct 2015 01:49:22 +0000 (01:49 +0000)]

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

* commit 'dcb93ff314b957e371ba0cc8822486e840850956':

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

Baligh Uddin [Tue, 20 Oct 2015 01:49:17 +0000 (01:49 +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
am: 8c0efbe340 -s ours

* commit '8c0efbe340110eef9b0b3d4fcd471bcc053f1ef9':

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

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

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

* commit 'd5f09732299961917af57c4c1836d74e3f9ec2be':

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

Sunny Goyal [Tue, 20 Oct 2015 01:49:07 +0000 (01:49 +0000)]

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

* commit '9e095af39498d14298fcaa3e11c8c303d0863541':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 01:49:02 +0000 (01:49 +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
am: 48431f52c2

* commit '48431f52c238c8a987d905546d265d1ac88e2cce':

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

Baligh Uddin [Tue, 20 Oct 2015 01:48:55 +0000 (01:48 +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
am: 909bcceeb4 -s ours

* commit '909bcceeb449284823d8fdbe4556f89b96577d75':

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

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

am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf am: 38bd557502 am: 0442deaee7
am: 5793b647fd

* commit '5793b647fd5a187a3e0e4257fb23b6cb611fd14c':

commit | commitdiff | tree

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

am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 149268d869 am: 70aa099f23 am: eadf9b6782 am: 24483f0498
am: a107ef6e13

* commit 'a107ef6e13b142d1eaffe879aa31d76292e357c3':

commit | commitdiff | tree

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

am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: b1a081221e am: 1bd8f7e460 am: 7661d33379 am: 7e5ec74df0
am: 84138b1523

* commit '84138b152312dcdcfa387a797dbc7eca3bee7d6f':

commit | commitdiff | tree

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

am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d am: 27b99c86e9 am: 078afac399 am: 94b7ee378f
am: 6b7a1631f6

* commit '6b7a1631f65318c70ec77c54d1acd532af19711d':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 01:31:23 +0000 (01:31 +0000)]

am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 64b83ce632 am: 346da07c80 am: 78a44d4726 am: 8abc959461
am: 6060c10580

* commit '6060c10580453fcc74b6e6c49c3eccb16f3c46cc':

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

Mathew Inwood [Tue, 20 Oct 2015 01:31:19 +0000 (01:31 +0000)]

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

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

Juan Silveira [Tue, 20 Oct 2015 01:31:16 +0000 (01:31 +0000)]

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

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

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

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

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 Skory [Tue, 20 Oct 2015 01:31:09 +0000 (01:31 +0000)]

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

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

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

am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf am: 38bd557502
am: 0442deaee7

* commit '0442deaee7de92a0e6e929de53845bb165fb3562':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 01:13:24 +0000 (01:13 +0000)]

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

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 01:13:21 +0000 (01:13 +0000)]

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

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 01:13:18 +0000 (01:13 +0000)]

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

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 01:13:15 +0000 (01:13 +0000)]

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

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

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

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

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

Juan Silveira [Tue, 20 Oct 2015 01:13:09 +0000 (01:13 +0000)]

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

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

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

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

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

packages/apps/Trebuchet

RSS Atom

About OSDN

Find Software

Develop Software

Help