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

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

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

Adam Skory [Tue, 20 Oct 2015 01:13:00 +0000 (01:13 +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

* commit 'b523cc1e4f258fe4bd4d1ab1f78d97daceae239e':

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

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

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

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

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

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

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

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

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

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

am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568 am: cb168d34ae
am: 616facd74b

* commit '616facd74bea28fd88c2da240159cd87ec1972a5':

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 Skory [Tue, 20 Oct 2015 00:54:42 +0000 (00:54 +0000)]

am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 5cc929caa0 am: 5c597e4aba
am: 1dda00996a

* commit '1dda00996a7a99d19e0edc71d5314c99806e61c1':

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

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

am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568
am: cb168d34ae

* commit 'cb168d34aef2da06f5d9110a07ceeca82b72f41d':

commit | commitdiff | tree

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

am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 5cc929caa0
am: 5c597e4aba

* commit '5c597e4abaec26e4fa715f93f0f7db688cc07d0d':

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

commit | commitdiff | tree

Ian Parkinson [Tue, 20 Oct 2015 00:29:04 +0000 (00:29 +0000)]

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

* commit '3d78b80ecdfeec7704b2aa82ce39823fa903ea61':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 00:28:59 +0000 (00:28 +0000)]

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

* commit '49e2f10ee205d6190f0d4c589ba31b6763e9b0d3':

commit | commitdiff | tree

Kenny Guy [Tue, 20 Oct 2015 00:28:53 +0000 (00:28 +0000)]

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

* commit '5f2a520f0cd47b274bdf809d7b665c956c2717ed':

commit | commitdiff | tree

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

am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am: 0274f0a568

* commit '0274f0a568fed5aa57d0c40acfb74bea67cba29a':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 00:28:44 +0000 (00:28 +0000)]

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

* commit '91c11b28d57c026d507488c58feedebf7fee6f31':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 00:28:39 +0000 (00:28 +0000)]

am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am: 5cc929caa0

* commit '5cc929caa0922e0b80dbf3f6c099d841c3797c20':

commit | commitdiff | tree

Bjorn Bringert [Tue, 20 Oct 2015 00:28:36 +0000 (00:28 +0000)]

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

* commit 'c656245b9cbc370537afb18e7fb38ea87c233fd1':

commit | commitdiff | tree

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

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

* commit '2b8dbe3a5f5f673e87aa4b13133a4d3bf2b98b3c':
  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

Sunny Goyal [Tue, 20 Oct 2015 00:28:30 +0000 (00:28 +0000)]

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

* commit 'e7599d694313845a41221dfa0d7f6dca3aedd02c':

commit | commitdiff | tree

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

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

* commit '8dc2ca68c1ccf1570caec3e52c2671b323cf7102':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 00:28:25 +0000 (00:28 +0000)]

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

* commit 'ab474588ce7d9cddff2b2dc0a2fd91b4ae532e05':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 00:28:23 +0000 (00:28 +0000)]

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

* commit 'a2bc37722e9fa0af9d67986038aec58af5308771':

commit | commitdiff | tree

Sunny Goyal [Tue, 20 Oct 2015 00:28:19 +0000 (00:28 +0000)]

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

* commit 'e43f0d646c60c6f59333224686725717cdf2ccbc':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 00:28:15 +0000 (00:28 +0000)]

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

* commit '6cb8ae4c16cb3b0105ebfbb23be23e0fb1131496':

commit | commitdiff | tree

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

am f876301d: UI Fixes
am: 501414523e

* commit '501414523ef1e3dc394746ea01489a934e826865':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 00:28:10 +0000 (00:28 +0000)]

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

* commit '7c9f33481fd3c063495813b2772e198ed696e3ce':

commit | commitdiff | tree

Adam Cohen [Tue, 20 Oct 2015 00:28:06 +0000 (00:28 +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

* commit 'cb20616a180de2855cc35e6c1ce8dfb8082ea41c':

commit | commitdiff | tree

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

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

* commit '56ca86b7c177fd6fb330d6cb3631070e8689cd87':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 00:28:01 +0000 (00:28 +0000)]

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

* commit '07130d400c52518e413e58334525f1598c3b8f1a':

commit | commitdiff | tree

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

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

* commit '6317598a196ada3f32950c7f4a8d5cfe005acf42':

commit | commitdiff | tree

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

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

* commit 'd0642c4274abcbede9177d61b0f072689db889a9':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 00:27:51 +0000 (00:27 +0000)]

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

* commit '853b55b96e4af7a4f949a22cc084bd333e528c1c':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 00:27:43 +0000 (00:27 +0000)]

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

* commit '9e3ebf3c95fbf4b7a96b6080802ca23e5098fe40':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 00:27:39 +0000 (00:27 +0000)]

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

* commit '381fa3fb2d990f7976a898c16f3675dbb325b848':

commit | commitdiff | tree

The Android Automerger [Tue, 3 Feb 2015 17:05:59 +0000 (09:05 -0800)]

merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev

commit | commitdiff | tree

Nick Kralevich [Sat, 18 Oct 2014 13:57:06 +0000 (06:57 -0700)]

fix build

