OSDN Git Service
Adrian Roos [Thu, 21 Apr 2016 00:17:46 +0000 (00:17 +0000)]
Merge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev
am:
75fe7d5d79
* commit '
75fe7d5d791d8372af9d2e11a50287e6119a9780':
Fix inline reply clobbering when narrowly missing send button
Change-Id: I4edee46cb06a4c6f7beadab5e8a56cdc902fdbec
Felipe Leme [Thu, 21 Apr 2016 00:17:40 +0000 (00:17 +0000)]
Merge "Set BugreportProgressService to run on foreground." into nyc-dev
am:
3053c3f2a9
* commit '
3053c3f2a94b24ceeed9c46cb84045c285d3523b':
Set BugreportProgressService to run on foreground.
Change-Id: I6ff60394218bceac0fdd4eed4839f5819f532180
Adam Lesinski [Wed, 20 Apr 2016 23:42:01 +0000 (23:42 +0000)]
Merge "Doze settings example not matching real keys" am:
570a13f
am:
790699d
* commit '
790699db64ee18d143cd9813e91044fcc5a26713':
Doze settings example not matching real keys
Change-Id: I5c1a0757f5db2ba3ca2fcf37e77641ac820fbe6f
TreeHugger Robot [Wed, 20 Apr 2016 23:39:50 +0000 (23:39 +0000)]
Merge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev
TreeHugger Robot [Wed, 20 Apr 2016 23:23:10 +0000 (23:23 +0000)]
Merge "Set BugreportProgressService to run on foreground." into nyc-dev
Adam Lesinski [Wed, 20 Apr 2016 22:56:11 +0000 (22:56 +0000)]
Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev
am:
1362ae0
* commit '
1362ae062a196c8450a0b649dd0c5af66d1f05a1':
ResourcesManager: Throw exception if failed to load asset path
Change-Id: I59a5eeb3502d12382e30faceb769eaef719b65d1
Henrik Baard [Wed, 20 Apr 2016 22:51:47 +0000 (22:51 +0000)]
Merge "Doze settings example not matching real keys"
am:
570a13f
* commit '
570a13f0cb233b4a216243025a9fed3df3c72849':
Doze settings example not matching real keys
Change-Id: I62dade8bece244e9033a230c1f116f8caad35a6f
Adam Lesinski [Wed, 20 Apr 2016 22:46:04 +0000 (22:46 +0000)]
Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev
Adam Lesinski [Wed, 20 Apr 2016 22:37:18 +0000 (22:37 +0000)]
Merge "Doze settings example not matching real keys"
Lifu Tang [Wed, 20 Apr 2016 22:30:55 +0000 (22:30 +0000)]
Merge "Added defensive code to prevent system crash" into nyc-dev
am:
a381455
* commit '
a381455472a814c8dbd98fcb4312f46ed1373c88':
Added defensive code to prevent system crash
Change-Id: I97dd4a994c86bf9bc845de08a8ff9c303bb86240
Lifu Tang [Wed, 20 Apr 2016 22:30:53 +0000 (22:30 +0000)]
Merge "Fixed bug in upgrading GpsMeasurement" into nyc-dev
am:
e1b5171
* commit '
e1b51715bdd1d59913ef4cb83071ef8eaac968de':
Fixed bug in upgrading GpsMeasurement
Change-Id: Ic20b5232d5114486dbefb5c4adf1409ecf1b3870
Lifu Tang [Wed, 20 Apr 2016 22:19:17 +0000 (22:19 +0000)]
Merge "Added defensive code to prevent system crash" into nyc-dev
Lifu Tang [Wed, 20 Apr 2016 22:19:04 +0000 (22:19 +0000)]
Merge "Fixed bug in upgrading GpsMeasurement" into nyc-dev
Christopher Tate [Wed, 20 Apr 2016 22:13:17 +0000 (22:13 +0000)]
Merge "Don\'t back up wallpapers that we\'ve been told not to" into nyc-dev
am:
665189f
* commit '
665189f92646d34bf02082120cba3c62aa718770':
Don't back up wallpapers that we've been told not to
Change-Id: I45d037436e349445f091a7dad5abad4b7421ad8e
Christopher Tate [Wed, 20 Apr 2016 22:13:15 +0000 (22:13 +0000)]
resolve merge conflicts of
44e07e0 to mnc-dev am:
825b713 am:
8c635e7 am:
343600c am:
b965ced -s ours
am:
129c01a
* commit '
129c01af82df8560f9db9c990651e54689e55274':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: Iea83a750479615a4cec01179b8df2f4880c61cc6
Chris Tate [Wed, 20 Apr 2016 22:10:38 +0000 (22:10 +0000)]
Merge "Don't back up wallpapers that we've been told not to" into nyc-dev
Christopher Tate [Wed, 20 Apr 2016 22:09:28 +0000 (22:09 +0000)]
resolve merge conflicts of
44e07e0 to mnc-dev am:
825b713 am:
8c635e7 am:
343600c
am:
b965ced -s ours
* commit '
b965ced011bdd7a3ec5450f93d1c58b889514f11':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: Idf9a9824d411ca2b178fadda040f46864bc96a58
Robert Carr [Wed, 20 Apr 2016 21:52:39 +0000 (21:52 +0000)]
Merge "Do not prematurely update position while bounds animating." into nyc-dev
am:
5a6c58e
* commit '
5a6c58e00202ed83cd60a02cd6a79da65598b655':
Do not prematurely update position while bounds animating.
Change-Id: I35f86944de95f50947384ba104e91d7d4a85f58b
Jim Miller [Wed, 20 Apr 2016 21:52:36 +0000 (21:52 +0000)]
Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev
am:
54c4374
* commit '
54c4374b4a67fdfbda936e7f4a8a9538e16c3557':
Fix bug where fingerprint for wrong userId was attempted to be removed.
Change-Id: I9f5db7259dc9af79f57d16577c2a9d5481ad31ba
Phil Burk [Wed, 20 Apr 2016 21:52:33 +0000 (21:52 +0000)]
Merge "MidiDevice: do not open ports on closed device" into nyc-dev
am:
2faac0d
* commit '
2faac0d74169ddc1f54f9cd356dc23b96a74c9eb':
MidiDevice: do not open ports on closed device
Change-Id: I6f98e504d682a5902dd29f5fa54023e7a8bc9814
Fyodor Kupolov [Wed, 20 Apr 2016 21:52:30 +0000 (21:52 +0000)]
Merge "Test coverage for new FBE functionality" into nyc-dev
am:
366a457
* commit '
366a457b6da6caf3d376a8ef0be6a386aee5c216':
Test coverage for new FBE functionality
Change-Id: I4f271c0046a96642cfb8f5c81ca5c6a7c41d7062
Christopher Tate [Wed, 20 Apr 2016 21:48:43 +0000 (21:48 +0000)]
resolve merge conflicts of
44e07e0 to mnc-dev am:
825b713 am:
8c635e7
am:
343600c
* commit '
343600c3ecff31826e50d40821927e446adb9b0a':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: I68dbf8f280672ec9770b6c57b9a17313f448e14a
Felipe Leme [Fri, 15 Apr 2016 19:49:34 +0000 (12:49 -0700)]
Set BugreportProgressService to run on foreground.
BugreportProgressService do not persist the user-provided
information (like details and screenshot paths), so if it's killed by
the framework, that info is lost.
Running it as foreground mitigates the changes of it being killed.
BUG:
27431998
BUG:
28291423
Change-Id: I2f58507beb38309628f2f19d3f7f950d07eca16f
Christopher Tate [Wed, 20 Apr 2016 21:43:17 +0000 (21:43 +0000)]
resolve merge conflicts of
44e07e0 to mnc-dev am:
825b713
am:
8c635e7
* commit '
8c635e73c698302ce6661f227c274164972f048e':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: Iae6fe5af0a8e0f27e8b45a56aecc2d722d7c3bc3
Rob Carr [Wed, 20 Apr 2016 21:37:10 +0000 (21:37 +0000)]
Merge "Do not prematurely update position while bounds animating." into nyc-dev
Christopher Tate [Wed, 20 Apr 2016 21:35:50 +0000 (21:35 +0000)]
resolve merge conflicts of
44e07e0 to mnc-dev
am:
825b713
* commit '
825b7134699fbaaa16423c52b7b424d4a9afefb1':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: I0c120c8dbf76857985ebea04eadca81fa6470cb2
Christopher Tate [Thu, 25 Feb 2016 20:43:38 +0000 (12:43 -0800)]
Don't back up wallpapers that we've been told not to
In addition, now that the full uncropped wallpaper image is being
backed up, we now handle that via the full-data backup path instead
of key/value. Restore still knows about legacy data that gets
delivered via the older key/value mechanism.
This change also has the effect of removing the size limitations
around wallpaper restore acceptance. Any size source imagery is
valid, as crop & scale are rerun in a device-appropriate way
after the restore.
Bug
25453848
Bug
25727875
Change-Id: Idc64a2eaab97a8ecc9d2b8ca5dc011f29cab324d
Jim Miller [Wed, 20 Apr 2016 21:33:13 +0000 (21:33 +0000)]
Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev
Phil Burk [Wed, 20 Apr 2016 21:15:32 +0000 (21:15 +0000)]
Merge "MidiDevice: do not open ports on closed device" into nyc-dev
Ruchi Kandoi [Wed, 20 Apr 2016 21:14:59 +0000 (21:14 +0000)]
Merge "Revert "PowerManager: Adds the Sustained performance API."" into nyc-dev
am:
0fea8ad
* commit '
0fea8ad44748abd031c2e73cd5e6bce6a086c5f3':
Revert "PowerManager: Adds the Sustained performance API."
Change-Id: I7a5d0be180f9c224b9ccb2551ab4f0dbf7c9c4e9
Shubham Ajmera [Wed, 20 Apr 2016 21:14:55 +0000 (21:14 +0000)]
Merge "Track libcore change
e2270147c6ddfb164776b68295078a5e6c6dfee7" into nyc-dev
am:
f3d5a4d
* commit '
f3d5a4dd60b3ec461e4d9fee97ce99a92cb29b1b':
Track libcore change
e2270147c6ddfb164776b68295078a5e6c6dfee7
Change-Id: I4b34b2effa629b184ca50453c673b61ea3d6a47b
Chong Zhang [Wed, 20 Apr 2016 21:14:51 +0000 (21:14 +0000)]
Merge "Fix IME adjust when stack focus changes while IME is visible" into nyc-dev
am:
3966fb9
* commit '
3966fb942c7a9445a8cc94aeafc445778c2311b4':
Fix IME adjust when stack focus changes while IME is visible
Change-Id: If2fa6c6c62a08c957520d9a58483020b9fe6d220
Ruchi Kandoi [Wed, 20 Apr 2016 21:14:47 +0000 (21:14 +0000)]
Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev
am:
a645c97
* commit '
a645c9753ff004e616a6df4a15c9d2e999508d91':
window: Adds a Sustained Performance Mode window flag.
Change-Id: Ib839ac8cd7dfa0e216de46bb8b343787d230a36c
Ruben Brunk [Wed, 20 Apr 2016 21:14:42 +0000 (21:14 +0000)]
Merge "Add settings for altering VR display behavior." into nyc-dev
am:
6ada702
* commit '
6ada702993227233fd362e98de93cc9e798dc75d':
Add settings for altering VR display behavior.
Change-Id: Iaf8584c47a91b0a49c4075e6d4fcef10afc3ae11
destradaa [Wed, 20 Apr 2016 21:14:36 +0000 (21:14 +0000)]
Merge "Add support for multiple callback registration in." into nyc-dev
am:
fdb26b9
* commit '
fdb26b90cbbd1db31d2ee1b2c4c38cfcc7d6a46c':
Add support for multiple callback registration in.
Change-Id: I52d4f7f2bc7d79ebd80759a94c7cdd23ba724144
Dongwon Kang [Wed, 20 Apr 2016 21:14:26 +0000 (21:14 +0000)]
Merge "TIF: Do not build input list for background user" into nyc-dev
am:
4a6bd4b
* commit '
4a6bd4b48fe309f50a3878d85104be6fbf244d50':
TIF: Do not build input list for background user
Change-Id: Idedf4275658266e931f0d60906f6459e1e7c1317
Julia Reynolds [Wed, 20 Apr 2016 21:14:09 +0000 (21:14 +0000)]
Merge "Align radio buttons with app icon, change text color." into nyc-dev
am:
1ff2412
* commit '
1ff2412cc49424ffe9594538618d063c1e0a6951':
Align radio buttons with app icon, change text color.
Change-Id: I387574f49cb2b277329344bb67311dae3b442d27
Julia Reynolds [Wed, 20 Apr 2016 21:13:45 +0000 (21:13 +0000)]
Merge "Animate volume dialog expansion/contraction." into nyc-dev
am:
e86ac2f
* commit '
e86ac2f0da9ec71e9d990291053eec8f352af52d':
Animate volume dialog expansion/contraction.
Change-Id: Icbca2a9a418f8461d5134c7e10eff7f0556554d8
Fyodor Kupolov [Wed, 20 Apr 2016 21:13:39 +0000 (21:13 +0000)]
Merge "Test coverage for new FBE functionality" into nyc-dev
Felipe Leme [Wed, 20 Apr 2016 21:13:17 +0000 (21:13 +0000)]
Merge "Only try to add details to zip once." into nyc-dev
am:
0304688
* commit '
03046888822d07ec020eb7a2f685be4f7bcded31':
Only try to add details to zip once.
Change-Id: I629618cc5cf105584ebf911b3de1b6649f1c59c6
Mitchell Wills [Wed, 20 Apr 2016 21:13:04 +0000 (21:13 +0000)]
Update scan and last network info in the WorkThread am:
cf0875a am:
c441faa am:
2dbac6c
am:
de629c7
* commit '
de629c7ac77719ec6223254825a3e3b099c364c1':
Update scan and last network info in the WorkThread
Change-Id: I37403f37ae66b4f8fef41f8b201d79a3e6f4bad9
Andreas Gampe [Wed, 20 Apr 2016 21:12:53 +0000 (21:12 +0000)]
Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev
am:
58f2072
* commit '
58f20726e99947a0f2781b5d4be3052be6eb94dd':
Frameworks/base: Add holder to BaseBundle
Change-Id: I0b177b9a7b3b11e579b8cc62b89e4036908bf237
Trevor Johns [Wed, 20 Apr 2016 21:12:38 +0000 (21:12 +0000)]
Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev
am:
59c9a93
* commit '
59c9a93fc268e226495d4ee8cf7c507c2ea2c433':
Remove links to createAndInitializeUser() and createUser()
Resolve merge conflicts of
a5060ee to nyc-dev
Change-Id: Iddc9419069d8f5d555baf0c1ef4b2f2ebf75c370
Robert Carr [Wed, 20 Apr 2016 21:12:27 +0000 (21:12 +0000)]
Merge "When restacking IM windows preserve relative order." into nyc-dev
am:
db973df
* commit '
db973df830c32af8e2aeff256053299409f65dfd':
When restacking IM windows preserve relative order.
Change-Id: I9e6a52ea69f908fbebd8a39208d071ff70b97db0
Robert Carr [Wed, 20 Apr 2016 21:12:15 +0000 (21:12 +0000)]
Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev
am:
5a2554a
* commit '
5a2554a8544525953c0847a1d3c975413eb07986':
Respect WRAP_CONTENT when resolving drop down position.
Change-Id: I81a283518d4afca0fb05185af64ce323a6f7c6b3
Yi Kong [Wed, 20 Apr 2016 21:12:04 +0000 (21:12 +0000)]
Merge "Track libcore change
be1608980825868eb1c70fab6eb86fe06bd304ce" into nyc-dev
am:
8c205b5
* commit '
8c205b5a2d3b138dc95648188dd15a1abd7dd81e':
Track libcore change
be1608980825868eb1c70fab6eb86fe06bd304ce
Change-Id: I866ab8b93e50ee8ff9475634ef5a9f9443ef2e58
Sudheer Shanka [Wed, 20 Apr 2016 21:11:52 +0000 (21:11 +0000)]
Merge "Add restrictedSwitchSummary attribute to restricted switch preferences." into nyc-dev
am:
df9ecfc
* commit '
df9ecfc587615edc80c6bf96e67d7dc4d510e03f':
Add restrictedSwitchSummary attribute to restricted switch preferences.
Change-Id: I9a8a4ce042227278ea65bf51eed3d4e7125cd9f5
Insun Kang [Wed, 20 Apr 2016 21:11:41 +0000 (21:11 +0000)]
Merge "ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail" into nyc-dev
am:
801d416
* commit '
801d4161dd9e872bec73d855d21d030ba39a8b91':
ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail
Change-Id: I4ab59b2b7ced0cf9449fdc780692cfcb707d8df4
Sudheer Shanka [Wed, 20 Apr 2016 21:11:28 +0000 (21:11 +0000)]
Merge "Fix additional summary of RestrictedSwitchPreference." into nyc-dev
am:
205d10b
* commit '
205d10bb136e36a17662fb1e60b0e002ca1f7158':
Fix additional summary of RestrictedSwitchPreference.
Change-Id: Ib337bc61f870aa7f76a506ea46bea53009dbf715
Jason Monk [Wed, 20 Apr 2016 21:11:13 +0000 (21:11 +0000)]
Merge "Daydream -> screen saver" into nyc-dev
am:
eeaaf26
* commit '
eeaaf26805091cad0404bc6030dde38dd4b1edcc':
Daydream -> screen saver
Change-Id: Ie6aa6ba3260f9d67ee41d129fae6b7f6f01d039d
Felipe Leme [Wed, 20 Apr 2016 21:10:41 +0000 (21:10 +0000)]
Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev
am:
9724fba
* commit '
9724fba83545fd075cbda62bb13cdc7820c7291a':
Added onRestrictBackgroundWhitelistChanged callback.
Change-Id: I1ee90168f1cf29a117961ba1e269fbc89c7f443b
Jason Monk [Wed, 20 Apr 2016 21:09:41 +0000 (21:09 +0000)]
Merge "Allow QS details to scroll when the screen is really small" into nyc-dev
am:
10ea519
* commit '
10ea519fa9dc31721dcf5974f423797cbbf8c80d':
Allow QS details to scroll when the screen is really small
Change-Id: I2be8b23ee3bf7ebee2b8d581b83853517edbac49
Vladislav Kaznacheev [Wed, 20 Apr 2016 21:09:19 +0000 (21:09 +0000)]
Merge "Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window" into nyc-dev
am:
c8df6aa
* commit '
c8df6aa42facbe0cf7c05e4db78ec4a4e224b78b':
Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window
Change-Id: If2c2475d20b2a0d4ec801e29df9f42a847984c62
Jason Monk [Wed, 20 Apr 2016 21:09:05 +0000 (21:09 +0000)]
Merge "QS tile lifecycle management" into nyc-dev
am:
e59bbb0
* commit '
e59bbb0899e17710e9380b704141b100ddc2faa0':
QS tile lifecycle management
Change-Id: I44eb2611b3c66c547c2f67c48278a01b0fb24652
Yang Ni [Wed, 20 Apr 2016 21:08:50 +0000 (21:08 +0000)]
Merge "Made Element accessors thread-safe" into nyc-dev
am:
c74d2a8
* commit '
c74d2a8b8795bb0679225afcdd4d446c29440d85':
Made Element accessors thread-safe
Change-Id: I98605e81d6384b2261b7f09885c7d882f7005a04
Phil Weaver [Wed, 20 Apr 2016 21:08:35 +0000 (21:08 +0000)]
Merge "Clear calling identity when binding a11y services" into nyc-dev
am:
b72c306
* commit '
b72c30653dc9652d9c6beba979e5ea194c1a4638':
Clear calling identity when binding a11y services
Change-Id: I045bca4d88cdf22e84afd80534ddcb63a355302f
Ruchi Kandoi [Wed, 20 Apr 2016 20:59:18 +0000 (20:59 +0000)]
Merge "Revert "PowerManager: Adds the Sustained performance API."" into nyc-dev
Adrian Roos [Wed, 20 Apr 2016 20:58:03 +0000 (13:58 -0700)]
Fix inline reply clobbering when narrowly missing send button
The RemoteInputView leaked through unhandled touches. To prevent this,
we now make sure the send button covers the entire area, and we catch
any touches that did not go to either the send button or the text box.
Bug:
27357771
Change-Id: Idc08d98dc7970b99c735f80088ea1eec0ec2d831
Shubham Ajmera [Wed, 20 Apr 2016 20:52:56 +0000 (20:52 +0000)]
Merge "Track libcore change
e2270147c6ddfb164776b68295078a5e6c6dfee7" into nyc-dev
Chong Zhang [Wed, 20 Apr 2016 20:52:07 +0000 (20:52 +0000)]
Merge "Fix IME adjust when stack focus changes while IME is visible" into nyc-dev
Ruchi Kandoi [Wed, 20 Apr 2016 20:42:01 +0000 (13:42 -0700)]
Revert "PowerManager: Adds the Sustained performance API."
This reverts commit
0abc001275d6cf0af4990f521ccff7346a7cd2bf.
Bug:
28150358
Change-Id: I99c71b3d6641310a33e898d6fd475d37c79ba9d0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Adam Lesinski [Wed, 20 Apr 2016 20:36:19 +0000 (13:36 -0700)]
ResourcesManager: Throw exception if failed to load asset path
Previously if we failed to load an asset path, we would return a
null AssetManager which would lead to an immediate NPE.
Throw a proper exception instead, detailing which path failed to load.
Bug:
28216288
Change-Id: I491b9316b837bf333b5ae78d4eb1ee31741617ec
Ruchi Kandoi [Wed, 20 Apr 2016 20:35:20 +0000 (20:35 +0000)]
Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev
Jim Miller [Wed, 20 Apr 2016 20:34:11 +0000 (13:34 -0700)]
Fix bug where fingerprint for wrong userId was attempted to be removed.
- cleaned up private API to ensure userId is distinct from groupId.
- fixed bug where we were sending the wrong userId when attempting to
- fix warning about wrong fingerId when receiving final id of 0.
Fixes bug
28268635
Change-Id: I9507723c1a763152775f2feff76c16762f23cf2d
Christopher Tate [Wed, 20 Apr 2016 20:33:41 +0000 (13:33 -0700)]
resolve merge conflicts of
44e07e0 to mnc-dev
Change-Id: Ibc446c82a3d1446ccd81630743f82d1fd58fbd47
Ruben Brunk [Wed, 20 Apr 2016 19:51:49 +0000 (19:51 +0000)]
Merge "Add settings for altering VR display behavior." into nyc-dev
Yi Kong [Wed, 20 Apr 2016 15:34:36 +0000 (16:34 +0100)]
Phil Burk [Tue, 19 Apr 2016 22:56:24 +0000 (15:56 -0700)]
MidiDevice: do not open ports on closed device
Fix involves client side mIsDeviceClosed flag.
Bug:
24949216
Change-Id: I666284a787fbb9a710d2372fb424e8e54f6a2825
Signed-off-by: Phil Burk <philburk@google.com>
Daniel Estrada Alva [Wed, 20 Apr 2016 19:22:08 +0000 (19:22 +0000)]
Merge "Add support for multiple callback registration in." into nyc-dev
Lifu Tang [Wed, 20 Apr 2016 19:14:07 +0000 (12:14 -0700)]
Added defensive code to prevent system crash
Bug:
26940611
Change-Id: I8226d1acb42ccc7d2cd910e30b47c7c63c9f490b
Dongwon Kang [Wed, 20 Apr 2016 19:19:33 +0000 (19:19 +0000)]
Merge "TIF: Do not build input list for background user" into nyc-dev
Julia Reynolds [Wed, 20 Apr 2016 19:10:11 +0000 (19:10 +0000)]
Merge "Align radio buttons with app icon, change text color." into nyc-dev
Julia Reynolds [Wed, 20 Apr 2016 19:07:12 +0000 (19:07 +0000)]
Merge "Animate volume dialog expansion/contraction." into nyc-dev
Robert Carr [Mon, 18 Apr 2016 18:52:21 +0000 (11:52 -0700)]
Do not prematurely update position while bounds animating.
We intend to update the task size in onAnimationStart
so that we can get a new buffer as quickly as possible.
We need to keep it at the old position though, or
we will see a jump at the beginning of the animation.
Bug:
28091556
Change-Id: I5fc5f9eef1629dea88844cf3f2274eaa48909b97
Julia Reynolds [Wed, 20 Apr 2016 15:42:04 +0000 (11:42 -0400)]
Align radio buttons with app icon, change text color.
Bug:
27597108
Change-Id: Id821b46b6f2898295ae711ec33f56fed1b529584
TreeHugger Robot [Wed, 20 Apr 2016 19:03:01 +0000 (19:03 +0000)]
Merge "Only try to add details to zip once." into nyc-dev
Mitchell Wills [Wed, 20 Apr 2016 19:01:51 +0000 (19:01 +0000)]
Update scan and last network info in the WorkThread am:
cf0875a am:
c441faa
am:
2dbac6c
* commit '
2dbac6cee58c343682ebf6590ae170c2acd067e4':
Update scan and last network info in the WorkThread
Change-Id: I1068111b96b907f9f3c839fc497e9d06e1254d26
Julia Reynolds [Wed, 20 Apr 2016 18:37:39 +0000 (14:37 -0400)]
Animate volume dialog expansion/contraction.
Bug:
28275874
Change-Id: I751addeb73e7354d3a2018be1ba08bf9b8378b95
Andreas Gampe [Wed, 20 Apr 2016 18:58:30 +0000 (18:58 +0000)]
Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev
Mitchell Wills [Wed, 20 Apr 2016 18:57:29 +0000 (18:57 +0000)]
Update scan and last network info in the WorkThread am:
cf0875a
am:
c441faa
* commit '
c441faa6de5618e9da029858ce83b3e129be2974':
Update scan and last network info in the WorkThread
Change-Id: I69ee081eb91a521e7c6cdc7ca6e96ebc230c1aba
Chong Zhang [Tue, 19 Apr 2016 04:02:01 +0000 (21:02 -0700)]
Fix IME adjust when stack focus changes while IME is visible
- Use two values to animate divider width adjustment separately
from stack position adjustment. For example IME is visible
with focus on bottom stack, then user clicks top stack. In this
case bottom stack position should go back to unadjusted, but
divider should remain thinner.
- If we need to start a new animation during an existing animation,
start the motion from where the existing animation left off, so
that it doesn't look discontinuous.
- Do not adjust if IME is not actually focused on any stack. This
could happen when swiping down the status bar.
bug:
28175599
Change-Id: I802def5d1c13ebe11094eb28fc5a0b0c309e4d76
Mitchell Wills [Wed, 20 Apr 2016 18:53:58 +0000 (18:53 +0000)]
Update scan and last network info in the WorkThread
am:
cf0875a
* commit '
cf0875a9b69da9da5e16563eca33609e775d9195':
Update scan and last network info in the WorkThread
Change-Id: I0b59f1eaa9bad27b300477f31fb88fb8e2eacb38
Lifu Tang [Wed, 20 Apr 2016 18:48:16 +0000 (11:48 -0700)]
Fixed bug in upgrading GpsMeasurement
Bug:
28278410
Change-Id: I936e257d68c348654d6031eb3e8f6d63b28d5e0a
Christopher Tate [Wed, 20 Apr 2016 18:37:20 +0000 (11:37 -0700)]
resolve merge conflicts of
5e380f0 to lmp-mr1-ub-dev
Change-Id: Ie8d3c154f4c98bb1c2a1954ff1dabc8f5bc20b71
Trevor Johns [Wed, 20 Apr 2016 18:35:54 +0000 (18:35 +0000)]
Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev
* changes:
Remove links to createAndInitializeUser() and createUser()
Resolve merge conflicts of
a5060ee to nyc-dev
Rob Carr [Wed, 20 Apr 2016 18:30:40 +0000 (18:30 +0000)]
Merge "When restacking IM windows preserve relative order." into nyc-dev
Rob Carr [Wed, 20 Apr 2016 18:30:14 +0000 (18:30 +0000)]
Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev
Yang Ni [Wed, 20 Apr 2016 18:23:58 +0000 (18:23 +0000)]
Merge "Made Element accessors thread-safe" am:
acd0061
am:
3c207ff
* commit '
3c207ff5af7c4f0a9d9cafa6c6f5c947cfdb78ca':
Made Element accessors thread-safe
Change-Id: I5bc65b3b28c328081335a04ce15864a6dd072543
Yang Ni [Wed, 20 Apr 2016 18:20:35 +0000 (18:20 +0000)]
Merge "Made Element accessors thread-safe"
am:
acd0061
* commit '
acd0061f908f7f9d9545d2729ce46d83ab349e58':
Made Element accessors thread-safe
Change-Id: I669c5b09b459da6dfe1a6a39af46b1eca1f16e2d
Yang Ni [Wed, 20 Apr 2016 18:14:08 +0000 (18:14 +0000)]
Merge "Made Element accessors thread-safe"
Yi Kong [Wed, 20 Apr 2016 18:04:45 +0000 (18:04 +0000)]
Merge "Track libcore change
be1608980825868eb1c70fab6eb86fe06bd304ce" into nyc-dev
Sudheer Shanka [Wed, 20 Apr 2016 18:04:12 +0000 (18:04 +0000)]
Merge "Add restrictedSwitchSummary attribute to restricted switch preferences." into nyc-dev
Jae Seo [Wed, 20 Apr 2016 17:50:50 +0000 (17:50 +0000)]
Merge "ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail" into nyc-dev
Sudheer Shanka [Wed, 20 Apr 2016 17:50:18 +0000 (17:50 +0000)]
Merge "Fix additional summary of RestrictedSwitchPreference." into nyc-dev
Jason Monk [Wed, 20 Apr 2016 17:48:47 +0000 (17:48 +0000)]
Merge "Daydream -> screen saver" into nyc-dev
Fyodor Kupolov [Tue, 12 Apr 2016 00:23:56 +0000 (17:23 -0700)]
Test coverage for new FBE functionality
Added testRemovedAccountSync, which removes account when the user is locked,
and verifies that syncDeCeAccountsLocked works as expected.
Added testPreNDatabaseMigration to test that pre-N database with existing
data is properly upgraded and migrated.
Bug:
26279712
Change-Id: I3846c626f616b1c4830965c9f0cb27fa32ce6f54
TreeHugger Robot [Wed, 20 Apr 2016 17:44:54 +0000 (17:44 +0000)]
Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev
Jason Monk [Wed, 20 Apr 2016 17:44:05 +0000 (13:44 -0400)]
Daydream -> screen saver
Change-Id: I604530a721797e6d4b28df3782303a79fabcdac7
Fixes:
28268243
Mitchell Wills [Mon, 18 Apr 2016 21:54:53 +0000 (14:54 -0700)]
Update scan and last network info in the WorkThread
This prevents a race condition where mLastInfo is updated while
processing scan results causing a crash.
Change-Id: Ic5147f3851f218c0f697e4ebb324f1cb63d02665
Fixes:
27944510
Jason Monk [Wed, 20 Apr 2016 17:34:18 +0000 (17:34 +0000)]
Merge "Allow QS details to scroll when the screen is really small" into nyc-dev
OSDN Git Service
