OSDN Git Service
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
Yi Kong [Wed, 20 Apr 2016 15:34:36 +0000 (16:34 +0100)]
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
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
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
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
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
Jason Monk [Wed, 20 Apr 2016 17:30:11 +0000 (13:30 -0400)]
Allow QS details to scroll when the screen is really small
Change-Id: Ib28b6e9d888e864741c3ac472d30ef7cae06fe67
Fixes:
27276984
Felipe Leme [Wed, 20 Apr 2016 17:20:00 +0000 (10:20 -0700)]
Only try to add details to zip once.
When the user enters details (title or description) to the bugreport,
Shell tries to add a title.txt (and/or description.txt) to the zip and
uses 2 instance variables (addedDetailsToZip and addingDetailsToZip) to
control its state.
The problem with the current approach is that if there is a failure
adding the entries (for example, if the entries already exist), these
variables are not updated and hence when the user taps Share, it will
try to add the entries again, which most likely would fail.
BUG:
28291423
Change-Id: I56a71256be4f8de15f8126b815334277319e8e8a
Vladislav Kaznacheev [Wed, 20 Apr 2016 17:11:19 +0000 (17:11 +0000)]
Merge "Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 17:08:59 +0000 (17:08 +0000)]
Merge "QS tile lifecycle management" into nyc-dev
Yang Ni [Mon, 18 Apr 2016 23:56:16 +0000 (16:56 -0700)]
Made Element accessors thread-safe
Bug:
28177082
Change-Id: I8f3f2d8ce559e93cba29f8eedd5b95d1389deb23
(cherry picked from commit
33703f0c4e9b16bda5fd72e71d7d89359ee0db17)
Yang Ni [Wed, 20 Apr 2016 16:44:38 +0000 (16:44 +0000)]
Merge "Made Element accessors thread-safe" into nyc-dev
Phil Weaver [Wed, 20 Apr 2016 16:33:26 +0000 (16:33 +0000)]
Merge "Clear calling identity when binding a11y services" into nyc-dev
Amith Yamasani [Wed, 20 Apr 2016 16:24:45 +0000 (16:24 +0000)]
Merge "Reinitialize voice interaction service on unlock" into nyc-dev
am:
ea61e63
* commit '
ea61e63bf8f1f92a837fc42eed037aabaa8d03b9':
Reinitialize voice interaction service on unlock
Change-Id: I4858a2fe5d613574f748287ecc4fd980deb3d226
Amith Yamasani [Wed, 20 Apr 2016 16:19:44 +0000 (16:19 +0000)]
Merge "Reinitialize voice interaction service on unlock" into nyc-dev
Yi Kong [Wed, 20 Apr 2016 15:34:36 +0000 (16:34 +0100)]
Track libcore change
be1608980825868eb1c70fab6eb86fe06bd304ce
Bug:
27704598
Change-Id: I5cb900c7b48bc7b48ed0ea1110ff834e1d316de7
(cherry picked from commit
d7c695d25b1b75657bcbba6b61d62931a1b27d09)
(cherry picked from commit
a69302e9e2ebc04447b16657a4e706fb1241ee6b)
Yi Kong [Wed, 20 Apr 2016 15:48:00 +0000 (15:48 +0000)]
Yi Kong [Wed, 20 Apr 2016 15:44:56 +0000 (15:44 +0000)]
Jason Monk [Wed, 20 Apr 2016 15:41:36 +0000 (11:41 -0400)]
QS tile lifecycle management
Ensure we send out the current QSService and Tile to the TileService
before we write to mWrapper allowing other commands to come through.
Change-Id: Ia3f470083d97d85fa726b1add3706db6278c7d1e
Fixes:
27871492
Yi Kong [Wed, 20 Apr 2016 15:36:53 +0000 (15:36 +0000)]
Jason Monk [Wed, 20 Apr 2016 15:31:52 +0000 (15:31 +0000)]
Merge "QS custom tiles - better handling of invalid icons" into nyc-dev
am:
e6be9c5
* commit '
e6be9c58cca6a523960553faf164398b0297089c':
QS custom tiles - better handling of invalid icons
Change-Id: I6b976e5f3377012881b4eb4419c24f0bd6af9842
Jason Monk [Wed, 20 Apr 2016 15:25:42 +0000 (15:25 +0000)]
Merge "QS custom tiles - better handling of invalid icons" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 15:22:30 +0000 (15:22 +0000)]
Merge "Fix QS edit accessibility" into nyc-dev
am:
01dbf41
* commit '
01dbf41311ad24e8c6bcdddfd6720a12d6b30a74':
Fix QS edit accessibility
Change-Id: I6a0006bb9f85a87282cc0aefc40759a56d8fae7b
Jason Monk [Wed, 20 Apr 2016 14:54:55 +0000 (10:54 -0400)]
QS custom tiles - better handling of invalid icons
Change-Id: I7b174a078a9df840eb73def101d865a8d630db19
Fixes:
27871180
Jason Monk [Wed, 20 Apr 2016 15:14:50 +0000 (15:14 +0000)]
Merge "Fix QS edit accessibility" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 15:10:23 +0000 (11:10 -0400)]
Fix QS edit accessibility
Change-Id: Ibce7bdf480751994b318cba3a9954365f0ed8786
Fixes:
28194074
Philip P. Moltmann [Wed, 20 Apr 2016 15:06:47 +0000 (15:06 +0000)]
Merge "Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory." into nyc-dev
am:
a1a1aa3
* commit '
a1a1aa3c682215f0ac7251c43f77985b9aced2a2':
Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory.
Change-Id: I6a177370c3fdcf0d81eedc3bc383f389f058b06a
Philip P. Moltmann [Wed, 20 Apr 2016 15:01:03 +0000 (15:01 +0000)]
Merge "Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory." into nyc-dev
Yi Kong [Wed, 20 Apr 2016 14:15:52 +0000 (15:15 +0100)]
Track libcore change
be1608980825868eb1c70fab6eb86fe06bd304ce
Bug:
27704598
Change-Id: I5cb900c7b48bc7b48ed0ea1110ff834e1d316de7
Jason Monk [Wed, 20 Apr 2016 14:30:30 +0000 (14:30 +0000)]
Merge "Collapse QS panel after details if we expanded it before" into nyc-dev
am:
6dde42f
* commit '
6dde42f0ee2efe09a0021a6172f61d84800ad1c7':
Collapse QS panel after details if we expanded it before
Change-Id: Id21c4d906b99e8602997ca9c9623c3ab2c3a22e8
Steve McKay [Wed, 20 Apr 2016 14:30:27 +0000 (14:30 +0000)]
Merge "Only show OPEN button as needed." into nyc-dev
am:
d8c2459
* commit '
d8c2459b5010526853de8f35008efd1cafe950ac':
Only show OPEN button as needed.
Change-Id: Id0c72edb6417571595a48162cc97cae9ea0c62a0
Jason Monk [Wed, 20 Apr 2016 14:30:23 +0000 (14:30 +0000)]
Merge "Update QS header to handle 320dp without overlapping" into nyc-dev
am:
d637903
* commit '
d637903fe683bd4cf7403ee69e3d59e55e382c29':
Update QS header to handle 320dp without overlapping
Change-Id: I1fe29681d00767a60e017ba5fc0993b981718a7a
Jason Monk [Wed, 20 Apr 2016 14:25:22 +0000 (14:25 +0000)]
Merge "Collapse QS panel after details if we expanded it before" into nyc-dev
Steve McKay [Wed, 20 Apr 2016 14:25:05 +0000 (14:25 +0000)]
Merge "Only show OPEN button as needed." into nyc-dev
Jason Monk [Wed, 20 Apr 2016 14:21:25 +0000 (14:21 +0000)]
Merge "Update QS header to handle 320dp without overlapping" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 14:08:55 +0000 (10:08 -0400)]
Update QS header to handle 320dp without overlapping
Change-Id: I7f52ed8aac14bea6c2cdc9a6ef8087ff6ef1b802
Fixes:
28181221
Jason Monk [Wed, 20 Apr 2016 13:56:44 +0000 (13:56 +0000)]
Fix settings drawer when font size is huge
am:
8095309
* commit '
8095309791e276bec10a731e2b13fe8512cd8e42':
Fix settings drawer when font size is huge
Change-Id: I0b6216c52ec520891dc91b47b0b9fd0d4660e886
Jason Monk [Wed, 20 Apr 2016 13:44:22 +0000 (09:44 -0400)]
Fix settings drawer when font size is huge
Change-Id: Id720a7e7b471ddf01ed3682882656cd838eb860d
Fixes:
28181614
Rubin Xu [Wed, 20 Apr 2016 09:40:38 +0000 (09:40 +0000)]
Merge "Kill foreground apps when turning off work" into nyc-dev
am:
49425d6
* commit '
49425d612cee3864a316e9ecb6ec3faeae519b1e':
Kill foreground apps when turning off work
Change-Id: Ie8ea1ec98232437623c83f7d32c1f05c47580b35
Rubin Xu [Wed, 20 Apr 2016 09:33:51 +0000 (09:33 +0000)]
Merge "Kill foreground apps when turning off work" into nyc-dev
Keisuke Kuroyanagi [Wed, 20 Apr 2016 09:22:19 +0000 (09:22 +0000)]
Merge "Allow switching keyboard layout to null." into nyc-dev
am:
da067dc
* commit '
da067dcbf2f9376814e6a7ea8302f9dfcc5cef59':
Allow switching keyboard layout to null.
Change-Id: I8ab3a3f0da296d4d5c12bf540c5d14f205fc6ee1
Keisuke Kuroyanagi [Wed, 20 Apr 2016 09:12:50 +0000 (09:12 +0000)]
Merge "Allow switching keyboard layout to null." into nyc-dev
Robert Carr [Wed, 20 Apr 2016 05:31:09 +0000 (22:31 -0700)]
When restacking IM windows preserve relative order.
We were still having some troubles with attached windows which we
werent properly promoting here. Now we catch everything with
the mIsImWindow flag. Before it was safe to assume dialogs
were on top of the Input Method but with a whole range of child
windows we need to be more careful. WindowManagerService has
been very careful preparing the window list for us, so carry
out its wishes and preserve the original relative ordering of
input method windows when restacking.
Bug:
28235787
Change-Id: Ied96d83f77b82df81b3b0aa94cb61e9c22999d23
Vladislav Kaznacheev [Tue, 19 Apr 2016 22:24:52 +0000 (15:24 -0700)]
Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window
Bug:
28276601
Change-Id: Ic8da5c5ae422a9c9dd2d5bef898ee36a66b73afd
Sudheer Shanka [Wed, 20 Apr 2016 04:45:32 +0000 (21:45 -0700)]
Add restrictedSwitchSummary attribute to restricted switch preferences.
Bug:
27659072
Change-Id: If516adaed041ea0d66945ebf1dbe7945331d0da5
Tomasz Mikolajewski [Wed, 20 Apr 2016 04:03:25 +0000 (04:03 +0000)]
Merge changes I5e500724,I40cfb12c into nyc-dev
am:
0fb5135
* commit '
0fb51357afb64a034a59f68a926f79d18213c72c':
Restrict selection to 1000 items in DocumentsUI.
Cancel band selection on directory change.
Change-Id: Ia38b188789483ee24469f4091c44c5d059ae402d
Tomasz Mikolajewski [Wed, 20 Apr 2016 03:57:26 +0000 (03:57 +0000)]
Merge changes I5e500724,I40cfb12c into nyc-dev
* changes:
Restrict selection to 1000 items in DocumentsUI.
Cancel band selection on directory change.
Andreas Gampe [Wed, 20 Apr 2016 03:46:43 +0000 (20:46 -0700)]
Frameworks/base: Add holder to BaseBundle
Move EMPTY_PARCEL into an inner holder class. Add holder to
preloaded-classes. Clean up dependencies.
Allows to compile-time initialize:
* android.os.BaseBundle
* android.os.Bundle
* android.os.PersistableBundle
* android.telephony.CarrierConfigManager
Bug:
27265238
Change-Id: Ib8017aa419c2985963b3c68a8046462a38652ef2
Jakub Pawlowski [Wed, 20 Apr 2016 03:20:15 +0000 (03:20 +0000)]
Merge "OobData documentation" into nyc-dev
am:
75760e6
* commit '
75760e6b62e46fc9abcde523878459b08558f9d1':
OobData documentation
Change-Id: Ief21f781808b84c5c2f63eade310b90209d1cd83
Jakub Pawlowski [Wed, 20 Apr 2016 03:15:22 +0000 (03:15 +0000)]
Merge "OobData documentation" into nyc-dev
Adrian Roos [Wed, 20 Apr 2016 03:06:14 +0000 (03:06 +0000)]
Merge "Don\'t do anti-falsing on locked shade" into nyc-dev
am:
c75e08d
* commit '
c75e08d114650dc4c81bc8ffb03eab701bc39509':
Don't do anti-falsing on locked shade
Change-Id: I5092c5834e9faa4d022ed53f2acf0eda33829ac2
TreeHugger Robot [Wed, 20 Apr 2016 03:00:28 +0000 (03:00 +0000)]
Merge "Don't do anti-falsing on locked shade" into nyc-dev
Jorim Jaggi [Wed, 20 Apr 2016 02:56:29 +0000 (02:56 +0000)]
Merge "Fix wrong transition when recents is growing when entering" into nyc-dev
am:
50c410c
* commit '
50c410c1c91922e91fb8d1b873f6a541d1e2fd6c':
Fix wrong transition when recents is growing when entering
Change-Id: I5583e72244d8997c6cdeec8d142bd1e69a7428e5
Robert Carr [Wed, 20 Apr 2016 02:10:44 +0000 (19:10 -0700)]
Respect WRAP_CONTENT when resolving drop down position.
We recently added the width/height <0 check to prevent
passing unresolved widths in to tryFitVertical or
tryFitHorizontal and produce strange behaviors. This made
more sense than the code before it but still not that much
sense. We need to treat MATCH_PARENT and WRAP_CONTENT differently
as the documentation suggests.
Bug:
28267951
Change-Id: I6f2f248c8d1f63d31bdd75c24f7250c28381c712
TreeHugger Robot [Wed, 20 Apr 2016 01:48:38 +0000 (01:48 +0000)]
Merge "Fix wrong transition when recents is growing when entering" into nyc-dev
Adrian Roos [Wed, 20 Apr 2016 01:31:49 +0000 (01:31 +0000)]
Merge "Fix NPE in WallpaperDrawable" into nyc-dev
am:
75db039
* commit '
75db0392b89a7f83650f087227bcccda32833cfa':
Fix NPE in WallpaperDrawable
Change-Id: I2ab5f237ec31fd81ce0b3ff544b481d604bb9f97
Adam Lesinski [Wed, 20 Apr 2016 01:31:46 +0000 (01:31 +0000)]
Merge "Record in progress count when parceling Timer" into nyc-dev
am:
752434a
* commit '
752434a0ff54ac30b7701292b66361e64b2ae5a0':
Record in progress count when parceling Timer
Change-Id: Icc7e8312df00bd22f0e5433e15fc65d2ad705db4
Adam Lesinski [Wed, 20 Apr 2016 01:31:43 +0000 (01:31 +0000)]
Merge "Move batterystats stats collection to its own thread" into nyc-dev
am:
b7a92e6
* commit '
b7a92e6009fefc2cb390b886e6a971b0c8a3c2d8':
Move batterystats stats collection to its own thread
Change-Id: I1666398f7ef098bd343c2b7e9da54434d9f24eb5
TreeHugger Robot [Wed, 20 Apr 2016 01:27:34 +0000 (01:27 +0000)]
Merge "Fix NPE in WallpaperDrawable" into nyc-dev
Adam Lesinski [Wed, 20 Apr 2016 01:22:35 +0000 (01:22 +0000)]
Merge "Record in progress count when parceling Timer" into nyc-dev
Adam Lesinski [Wed, 20 Apr 2016 01:18:48 +0000 (01:18 +0000)]
Merge "Move batterystats stats collection to its own thread" into nyc-dev
Adrian Roos [Wed, 20 Apr 2016 00:41:34 +0000 (00:41 +0000)]
Merge "Disable anti-falsing logic with touch exploration" into nyc-dev
am:
ecdc5c4448
* commit '
ecdc5c44488cef2f1599b3759277c219cfd28da3':
Disable anti-falsing logic with touch exploration
Change-Id: Ie106da3e66c0eb0d3f02318df1dbbc7e6c7775f7
Adrian Roos [Wed, 20 Apr 2016 00:38:05 +0000 (00:38 +0000)]
Merge "Disable anti-falsing logic with touch exploration" into nyc-dev
Adam Lesinski [Wed, 20 Apr 2016 00:33:33 +0000 (17:33 -0700)]
Move batterystats stats collection to its own thread
Too many other tasks run on common handlers, and the batterystats collection
may block waiting for a timeout of up to 2 seconds.
Bug:
27857665
Change-Id: I5be1ddc374d69620f4f7d821eb29e8524294c9a4
Adrian Roos [Wed, 20 Apr 2016 00:09:07 +0000 (17:09 -0700)]
Don't do anti-falsing on locked shade
The user has already passed the keyguard test by
dragging down. We're not doing anti falsing at this
point and doing it on the affordance was triggering
a crash on debuggable builds (and not working at all
on regular builds).
Change-Id: Icaf81e8e2a38503851c7b5699a0f5a3d363dac19
Fixes:
28154836
Sudheer Shanka [Wed, 20 Apr 2016 00:27:52 +0000 (17:27 -0700)]
Fix additional summary of RestrictedSwitchPreference.
Bug:
27659072
Change-Id: I27fec7d5bf3daeb5525cf45c328aa2f0c93f7490
Winson [Wed, 20 Apr 2016 00:26:30 +0000 (00:26 +0000)]
Merge "Fixing crash when dumping secondary SystemUI user service." into nyc-dev
am:
5d65340fc5
* commit '
5d65340fc5b5a0becd204b3feb9627b2de33fceb':
Fixing crash when dumping secondary SystemUI user service.
Change-Id: I000cd1818b2ad7f3cf097247b7c0eee0a427f44d
Adam Lesinski [Tue, 19 Apr 2016 23:46:20 +0000 (16:46 -0700)]
Record in progress count when parceling Timer
The total time is computed before parceling, but the total count is not.
Bug:
27747854
Change-Id: If3afdca9605f74d96a54fb9df17f6df761b99e55