OSDN Git Service
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':
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)
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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)
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
Ian Parkinson [Tue, 20 Oct 2015 00:29:04 +0000 (00:29 +0000)]
am
0c2918f4: Use View.generateViewId if available
am:
3d78b80ecd
* commit '
3d78b80ecdfeec7704b2aa82ce39823fa903ea61':
Adam Cohen [Tue, 20 Oct 2015 00:28:59 +0000 (00:28 +0000)]
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':
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':
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':
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':
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)
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':
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':
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':
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':
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':
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':
Sunny Goyal [Tue, 20 Oct 2015 00:28:14 +0000 (00:28 +0000)]
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':
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':
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':
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':
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':
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':
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':
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':
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':
Nick Kralevich [Sat, 18 Oct 2014 13:57:06 +0000 (06:57 -0700)]
fix build
Bug:
18040469
Change-Id: I24db4d3f4b7ee10ecf5a2c65035ce112271539fb
Nick Kralevich [Sat, 18 Oct 2014 15:14:09 +0000 (08:14 -0700)]
fix build
Bug:
18040469
Change-Id: I2938c7b950470eeacfb20391f109ae44d95060c7
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
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
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
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
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
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)
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
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
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)
Geoff Mendal [Thu, 4 Dec 2014 05:28:01 +0000 (05:28 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-now-queens
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
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
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
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
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
Winson Chung [Mon, 1 Dec 2014 23:05:17 +0000 (15:05 -0800)]
Ignoring specific db exception to workaround Bug.
18554839.
Change-Id: I80f2dd62297eea671f2d129ae22263e72e506ae4
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
Geoff Mendal [Mon, 24 Nov 2014 14:21:53 +0000 (06:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0d7a075387e2ba2c8b9607620ae1d1197cf5cd99
Auto-generated-cl: translation import
The Android Automerger [Mon, 24 Nov 2014 13:28:30 +0000 (13:28 +0000)]
merge in ub-now-queens-release history after reset to ub-now-queens
Sunny Goyal [Fri, 21 Nov 2014 02:10:07 +0000 (02:10 +0000)]
Merge "Disabling auto addition of managed profile shortcuts" into ub-now-queens
Sunny Goyal [Fri, 21 Nov 2014 01:01:00 +0000 (17:01 -0800)]
Disabling auto addition of managed profile shortcuts
Bug:
16188104
Change-Id: Ib6464c22140df6d60112eb35f5983718b3db6288
Adam Cohen [Thu, 20 Nov 2014 22:27:27 +0000 (14:27 -0800)]
Updating default page indicator asset
Change-Id: If1be59c8c6590125c2347ba2928f61522f15f959
The Android Automerger [Thu, 20 Nov 2014 23:03:26 +0000 (23:03 +0000)]
merge in ub-now-queens-release history after reset to
c8f4e1bc88401cad3cc5e439cd08450974d99d81
The Android Automerger [Thu, 20 Nov 2014 17:14:23 +0000 (17:14 +0000)]
merge in ub-now-queens-release history after reset to
c8f4e1bc88401cad3cc5e439cd08450974d99d81
The Android Automerger [Thu, 20 Nov 2014 15:22:28 +0000 (15:22 +0000)]
merge in ub-now-queens-release history after reset to
c8f4e1bc88401cad3cc5e439cd08450974d99d81
Adam Cohen [Thu, 20 Nov 2014 00:03:20 +0000 (16:03 -0800)]
Fix a couple regressions from resetting AppsCustomizeTabHost
Bug
18409435
Bug
18358080
Change-Id: I07a071342b5c5e062ab2bb562b672d93ba0d5c2e
The Android Automerger [Wed, 19 Nov 2014 23:16:24 +0000 (23:16 +0000)]
merge in ub-now-queens-release history after reset to
08072c05bf9c760acff653545a795a0fae4bd917
The Android Automerger [Wed, 19 Nov 2014 21:28:24 +0000 (21:28 +0000)]
merge in ub-now-queens-release history after reset to
08072c05bf9c760acff653545a795a0fae4bd917
The Android Automerger [Wed, 19 Nov 2014 11:40:47 +0000 (11:40 +0000)]
merge in ub-now-queens-release history after reset to
08072c05bf9c760acff653545a795a0fae4bd917
Adam Cohen [Wed, 19 Nov 2014 01:53:44 +0000 (17:53 -0800)]
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
Adam Cohen [Tue, 18 Nov 2014 20:05:07 +0000 (20:05 +0000)]
Merge "Clearing DB before restore starts." into ub-now-queens
Sunny Goyal [Tue, 18 Nov 2014 18:38:22 +0000 (10:38 -0800)]
Clearing DB before restore starts.
Bug:
18362052
Change-Id: Ic4faf04db2f76c0c434907f1c41c8b708283eeb7
The Android Automerger [Tue, 18 Nov 2014 11:02:29 +0000 (11:02 +0000)]
merge in ub-now-queens-release history after reset to
0e974b4d4480242c768cbd886d02ea66c0c8643d
Adam Cohen [Tue, 18 Nov 2014 01:45:34 +0000 (17:45 -0800)]
Add callback which got missed in refactor
Bug
18418855
Change-Id: Ia3a1cec76721bbbc118dd7389b5e960802a64b88
Geoff Mendal [Mon, 17 Nov 2014 18:27:36 +0000 (10:27 -0800)]
Import translations. DO NOT MERGE
Change-Id: I79e98ec8bcc48f2c49e648e769fb1ff4d2f993d9
Auto-generated-cl: translation import
Sunny Goyal [Fri, 14 Nov 2014 19:59:57 +0000 (11:59 -0800)]
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.
Bug:
18388507
Change-Id: Ief81f6f77ce154e7b3ecd4b77caf24239401e738
Sunny Goyal [Fri, 14 Nov 2014 18:14:18 +0000 (10:14 -0800)]
Fixing NullPointer Exception when user is deleted.
Bug:
18388507
Change-Id: I4176ea37a019c2a862e6b2875cc6b03ec9118571
Sunny Goyal [Tue, 11 Nov 2014 02:05:31 +0000 (18:05 -0800)]
Adding shortcuts corresponding to ManagedUsers automatically.
Bug:
16188104
Change-Id: Ic07578dd187263f59f3c431cbb78dea90d0c24f4
Sunny Goyal [Wed, 12 Nov 2014 18:00:23 +0000 (18:00 +0000)]
Merge "Using the default search widget in Launcher3" into ub-now-queens
Sunny Goyal [Tue, 11 Nov 2014 22:55:05 +0000 (22:55 +0000)]
Merge "Removing some duplicate methods" into ub-now-queens
Sunny Goyal [Tue, 11 Nov 2014 20:23:59 +0000 (12:23 -0800)]
Removing some duplicate methods
Change-Id: I8a1295ab74890984e8d8508aaa18fd79ac2a032d
Sunny Goyal [Thu, 6 Nov 2014 18:12:54 +0000 (10:12 -0800)]
Using the default search widget in Launcher3
> Removing all logic related to search and voice overlays
from Launcher3
> Using the widget provided by global search provider on the
homescreen
> Removing VoiceButtonProxy, as it is not being used anymore
Change-Id: Ie8b09b44f7213c8fa11bce685914442e4884295d
The Android Automerger [Tue, 11 Nov 2014 10:40:34 +0000 (10:40 +0000)]
merge in ub-now-queens-release history after reset to
be7939c960c20697e8a731b354fd2d3d4757137c
Sunny Goyal [Tue, 11 Nov 2014 00:01:44 +0000 (16:01 -0800)]
Proguard changing methods required for click feedback aniamtion
Bug:
18323452
Change-Id: Iac6d75a3c46c3a4c2a74af43bd1fca738235c2d5
Sunny Goyal [Fri, 24 Oct 2014 23:26:52 +0000 (16:26 -0700)]
Adding some spacing between overview panel items
Bug:
18293488
Change-Id: I8731c4d2ad34571a4a3a21b03a5fbae0ba66332f
Sunny Goyal [Wed, 5 Nov 2014 23:23:59 +0000 (23:23 +0000)]
Merge "Using a proxy call for isAttachedToWindow for pre 19 devices" into ub-now-queens
Sunny Goyal [Mon, 3 Nov 2014 19:30:01 +0000 (11:30 -0800)]
Using a proxy call for isAttachedToWindow for pre 19 devices
Bug:
17423114
Change-Id: I6f0cc306b7fcc8087b4e4fc92bb8796d51a989d6
Sunny Goyal [Wed, 5 Nov 2014 23:13:08 +0000 (23:13 +0000)]
Merge "Clearing some android list errors/warnings." into ub-now-queens
OSDN Git Service