Bug: 18040469
Change-Id: I24db4d3f4b7ee10ecf5a2c65035ce112271539fb

commit | commitdiff | tree

Nick Kralevich [Sat, 18 Oct 2014 15:14:09 +0000 (08:14 -0700)]

fix build

Bug: 18040469
Change-Id: I2938c7b950470eeacfb20391f109ae44d95060c7

commit | commitdiff | tree

The Android Automerger [Tue, 9 Dec 2014 01:22:44 +0000 (01:22 +0000)]

merge in ub-now-queens-release history after reset to ub-now-queens

commit | commitdiff | tree

Geoff Mendal [Mon, 8 Dec 2014 19:16:09 +0000 (11:16 -0800)]

Import translations. DO NOT MERGE

Change-Id: I5afb7119527734723b3bd4e35e66844b62f74d95
Auto-generated-cl: translation import

commit | commitdiff | tree

Adam Cohen [Thu, 4 Dec 2014 18:34:57 +0000 (10:34 -0800)]

Avoid db exception on L and above

Bug 18554839

Change-Id: I43f391b7cc376f697ce7b5b363e8be3aa85814b5

commit | commitdiff | tree

Adam Cohen [Thu, 4 Dec 2014 18:17:52 +0000 (18:17 +0000)]

am d2285942: (-s ours) Merge "Ignoring specific db exception DO NOT MERGE" into ub-now-porkchop

* commit 'd2285942dde8f2633f1d79abc01e598da7925090':
Ignoring specific db exception DO NOT MERGE

commit | commitdiff | tree

Adam Cohen [Thu, 4 Dec 2014 18:14:22 +0000 (18:14 +0000)]

Merge "Ignoring specific db exception DO NOT MERGE" into ub-now-porkchop

commit | commitdiff | tree

Winson Chung [Mon, 1 Dec 2014 23:05:17 +0000 (15:05 -0800)]

Ignoring specific db exception DO NOT MERGE

Bug 18554839.

Change-Id: I80f2dd62297eea671f2d129ae22263e72e506ae4
(cherry picked from commit 5f05913f71da68a6c406f905ec6979586e3ba27a)

commit | commitdiff | tree

The Android Automerger [Thu, 4 Dec 2014 17:56:30 +0000 (17:56 +0000)]

merge in ub-now-queens-release history after reset to ub-now-queens

commit | commitdiff | tree

Adam Cohen [Thu, 4 Dec 2014 17:34:10 +0000 (17:34 +0000)]

am 268b8907: Ensure that FirstFrameAnimatorHelper doesn\'t set play time when animation is complete

* commit '268b8907d1f2fcf9775880c69899b3c6fbe85ea3':
Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete

commit | commitdiff | tree

Adam Cohen [Tue, 2 Dec 2014 23:24:52 +0000 (15:24 -0800)]

Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete

Bug: 18567716

Change-Id: I656e869b8553d650916c2abe6dc83282c8b6fd65
(cherry picked from commit 5c18b80ed9aaa57b27b56667e3699fd76bcce8ed)

commit | commitdiff | tree

Geoff Mendal [Thu, 4 Dec 2014 05:28:01 +0000 (05:28 +0000)]

Merge "Import translations. DO NOT MERGE" into ub-now-queens

commit | commitdiff | tree

Geoff Mendal [Wed, 3 Dec 2014 19:01:37 +0000 (11:01 -0800)]

Import translations. DO NOT MERGE

Change-Id: If32589149a2b776b668510662360e04aa66ade88
Auto-generated-cl: translation import

commit | commitdiff | tree

Sunny Goyal [Wed, 3 Dec 2014 08:55:16 +0000 (14:25 +0530)]

Fixing wrong package check when adding shortcuts

Bug: 18571789,18535867
Change-Id: I2544fa634879846d812b00f8649520400f66d29e

commit | commitdiff | tree

Adam Cohen [Tue, 2 Dec 2014 23:24:52 +0000 (15:24 -0800)]

Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete

Bug: 18567716

Change-Id: I656e869b8553d650916c2abe6dc83282c8b6fd65

commit | commitdiff | tree

The Android Automerger [Tue, 2 Dec 2014 10:20:40 +0000 (10:20 +0000)]

merge in ub-now-queens-release history after reset to ub-now-queens

commit | commitdiff | tree

Winson Chung [Tue, 2 Dec 2014 00:30:45 +0000 (00:30 +0000)]

Merge "Ignoring specific db exception to workaround Bug. 18554839." into ub-now-queens

commit | commitdiff | tree

Winson Chung [Mon, 1 Dec 2014 23:05:17 +0000 (15:05 -0800)]

Ignoring specific db exception to workaround Bug. 18554839.

Change-Id: I80f2dd62297eea671f2d129ae22263e72e506ae4

commit | commitdiff | tree

Chris Wren [Mon, 24 Nov 2014 21:57:54 +0000 (16:57 -0500)]

Don't try to create an app state instance during restore.

Added a static utility function to get the DeviceProfile instead.

Bug: 18504164
Change-Id: Ia510a84f1c195e58acf3bf4d1f6a42c739fdd413

packages/apps/Trebuchet

RSS Atom

About OSDN

Find Software

Develop Software

Help