Brian Parfett
1bc1ae6714
Updating version codes from L to LOLLIPOP
...
This is required so Launcher3 can compile within IntelliJ.
Change-Id: I99a98a6d2326a8f8b0f0320430de9b555ea430c6
Bugs: b/18720914
2014-12-12 12:30:00 -08:00
Geoff Mendal
1c34c828ae
Import translations. DO NOT MERGE
...
Change-Id: Id66a36209915e770779ef3c41cf18135c5180ac3
Auto-generated-cl: translation import
2014-12-10 07:43:52 -08: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
Geoff Mendal
0cca76c594
Import translations. DO NOT MERGE
...
Change-Id: I3eb761fffcf27ceb4d79749da589dbaa9e7b9444
Auto-generated-cl: translation import
2014-12-08 11:15:42 -08:00
Adam Cohen
30914ad14d
Merge "Supporting custom widgets provided by launcher" into ub-now-master
2014-12-06 00:22:43 +00:00
Adam Cohen
5940042d39
Supporting custom widgets provided by launcher
...
-> This change provides integration for widgets provided by
the launcher package which can run arbitrary code.
Change-Id: I6052da5c4afed7ee72e3b44d045b9c46f2d84c42
2014-12-05 16:18:41 -08:00
Adam Cohen
396628876d
am 02509457: Avoid db exception on L and above
...
* commit '0250945759f7ac58aab912448d62dc108b1770c5':
Avoid db exception on L and above
2014-12-04 18:43:49 +00: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
6948580a1c
am 2975e341: (-s ours) am d2285942: (-s ours) Merge "Ignoring specific db exception DO NOT MERGE" into ub-now-porkchop
...
* commit '2975e34145b38e44dc8a7def2617e3fe0d15321d':
Ignoring specific db exception DO NOT MERGE
2014-12-04 18:24:26 +00: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
0887c18179
am e6673dc1: am 268b8907: Ensure that FirstFrameAnimatorHelper doesn\'t set play time when animation is complete
...
* commit 'e6673dc1fa94945925f4097f88dc2f5264c4316d':
Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
2014-12-04 17:37:27 +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
cff9ddaff3
am 2f805f0d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-queens
...
* commit '2f805f0d00b6521d6f6be25b615b3aff1b8f621d':
Import translations. DO NOT MERGE
2014-12-04 15:15:45 +00:00
Sunny Goyal
ded38dfd28
am f2048779: Fixing wrong package check when adding shortcuts
...
* commit 'f2048779990bfd3c20b52149f5e8ab208bf2502a':
Fixing wrong package check when adding shortcuts
2014-12-04 15:15:44 +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
Geoff Mendal
3672c18614
Import translations. DO NOT MERGE
...
Change-Id: I417c78f889994b02bff33793c866af0a1b13d47f
Auto-generated-cl: translation import
2014-12-03 11:00:59 -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
4a5898753b
am 5c18b80e: Ensure that FirstFrameAnimatorHelper doesn\'t set play time when animation is complete
...
* commit '5c18b80ed9aaa57b27b56667e3699fd76bcce8ed':
Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
2014-12-02 23:55:48 +00:00
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
The Android Automerger
5481aab2d6
merge in ub-now-queens-release history after reset to ub-now-queens
2014-12-02 10:20:40 +00:00
Winson Chung
653af821ea
am 1c96028f: Merge "Ignoring specific db exception to workaround Bug. 18554839." into ub-now-queens
...
* commit '1c96028f414f904b90c1a180a537021a6a3eceff':
Ignoring specific db exception to workaround Bug. 18554839.
2014-12-02 00:35:51 +00:00
Winson Chung
1c96028f41
Merge "Ignoring specific db exception to workaround Bug. 18554839." into ub-now-queens
2014-12-02 00:30:46 +00:00
Winson Chung
5f05913f71
Ignoring specific db exception to workaround Bug. 18554839.
...
Change-Id: I80f2dd62297eea671f2d129ae22263e72e506ae4
2014-12-01 15:06:47 -08:00
Chris Wren
c080912591
am b02e611d: Don\'t try to create an app state instance during restore.
...
* commit 'b02e611d15bd6fbb05814adaa804dd68181c556c':
Don't try to create an app state instance during restore.
2014-11-25 15:12:13 +00:00
Chris Wren
b02e611d15
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
2014-11-24 16:57:54 -05:00
Geoff Mendal
593d501724
am ab6527da: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ab6527da412bf944df08429c697f5fcf94f8bb52':
Import translations. DO NOT MERGE
2014-11-24 15:34:02 +00:00
Geoff Mendal
ab6527da41
Import translations. DO NOT MERGE
...
Change-Id: I0d7a075387e2ba2c8b9607620ae1d1197cf5cd99
Auto-generated-cl: translation import
2014-11-24 06:21:53 -08:00
Geoff Mendal
7f4d6d6645
Import translations. DO NOT MERGE
...
Change-Id: Ib839840795a9298d8539b040c5a67366398ed663
Auto-generated-cl: translation import
2014-11-24 06:21:29 -08:00
The Android Automerger
c3f29614ba
merge in ub-now-queens-release history after reset to ub-now-queens
2014-11-24 13:28:30 +00:00
Sunny Goyal
e64b0dfcd0
am 3da888d1: Merge "Disabling auto addition of managed profile shortcuts" into ub-now-queens
...
* commit '3da888d17c020b39ba36dbc99b681bf3339d269f':
Disabling auto addition of managed profile shortcuts
2014-11-21 02:19:26 +00:00
Sunny Goyal
3da888d17c
Merge "Disabling auto addition of managed profile shortcuts" into ub-now-queens
2014-11-21 02:10:10 +00:00
Sunny Goyal
2a66bbf3f0
Disabling auto addition of managed profile shortcuts
...
Bug: 16188104
Change-Id: Ib6464c22140df6d60112eb35f5983718b3db6288
2014-11-20 17:02:24 -08:00
Adam Cohen
6a403370b4
am c254da26: Updating default page indicator asset
...
* commit 'c254da26a607bb0af01915ef441c40dac25ffa09':
Updating default page indicator asset
2014-11-20 23:45:51 +00:00
Adam Cohen
c254da26a6
Updating default page indicator asset
...
Change-Id: If1be59c8c6590125c2347ba2928f61522f15f959
2014-11-20 15:34:03 -08:00
The Android Automerger
273bfa2f28
merge in ub-now-queens-release history after reset to c8f4e1bc88
2014-11-20 23:03:26 +00:00
The Android Automerger
49681a72c4
merge in ub-now-queens-release history after reset to c8f4e1bc88
2014-11-20 17:14:23 +00:00
The Android Automerger
19d05b2ab3
merge in ub-now-queens-release history after reset to c8f4e1bc88
2014-11-20 15:22:28 +00:00
Adam Cohen
8f6f256ac1
am c8f4e1bc: Fix a couple regressions from resetting AppsCustomizeTabHost
...
* commit 'c8f4e1bc88401cad3cc5e439cd08450974d99d81':
Fix a couple regressions from resetting AppsCustomizeTabHost
2014-11-20 14:45:11 +00:00
Adam Cohen
c8f4e1bc88
Fix a couple regressions from resetting AppsCustomizeTabHost
...
Bug 18409435
Bug 18358080
Change-Id: I07a071342b5c5e062ab2bb562b672d93ba0d5c2e
2014-11-19 16:24:12 -08:00
The Android Automerger
9ca138231a
merge in ub-now-queens-release history after reset to 08072c05bf
2014-11-19 23:16:24 +00:00
The Android Automerger
c6e13d2883
merge in ub-now-queens-release history after reset to 08072c05bf
2014-11-19 21:28:24 +00:00
Adam Cohen
295543d9f2
am 08072c05: Prevent multiple workspace state animators from being started
...
* commit '08072c05bf9c760acff653545a795a0fae4bd917':
Prevent multiple workspace state animators from being started
2014-11-19 19:20:24 +00:00
The Android Automerger
9423d0fdf8
merge in ub-now-queens-release history after reset to 08072c05bf
2014-11-19 11:40:47 +00:00
Adam Cohen
08072c05bf
Prevent multiple workspace state animators from being started
...
-> Probably an issue with the way we're wrapping ViewPropertyAnimator
which can lead to us acting like it's valid to have multiple
instances of a VPA. In reality I think this is very problematic.
-> For now, we can just make sure the previous animation is canceled
if it hasn't yet completed.
Bug 18428886
Change-Id: I097eec08ec68ed098e68866fb5eda72734c51b00
2014-11-18 18:18:26 -08:00