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

Juan Silveira [Tue, 20 Oct 2015 02:23:54 +0000 (02:23 +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
am: 608f1ee85e

* commit '608f1ee85e8b80710b3c60119480dd1241eed9a9':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 02:23:48 +0000 (02:23 +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
am: c314292efc

* commit 'c314292efc6a0561af311dbbde90a24129c3d605':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 02:23:42 +0000 (02:23 +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
am: b0436f294f

* commit 'b0436f294f98545b3256dcbd15e5907539ee4cd9':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 02:23:37 +0000 (02:23 +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
am: 02173b0c65

* commit '02173b0c652488da5905c852f8b7870a5b2d5843':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 02:23:31 +0000 (02:23 +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
am: f5437de749

* commit 'f5437de7499125fde5cd318d3000e7d53802eb79':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 02:06:36 +0000 (02:06 +0000)]

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

* commit 'b161e4e46eea6e458f5cb2e1801063b153f5ad8b':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 02:06:32 +0000 (02:06 +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
am: 2e1d9295f5

* commit '2e1d9295f5953f5bed9c641f3f2ea25eb698f003':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 02:06:29 +0000 (02:06 +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
am: a6e267f851

* commit 'a6e267f851a84919c655ca5084e7e673f5eb0ac0':

commit | commitdiff | tree

Ian Parkinson [Tue, 20 Oct 2015 02:06:26 +0000 (02:06 +0000)]

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

* commit '1f177aee96763dbd08f25c7af1bd9c0049299593':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 02:06:22 +0000 (02:06 +0000)]

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

* commit '7ad63c2b1e356ca659ab62e4d9c39298ccbf593a':

commit | commitdiff | tree

Kenny Guy [Tue, 20 Oct 2015 02:06:18 +0000 (02:06 +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
am: 37ad5ed201

* commit '37ad5ed201a3b5e6caa9933be3702adf4b877150':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 02:06:14 +0000 (02:06 +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
am: 9a4f2f42c9

* commit '9a4f2f42c9a6518002547fff05109c9d8b110a6f':

commit | commitdiff | tree

Bjorn Bringert [Tue, 20 Oct 2015 02:06:10 +0000 (02:06 +0000)]

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

* commit '6a8773d116a88b3ecc8ee97de5934635b4b0b7c7':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 02:06:04 +0000 (02:06 +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
am: 152a252bcb

* commit '152a252bcb810910171065e9e26e6047382b0839':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 02:05:57 +0000 (02:05 +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
am: 04e030ea81 -s ours

* commit '04e030ea81ad4beb16e93e02aa71049387645741':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 02:05:52 +0000 (02:05 +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
am: fd58ec9eff

* commit 'fd58ec9eff0481782d1f4d1611a5cc4bc1ddabe6':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 02:05:46 +0000 (02:05 +0000)]

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

* commit '40811df9d4da51c73b97ac0dbb439aefae2fa09e':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 02:05:41 +0000 (02:05 +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
am: 99ee66568b

* commit '99ee66568bb94e2d4f4392101a1a9eb32c086c83':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 02:05:28 +0000 (02:05 +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
am: 522d4ac6fe -s ours

* commit '522d4ac6fe7e174b24e01fa7764ca7cfba2c2f12':

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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