Adam Cohen
e2762cdfd1
am 0bee73c0: am da8522d9: am 9556fb17: am 1c4547bd: Merge "Polishing the AllApps transition" into ub-now-porkchop
...
* commit '0bee73c07d4662a2b96b56e8667d3e7efb4c188c':
2015-01-31 06:21:18 +00:00
Mark Brophy
3b6ec31ae2
am 7cb3e3f6: am 287d82f1: am 37d1c0e1: am fd449c88: Make GEL not crashloop.
...
* commit '7cb3e3f64e8b11527251dd03bb09d8bb0c47f488':
2015-01-31 06:21:17 +00:00
Dharmesh Mokani
1a28297e2b
am c8b8b95f: am c59a9a3d: am 597a8ec8: am 6075170b: Changes corresponding to framework changes.
...
* commit 'c8b8b95fc108263dfe9882de56fa6f154aa69eb8':
2015-01-31 06:21:16 +00:00
Adam Cohen
195bccd538
am 55bd525f: am 90576659: am 382d8606: am 36f82a32: Merge "Fix screen issues with externally added items" into ub-now-porkchop
...
* commit '55bd525f309fc5d9f77373358ff4fbcd9a092ffb':
2015-01-31 06:21:15 +00:00
Adam Cohen
0f72149abd
am f309204c: am c000a50b: am b6c156fe: am a66233ae: Merge "Add partner customization option to force first run flow" into ub-now-porkchop
...
* commit 'f309204cda5a7461b8fb62af48b09f44047310ea':
2015-01-31 06:21:14 +00:00
Adam Cohen
457cc4e898
am a5b51c6d: am c162dc41: am d78df107: am a388a146: Make com.android.launcher3.action.FIRST_LOAD_COMPLETE protectable on both sides
...
* commit 'a5b51c6dfcd6b7139133c1ea6b7ee81d457ccf30':
2015-01-31 06:21:13 +00:00
Adam Cohen
ed54920d3e
am e5e51b72: am 3bc137eb: am 1464bd1a: am fe9da818: Fix for issue 16736964
...
* commit 'e5e51b7243e8ba7ef7041f7c4ed95467860f13cd':
2015-01-31 06:21:12 +00:00
Kenny Guy
178cfb7b72
am c4f29aa1: am 1679e1ec: am 2f127c8a: am f07af7b7: Launch app details for correct profile.
...
* commit 'c4f29aa149865950446f105085161bac200b21c9':
2015-01-31 06:21:11 +00:00
Sunny Goyal
49138bba1d
am f59a3dd2: am d35136fb: am cdaaec52: am e755d469: Implementing a package install progress listener for L
...
* commit 'f59a3dd2d0931d877e76ccb2952a1e6f01c259cf':
2015-01-31 06:21:09 +00:00
Adam Cohen
b7691df987
am bbdd3ebd: am 8562283a: am 2b69b70d: am c5b6ac72: am 2d7e7eda: Fix resource issue in folders of partner layouts
...
* commit 'bbdd3ebd312f03343d58f8d2ee7918960363bfb6':
2015-01-31 06:21:08 +00:00
Geoff Mendal
6f719cf3d7
am f9525ebc: (-s ours) am 61677b41: (-s ours) am 1bcebeae: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f9525ebcdefb40a003e872a3a6f3a48374699eeb':
Import translations. DO NOT MERGE
fix build
fix build
Remove dependencies on FloatMath
Update protobuf library from 2.3 to 2.6.
Import translations. DO NOT MERGE
Fix overlapping pages (issue 12551580)
Properly saving migration cling keys.
Tightening migration conditions. (Bug 11973614)
Import translations. DO NOT MERGE
Fix build
Import translations. DO NOT MERGE
Initial empty repository
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
override Launcher2 (aosp)
2015-01-31 06:21:07 +00:00
Adam Cohen
0bee73c07d
am da8522d9: am 9556fb17: am 1c4547bd: Merge "Polishing the AllApps transition" into ub-now-porkchop
...
* commit 'da8522d929d79be0149112717d2ad1113209919b':
2015-01-31 02:01:06 +00:00
Mark Brophy
7cb3e3f64e
am 287d82f1: am 37d1c0e1: am fd449c88: Make GEL not crashloop.
...
* commit '287d82f183516396d03463704494bb51bd6668ec':
2015-01-31 02:01:05 +00:00
Dharmesh Mokani
c8b8b95fc1
am c59a9a3d: am 597a8ec8: am 6075170b: Changes corresponding to framework changes.
...
* commit 'c59a9a3db29fdee3ad85d6b94f899a49075206f9':
2015-01-31 02:01:03 +00:00
Adam Cohen
55bd525f30
am 90576659: am 382d8606: am 36f82a32: Merge "Fix screen issues with externally added items" into ub-now-porkchop
...
* commit '905766591d30f6dacc325d37a4d098a05a49f6e1':
2015-01-31 02:01:02 +00:00
Adam Cohen
f309204cda
am c000a50b: am b6c156fe: am a66233ae: Merge "Add partner customization option to force first run flow" into ub-now-porkchop
...
* commit 'c000a50baaf7d31b4fcf0d83e3b70b1a546876e2':
2015-01-31 02:01:01 +00:00
Adam Cohen
a5b51c6dfc
am c162dc41: am d78df107: am a388a146: Make com.android.launcher3.action.FIRST_LOAD_COMPLETE protectable on both sides
...
* commit 'c162dc410bdd66a695a1eff058f7280f04001ea4':
2015-01-31 02:00:59 +00:00
Adam Cohen
e5e51b7243
am 3bc137eb: am 1464bd1a: am fe9da818: Fix for issue 16736964
...
* commit '3bc137eb1fbe037b788c13a79a0e56e4088bebe8':
2015-01-31 02:00:58 +00:00
Kenny Guy
c4f29aa149
am 1679e1ec: am 2f127c8a: am f07af7b7: Launch app details for correct profile.
...
* commit '1679e1ec0111245c168e6f240b69f3925158755e':
2015-01-31 02:00:56 +00:00
Sunny Goyal
f59a3dd2d0
am d35136fb: am cdaaec52: am e755d469: Implementing a package install progress listener for L
...
* commit 'd35136fbe98909fb5c8105467acdd1570fb77fd1':
2015-01-31 02:00:55 +00:00
Adam Cohen
bbdd3ebd31
am 8562283a: am 2b69b70d: am c5b6ac72: am 2d7e7eda: Fix resource issue in folders of partner layouts
...
* commit '8562283acdb08fb4a68c23b78789d9e75e5f1fb6':
2015-01-31 02:00:53 +00:00
Geoff Mendal
f9525ebcde
am 61677b41: (-s ours) am 1bcebeae: (-s ours) Import translations. DO NOT MERGE
...
* commit '61677b41eb12afd0d6950771d5a18f1d33e339be':
Import translations. DO NOT MERGE
2015-01-31 02:00:51 +00:00
Adam Cohen
da8522d929
am 9556fb17: am 1c4547bd: Merge "Polishing the AllApps transition" into ub-now-porkchop
...
* commit '9556fb17c32f9c8e40406bb522bf068885ddedf9':
2015-01-31 01:07:25 +00:00
Mark Brophy
287d82f183
am 37d1c0e1: am fd449c88: Make GEL not crashloop.
...
* commit '37d1c0e1ab5fd4c8b35e388dd3740d3d5c627811':
2015-01-31 01:07:24 +00:00
Dharmesh Mokani
c59a9a3db2
am 597a8ec8: am 6075170b: Changes corresponding to framework changes.
...
* commit '597a8ec85ce6dab28e110f63bbd44b270675304b':
2015-01-31 01:07:23 +00:00
Adam Cohen
905766591d
am 382d8606: am 36f82a32: Merge "Fix screen issues with externally added items" into ub-now-porkchop
...
* commit '382d8606869c777fedc570494dfe6a698e5a1edd':
2015-01-31 01:07:22 +00:00
Adam Cohen
c000a50baa
am b6c156fe: am a66233ae: Merge "Add partner customization option to force first run flow" into ub-now-porkchop
...
* commit 'b6c156fe19394c43c96a98c1fbb1fa4cfa5a91a6':
2015-01-31 01:07:21 +00:00
Adam Cohen
c162dc410b
am d78df107: am a388a146: Make com.android.launcher3.action.FIRST_LOAD_COMPLETE protectable on both sides
...
* commit 'd78df1079864076a2fcded5133f8d7a281036db1':
2015-01-31 01:07:20 +00:00
Adam Cohen
3bc137eb1f
am 1464bd1a: am fe9da818: Fix for issue 16736964
...
* commit '1464bd1a597f945e00b7342852728aab78dfdf95':
2015-01-31 01:07:19 +00:00
Kenny Guy
1679e1ec01
am 2f127c8a: am f07af7b7: Launch app details for correct profile.
...
* commit '2f127c8a1cb78e07279d5dbd19f8a002a3279c01':
2015-01-31 01:07:18 +00:00
Sunny Goyal
d35136fbe9
am cdaaec52: am e755d469: Implementing a package install progress listener for L
...
* commit 'cdaaec521a82381a9dd190427b4023822e9e9abb':
2015-01-31 01:07:14 +00:00
Adam Cohen
8562283acd
am 2b69b70d: am c5b6ac72: am 2d7e7eda: Fix resource issue in folders of partner layouts
...
* commit '2b69b70d7cb2a1c67b527f094820fb3497a3709f':
2015-01-31 01:07:12 +00:00
Geoff Mendal
61677b41eb
am 1bcebeae: (-s ours) Import translations. DO NOT MERGE
...
* commit '1bcebeae71856c360972b86e1a22d53113bb3cc0':
Import translations. DO NOT MERGE
2015-01-31 01:07:10 +00:00
Nick Kralevich
ce0117dc59
fix build
...
Bug: 18040469
Change-Id: I24db4d3f4b7ee10ecf5a2c65035ce112271539fb
2015-01-30 14:24:47 -08:00
Nick Kralevich
6c5b4a9420
fix build
...
Bug: 18040469
Change-Id: I2938c7b950470eeacfb20391f109ae44d95060c7
2015-01-30 14:24:40 -08:00
Jeff Davidson
bfb285b47f
am 19a443e4: Merge "Update protobuf library from 2.3 to 2.6."
...
* commit '19a443e4e8bf3d37e544eda2c407604616cdae9d':
Update protobuf library from 2.3 to 2.6.
2015-01-12 19:51:58 +00:00
Jeff Davidson
19a443e4e8
Merge "Update protobuf library from 2.3 to 2.6."
2015-01-12 19:37:47 +00:00
The Android Automerger
4a6287da0f
merge in ub-now-queens-release history after reset to ub-now-queens
2014-12-09 01:22:44 +00:00
Geoff Mendal
e578ad8d93
Import translations. DO NOT MERGE
...
Change-Id: I5afb7119527734723b3bd4e35e66844b62f74d95
Auto-generated-cl: translation import
2014-12-08 11:16:09 -08:00
Adam Cohen
0250945759
Avoid db exception on L and above
...
Bug 18554839
Change-Id: I43f391b7cc376f697ce7b5b363e8be3aa85814b5
2014-12-04 10:35:52 -08:00
Adam Cohen
2975e34145
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
2014-12-04 18:17:52 +00:00
Adam Cohen
d2285942dd
Merge "Ignoring specific db exception DO NOT MERGE" into ub-now-porkchop
2014-12-04 18:14:22 +00:00
Winson Chung
18ce985698
Ignoring specific db exception DO NOT MERGE
...
Bug 18554839.
Change-Id: I80f2dd62297eea671f2d129ae22263e72e506ae4
(cherry picked from commit 5f05913f71 )
2014-12-04 10:04:30 -08:00
The Android Automerger
5e21d583c8
merge in ub-now-queens-release history after reset to ub-now-queens
2014-12-04 17:56:30 +00:00
Adam Cohen
e6673dc1fa
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
2014-12-04 17:34:10 +00:00
Adam Cohen
268b8907d1
Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
...
Bug: 18567716
Change-Id: I656e869b8553d650916c2abe6dc83282c8b6fd65
(cherry picked from commit 5c18b80ed9 )
2014-12-04 17:21:12 +00:00
Geoff Mendal
2f805f0d00
Merge "Import translations. DO NOT MERGE" into ub-now-queens
2014-12-04 05:28:02 +00:00
Geoff Mendal
917a33eb1a
Import translations. DO NOT MERGE
...
Change-Id: If32589149a2b776b668510662360e04aa66ade88
Auto-generated-cl: translation import
2014-12-03 11:01:37 -08:00
Sunny Goyal
f204877999
Fixing wrong package check when adding shortcuts
...
Bug: 18571789,18535867
Change-Id: I2544fa634879846d812b00f8649520400f66d29e
2014-12-03 22:32:46 +05:30
Adam Cohen
5c18b80ed9
Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
...
Bug: 18567716
Change-Id: I656e869b8553d650916c2abe6dc83282c8b6fd65
2014-12-02 15:40:19 -08:00