summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Removing dead code from Launcher providerSunny Goyal2015-01-051-530/+12
| | | | | | | | | | | > Removing DB upgrade logic for versions before 12. Launcher3 was forked off Launcher2 when DB version was already 12, so, there can never be a lower version of the DB. > Removing logic for auto import of launcher2 DB. This flow had been permanently disabled by a flag, and we show a confirmation prompt/cling before migration Change-Id: I2ac2f21fefc41ee247164566a088927263b09459
* Add syntax option to backup.proto.Dave Hawkey2014-12-191-1/+3
| | | | | | This is required to properly compile the file in google3. Change-Id: Ib9ff3163974a5180797c0ecadb833dae93619b2c
* Updating version codes from L to LOLLIPOPBrian Parfett2014-12-122-2/+2
| | | | | | | This is required so Launcher3 can compile within IntelliJ. Change-Id: I99a98a6d2326a8f8b0f0320430de9b555ea430c6 Bugs: b/18720914
* Import translations. DO NOT MERGEGeoff Mendal2014-12-103-7/+7
| | | | | Change-Id: Id66a36209915e770779ef3c41cf18135c5180ac3 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2014-12-083-7/+7
| | | | | Change-Id: I3eb761fffcf27ceb4d79749da589dbaa9e7b9444 Auto-generated-cl: translation import
* Merge "Supporting custom widgets provided by launcher" into ub-now-masterAdam Cohen2014-12-0626-231/+555
|\
| * Supporting custom widgets provided by launcherAdam Cohen2014-12-0526-231/+555
| | | | | | | | | | | | | | -> This change provides integration for widgets provided by the launcher package which can run arbitrary code. Change-Id: I6052da5c4afed7ee72e3b44d045b9c46f2d84c42
* | am 02509457: Avoid db exception on L and aboveAdam Cohen2014-12-041-4/+2
|\ \ | | | | | | | | | | | | * commit '0250945759f7ac58aab912448d62dc108b1770c5': Avoid db exception on L and above
| * | Avoid db exception on L and aboveAdam Cohen2014-12-041-4/+2
| | | | | | | | | | | | | | | | | | Bug 18554839 Change-Id: I43f391b7cc376f697ce7b5b363e8be3aa85814b5
* | | am 2975e341: (-s ours) am d2285942: (-s ours) Merge "Ignoring specific db ↵Adam Cohen2014-12-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | exception DO NOT MERGE" into ub-now-porkchop * commit '2975e34145b38e44dc8a7def2617e3fe0d15321d': Ignoring specific db exception DO NOT MERGE
| * | am d2285942: (-s ours) Merge "Ignoring specific db exception DO NOT MERGE" ↵Adam Cohen2014-12-040-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into ub-now-porkchop * commit 'd2285942dde8f2633f1d79abc01e598da7925090': Ignoring specific db exception DO NOT MERGE
| | * \ Merge "Ignoring specific db exception DO NOT MERGE" into ub-now-porkchopAdam Cohen2014-12-041-8/+19
| | |\ \
| | | * | Ignoring specific db exception DO NOT MERGEWinson Chung2014-12-041-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 18554839. Change-Id: I80f2dd62297eea671f2d129ae22263e72e506ae4 (cherry picked from commit 5f05913f71da68a6c406f905ec6979586e3ba27a)
* | | | | am e6673dc1: am 268b8907: Ensure that FirstFrameAnimatorHelper doesn\'t set ↵Adam Cohen2014-12-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | play time when animation is complete * commit 'e6673dc1fa94945925f4097f88dc2f5264c4316d': Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
| * | | | am 268b8907: Ensure that FirstFrameAnimatorHelper doesn\'t set play time ↵Adam Cohen2014-12-040-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when animation is complete * commit '268b8907d1f2fcf9775880c69899b3c6fbe85ea3': Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
| | * | | Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is ↵Adam Cohen2014-12-041-3/+5
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | complete Bug: 18567716 Change-Id: I656e869b8553d650916c2abe6dc83282c8b6fd65 (cherry picked from commit 5c18b80ed9aaa57b27b56667e3699fd76bcce8ed)
* | | | am 2f805f0d: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2014-12-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | ub-now-queens * commit '2f805f0d00b6521d6f6be25b615b3aff1b8f621d': Import translations. DO NOT MERGE
| * | | Merge "Import translations. DO NOT MERGE" into ub-now-queensGeoff Mendal2014-12-045-9/+9
| |\ \ \
| | * | | Import translations. DO NOT MERGEGeoff Mendal2014-12-035-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If32589149a2b776b668510662360e04aa66ade88 Auto-generated-cl: translation import
* | | | | am f2048779: Fixing wrong package check when adding shortcutsSunny Goyal2014-12-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2048779990bfd3c20b52149f5e8ab208bf2502a': Fixing wrong package check when adding shortcuts
| * | | | Fixing wrong package check when adding shortcutsSunny Goyal2014-12-031-1/+1
| |/ / / | | | | | | | | | | | | | | | | Bug: 18571789,18535867 Change-Id: I2544fa634879846d812b00f8649520400f66d29e
* | | | Import translations. DO NOT MERGEGeoff Mendal2014-12-035-9/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I417c78f889994b02bff33793c866af0a1b13d47f Auto-generated-cl: translation import
* | | | am 5c18b80e: Ensure that FirstFrameAnimatorHelper doesn\'t set play time ↵Adam Cohen2014-12-021-3/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | when animation is complete * commit '5c18b80ed9aaa57b27b56667e3699fd76bcce8ed': Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
| * | | Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is ↵Adam Cohen2014-12-021-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | complete Bug: 18567716 Change-Id: I656e869b8553d650916c2abe6dc83282c8b6fd65
* | | | am 1c96028f: Merge "Ignoring specific db exception to workaround Bug. ↵Winson Chung2014-12-021-8/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 18554839." into ub-now-queens * commit '1c96028f414f904b90c1a180a537021a6a3eceff': Ignoring specific db exception to workaround Bug. 18554839.
| * | | Merge "Ignoring specific db exception to workaround Bug. 18554839." into ↵Winson Chung2014-12-021-8/+21
| |\ \ \ | | | | | | | | | | | | | | | ub-now-queens
| | * | | Ignoring specific db exception to workaround Bug. 18554839.Winson Chung2014-12-011-8/+21
| | | | | | | | | | | | | | | | | | | | Change-Id: I80f2dd62297eea671f2d129ae22263e72e506ae4
* | | | | am b02e611d: Don\'t try to create an app state instance during restore.Chris Wren2014-11-252-15/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'b02e611d15bd6fbb05814adaa804dd68181c556c': Don't try to create an app state instance during restore.
| * | | | Don't try to create an app state instance during restore.Chris Wren2014-11-242-15/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Added a static utility function to get the DeviceProfile instead. Bug: 18504164 Change-Id: Ia510a84f1c195e58acf3bf4d1f6a42c739fdd413
* | | | am ab6527da: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-240-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'ab6527da412bf944df08429c697f5fcf94f8bb52': Import translations. DO NOT MERGE
| * | | Import translations. DO NOT MERGEGeoff Mendal2014-11-2419-87/+132
| | | | | | | | | | | | | | | | | | | | Change-Id: I0d7a075387e2ba2c8b9607620ae1d1197cf5cd99 Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-2419-87/+132
| |_|/ |/| | | | | | | | | | | Change-Id: Ib839840795a9298d8539b040c5a67366398ed663 Auto-generated-cl: translation import
* | | am 3da888d1: Merge "Disabling auto addition of managed profile shortcuts" ↵Sunny Goyal2014-11-211-3/+6
|\| | | | | | | | | | | | | | | | | | | | into ub-now-queens * commit '3da888d17c020b39ba36dbc99b681bf3339d269f': Disabling auto addition of managed profile shortcuts
| * | Merge "Disabling auto addition of managed profile shortcuts" into ub-now-queensSunny Goyal2014-11-211-3/+6
| |\ \
| | * | Disabling auto addition of managed profile shortcutsSunny Goyal2014-11-201-3/+6
| | | | | | | | | | | | | | | | | | | | Bug: 16188104 Change-Id: Ib6464c22140df6d60112eb35f5983718b3db6288
* | | | am c254da26: Updating default page indicator assetAdam Cohen2014-11-204-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'c254da26a607bb0af01915ef441c40dac25ffa09': Updating default page indicator asset
| * | | Updating default page indicator assetAdam Cohen2014-11-204-0/+0
| |/ / | | | | | | | | | Change-Id: If1be59c8c6590125c2347ba2928f61522f15f959
* | | am c8f4e1bc: Fix a couple regressions from resetting AppsCustomizeTabHostAdam Cohen2014-11-204-6/+13
|\| | | | | | | | | | | | | | * commit 'c8f4e1bc88401cad3cc5e439cd08450974d99d81': Fix a couple regressions from resetting AppsCustomizeTabHost
| * | Fix a couple regressions from resetting AppsCustomizeTabHostAdam Cohen2014-11-194-6/+13
| | | | | | | | | | | | | | | | | | | | | Bug 18409435 Bug 18358080 Change-Id: I07a071342b5c5e062ab2bb562b672d93ba0d5c2e
* | | am 08072c05: Prevent multiple workspace state animators from being startedAdam Cohen2014-11-191-0/+14
|\| | | | | | | | | | | | | | * commit '08072c05bf9c760acff653545a795a0fae4bd917': Prevent multiple workspace state animators from being started
| * | Prevent multiple workspace state animators from being startedAdam Cohen2014-11-181-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> 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
* | | am 7c39e238: Merge "Clearing DB before restore starts." into ub-now-queensAdam Cohen2014-11-191-6/+16
|\| | | | | | | | | | | | | | * commit '7c39e2380f3406f897b2f0abffcb8267d2212482': Clearing DB before restore starts.
| * | Merge "Clearing DB before restore starts." into ub-now-queensAdam Cohen2014-11-181-6/+16
| |\ \
| | * | Clearing DB before restore starts.Sunny Goyal2014-11-181-6/+16
| | | | | | | | | | | | | | | | | | | | Bug: 18362052 Change-Id: Ic4faf04db2f76c0c434907f1c41c8b708283eeb7
* | | | am c7cd2cb2: Add callback which got missed in refactorAdam Cohen2014-11-181-2/+11
|\| | | | | | | | | | | | | | | | | | | * commit 'c7cd2cb28f0d08dd47c79007794fc37036210b6a': Add callback which got missed in refactor
| * | | Add callback which got missed in refactorAdam Cohen2014-11-171-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | Bug 18418855 Change-Id: Ia3a1cec76721bbbc118dd7389b5e960802a64b88
* | | | am 0e974b4d: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-170-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '0e974b4d4480242c768cbd886d02ea66c0c8643d': Import translations. DO NOT MERGE
| * | | Import translations. DO NOT MERGEGeoff Mendal2014-11-1755-110/+0
| |/ / | | | | | | | | | | | | Change-Id: I79e98ec8bcc48f2c49e648e769fb1ff4d2f993d9 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-1755-110/+0
| | | | | | | | | | | | | | | Change-Id: Ia5e4b798ca68ced4d2b61d2d5d84d50f98b7bdff Auto-generated-cl: translation import
* | | am 416541cc: Adding a few null checks. 1) During migration, if launcher2 ↵Sunny Goyal2014-11-143-5/+13
|\| | | | | | | | | | | | | | | | | | | | has deleted user data, migration oes not happen 2) If Launcher3 does not has bind widget permission, QSB would be null. * commit '416541cc0e03ccd919d5669f0d06ef42a3b7ff21': Adding a few null checks. 1) During migration, if launcher2 has deleted user data, migration oes not happen 2) If Launcher3 does not has bind widget permission, QSB would be null.