OSDN Git Service
Ricky Wai [Thu, 26 May 2016 14:03:51 +0000 (14:03 +0000)]
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev
am:
1cb6f9d8a4
* commit '
1cb6f9d8a4827d50e26bf83068a928e47c5c1f1e':
Add resetKeyStore() in LockSettingsService
Change-Id: I6af43eb9f472c1d5a1f9356a9b618a183200e38e
Ricky Wai [Thu, 26 May 2016 14:02:12 +0000 (14:02 +0000)]
Merge "Store work lock type even it uses unified lock" into nyc-dev
am:
610fb8a3f2
* commit '
610fb8a3f2dcdc66dbc4e31d92a08cc249b5ca7b':
Store work lock type even it uses unified lock
Change-Id: I98c209ec1c3fd63d2abd597f1f38d9fc86dd5275
Ricky Wai [Thu, 26 May 2016 13:46:25 +0000 (13:46 +0000)]
Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev
Ricky Wai [Thu, 26 May 2016 13:46:11 +0000 (13:46 +0000)]
Merge "Store work lock type even it uses unified lock" into nyc-dev
Nicolas Prevot [Thu, 26 May 2016 11:06:30 +0000 (11:06 +0000)]
Merge "Use correct user id when checking uri grants for notification." into nyc-dev
am:
19d34821b9
* commit '
19d34821b9c0a74d4269fff0bee87a7f486e1603':
Use correct user id when checking uri grants for notification.
Change-Id: I13aff9bc96e465e5a18c8ec44c3c709bc221a8b1
Nicolas Prévot [Thu, 26 May 2016 10:37:31 +0000 (10:37 +0000)]
Merge "Use correct user id when checking uri grants for notification." into nyc-dev
Yi Kong [Thu, 26 May 2016 09:09:08 +0000 (09:09 +0000)]
Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev
am:
03a1314f2e
* commit '
03a1314f2e9040d48488c7cf38dba273ba669284':
Docs: Update content license page to include Javadocs licenses
Change-Id: Id2217b3e60ac0c5325f2fb1eb3c2fc19445d0577
Yi Kong [Thu, 26 May 2016 08:54:56 +0000 (08:54 +0000)]
Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev
Lajos Molnar [Thu, 26 May 2016 06:27:34 +0000 (06:27 +0000)]
Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev
am:
40585321d7
* commit '
40585321d7b036ce7f609fbf10e8730deb1ad456':
media: check profile, level and bitrate for isFormatSupported
Change-Id: I86e99d56a5048554fe02f9472f8e81dfe0fbc15a
Lajos Molnar [Thu, 26 May 2016 06:14:03 +0000 (06:14 +0000)]
Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev
Dirk Dougherty [Thu, 26 May 2016 05:53:48 +0000 (05:53 +0000)]
Merge "Remove spurious url reference." into mnc-mr-docs am:
1ed701493a am:
a7c0788467 am:
1cf99365cb
am:
a283dabdf5
* commit '
a283dabdf51427dfb5b8be0e6ab86292cb56b72d':
Remove spurious url reference.
Change-Id: I3d702473090d1fdf9320d359dc0d6feb4eba47c6
Dirk Dougherty [Thu, 26 May 2016 05:44:29 +0000 (05:44 +0000)]
Merge "Remove spurious url reference." into mnc-mr-docs am:
1ed701493a am:
a7c0788467
am:
1cf99365cb
* commit '
1cf99365cb98174bd4300c7f0c799e94f6aab907':
Remove spurious url reference.
Change-Id: I744e556ebdb729314542dd9115346d42daf63e09
Dirk Dougherty [Thu, 26 May 2016 05:35:46 +0000 (05:35 +0000)]
Merge "Remove spurious url reference." into mnc-mr-docs am:
1ed701493a
am:
a7c0788467
* commit '
a7c0788467d865e72ddbaa5862382d8ecc164039':
Remove spurious url reference.
Change-Id: Ifb9a772d89c60124334b3a78a2f5864f879d104f
Dirk Dougherty [Thu, 26 May 2016 05:17:01 +0000 (05:17 +0000)]
Merge "Remove spurious url reference." into mnc-mr-docs
am:
1ed701493a
* commit '
1ed701493a6363c58b86de8dac600fca990a131a':
Remove spurious url reference.
Change-Id: I6b304fe5f87804f9c0d4de9bfef92437810ac9ea
Dirk Dougherty [Thu, 26 May 2016 05:03:24 +0000 (05:03 +0000)]
Merge "Remove spurious url reference." into mnc-mr-docs
Chad Brubaker [Thu, 26 May 2016 05:00:35 +0000 (05:00 +0000)]
Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am:
c0f99aebdc" into mnc-io-docs am:
ce99e3c571 am:
11b56641e5
am:
86bceb87ca
* commit '
86bceb87ca8177200977024f4757edaf1233d4be':
Track changes to network security config manifest configuration
Change-Id: Id4b8b2a06cd2cbebcd47964e05157199c9cf9b31
Joe Fernandez [Thu, 26 May 2016 05:00:12 +0000 (05:00 +0000)]
Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am:
9e823c7048 am:
1a045584d4
am:
68fb46153f
* commit '
68fb46153f8649e2d4027a5e79cfc1786764a746':
docs: Remove Advertising ID page and redirect to GMS reference docs
Change-Id: I7ff0d7995f26d9e47609322f91a9ac71c9b2b80d
Chad Brubaker [Thu, 26 May 2016 04:47:44 +0000 (04:47 +0000)]
Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am:
c0f99aebdc" into mnc-io-docs am:
ce99e3c571
am:
11b56641e5
* commit '
11b56641e5e466f5ca14bd118e819c3f04820d38':
Track changes to network security config manifest configuration
Change-Id: I25e463154d084223dbafdf3e2ab99bfdb52769fb
Joe Fernandez [Thu, 26 May 2016 04:47:34 +0000 (04:47 +0000)]
Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am:
9e823c7048
am:
1a045584d4
* commit '
1a045584d44030947793f2a48953ce54ff2df0c6':
docs: Remove Advertising ID page and redirect to GMS reference docs
Change-Id: If2ede00cf1ab2bdb178eed09ec6f9cd6d28f8820
Chad Brubaker [Thu, 26 May 2016 04:37:17 +0000 (04:37 +0000)]
Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am:
c0f99aebdc" into mnc-io-docs
am:
ce99e3c571
* commit '
ce99e3c57133b4418be4f0e2c8bc7dd9ea2815d2':
Track changes to network security config manifest configuration
Change-Id: I6a09710dcef8b19c429f28fa90d72fd38284de3e
Joe Fernandez [Thu, 26 May 2016 04:37:09 +0000 (04:37 +0000)]
Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs
am:
9e823c7048
* commit '
9e823c7048bce9373fd5ccf10003b2eb05175b2b':
docs: Remove Advertising ID page and redirect to GMS reference docs
Change-Id: Ie5649d42ece35f36130abefd00c3a53d5252cd03
Android Build Merger (Role) [Thu, 26 May 2016 04:26:32 +0000 (04:26 +0000)]
Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am:
c0f99aebdc" into mnc-io-docs
Joe Fernandez [Thu, 26 May 2016 04:26:24 +0000 (04:26 +0000)]
Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs
Chad Brubaker [Thu, 26 May 2016 04:26:11 +0000 (04:26 +0000)]
Merge "Track changes to network security config manifest configuration" into mnc-mr-docs
am:
c0f99aebdc
* commit '
c0f99aebdc7c803600e12cbe0d940219069eb066':
Track changes to network security config manifest configuration
Change-Id: I46fc434934428ffbdfd7816c0a3b2590f97d4713
Chad Brubaker [Thu, 26 May 2016 04:09:39 +0000 (04:09 +0000)]
Merge "Track changes to network security config manifest configuration" into mnc-mr-docs
Seigo Nonaka [Thu, 26 May 2016 04:07:40 +0000 (04:07 +0000)]
Merge "Fix system locale propagation during user creation." into nyc-dev
am:
ce9f5e3657
* commit '
ce9f5e3657b7a8fb68c6c65a2cd5a27eaf556cc8':
Fix system locale propagation during user creation.
Change-Id: If31dcbe28d108ec12aa9f4aef4382dcb2da90aaf
Seigo Nonaka [Thu, 26 May 2016 03:51:38 +0000 (03:51 +0000)]
Merge "Fix system locale propagation during user creation." into nyc-dev
Dirk Dougherty [Thu, 26 May 2016 03:29:59 +0000 (20:29 -0700)]
Remove spurious url reference.
Change-Id: I35e5869ed71677b11af8c451a16661faa896ca1f
Trevor Johns [Thu, 26 May 2016 02:36:42 +0000 (02:36 +0000)]
docs: Fix broken link in Volley training am:
05dd9d2c29 am:
346114e346 am:
c8c2abed0e am:
46c1d5a5d2
am:
5513b6776e
* commit '
5513b6776e0b00fd0444cf4f964451d0ef61a511':
docs: Fix broken link in Volley training
Change-Id: Ia030a066b44dfd842a8ea411001dbf454003fb20
Trevor Johns [Thu, 26 May 2016 02:19:23 +0000 (02:19 +0000)]
docs: Fix broken link in Volley training am:
05dd9d2c29 am:
346114e346 am:
c8c2abed0e
am:
46c1d5a5d2
* commit '
46c1d5a5d2b4c1d6a680f7af5c3973486c1fef2c':
docs: Fix broken link in Volley training
Change-Id: Ib5ae3925cca39db0145bb4c6e6eeb53488bfc316
Trevor Johns [Thu, 26 May 2016 01:59:17 +0000 (01:59 +0000)]
docs: Fix broken link in Volley training am:
05dd9d2c29 am:
346114e346
am:
c8c2abed0e
* commit '
c8c2abed0e7418d7e0fb0ef73a0c363cec011b95':
docs: Fix broken link in Volley training
Change-Id: I916717fca33fc1466cd1c022c6a4f5f931d00ebe
Adam Lesinski [Thu, 26 May 2016 01:38:34 +0000 (01:38 +0000)]
Merge "Use app\'s best locale if they override LocaleList" into nyc-dev
am:
fbf3a0964a
* commit '
fbf3a0964a458508f834bffd18198394037bb5c1':
Use app's best locale if they override LocaleList
Change-Id: I5a38d95f1ea7d7fd676fa60effa467af219c75cf
Joe Fernandez [Thu, 26 May 2016 01:36:12 +0000 (18:36 -0700)]
docs: Remove Advertising ID page and redirect to GMS reference docs
b/
28965089
Change-Id: I16141cf5711358c1b38f7e28a8150e2281990eb6
Trevor Johns [Thu, 26 May 2016 01:32:43 +0000 (01:32 +0000)]
docs: Fix broken link in Volley training am:
05dd9d2c29
am:
346114e346
* commit '
346114e3467cc06b2a90467a00288f6944dd969b':
docs: Fix broken link in Volley training
Change-Id: Ifb20e8fd2a2c4d87786e61e6490e52dd06742810
Adam Powell [Thu, 26 May 2016 01:22:00 +0000 (01:22 +0000)]
Merge "N is API 24" into nyc-dev
am:
bc983c4431
* commit '
bc983c443139c7b4605f98d56bd9ad7652a9938b':
N is API 24
Change-Id: Ib90f6e51c793d1cb61f806196b93736edf2014d8
Trevor Johns [Thu, 26 May 2016 01:18:44 +0000 (01:18 +0000)]
docs: Fix broken link in Volley training
am:
05dd9d2c29
* commit '
05dd9d2c291c3b5becdf27b78cc0685be3bb5389':
docs: Fix broken link in Volley training
Change-Id: Ia20dd9788d855129033c82e2161e01dc382d85b7
TreeHugger Robot [Thu, 26 May 2016 01:11:02 +0000 (01:11 +0000)]
Merge "Use app's best locale if they override LocaleList" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 01:03:06 +0000 (01:03 +0000)]
Merge "N is API 24" into nyc-dev
Sid Soundararajan [Thu, 26 May 2016 00:54:04 +0000 (00:54 +0000)]
Merge "Make content descriptions of task cards, the title description" into nyc-dev
am:
7cb7a0aa60
* commit '
7cb7a0aa60f0f01fbcb5b5023f642c527f3f1985':
Make content descriptions of task cards, the title description
Change-Id: I85d3cc167f795e236efd3d2f7452cf0cca862899
Dianne Hackborn [Thu, 26 May 2016 00:53:58 +0000 (00:53 +0000)]
Merge "Fix issue #
28964589: Binding dies when (unrelated) component is disabled in package" into nyc-dev
am:
dbcca24f8e
* commit '
dbcca24f8e239a34ededaef8a7fc924c196f98cb':
Fix issue #
28964589: Binding dies when (unrelated) component is disabled in package
Change-Id: I020e1ccbd04ada3c1ff7826042bc476b8a755584
Alan Viverette [Thu, 26 May 2016 00:53:51 +0000 (00:53 +0000)]
Merge "Fix borderless colored button text color" into nyc-dev
am:
8f0ab27570
* commit '
8f0ab27570ef48b234c9454804b42cf28e0a7313':
Fix borderless colored button text color
Change-Id: Ife5682065ff85bfea6123fbe552e11e2067584d3
Sid Soundararajan [Thu, 26 May 2016 00:45:27 +0000 (00:45 +0000)]
Merge "Make content descriptions of task cards, the title description" into nyc-dev
Dianne Hackborn [Thu, 26 May 2016 00:43:32 +0000 (00:43 +0000)]
Merge "Fix issue #
28964589: Binding dies when (unrelated) component is disabled in package" into nyc-dev
Alan Viverette [Thu, 26 May 2016 00:40:17 +0000 (00:40 +0000)]
Merge "Fix borderless colored button text color" into nyc-dev
Andrii Kulian [Thu, 26 May 2016 00:36:19 +0000 (00:36 +0000)]
Merge "Fix exception when trying to update config of detached stack" into nyc-dev
am:
a1984286d3
* commit '
a1984286d397e4198d4e26572fb54cd55dce6d20':
Fix exception when trying to update config of detached stack
Change-Id: Id7fca21dc2a23206e2b241f90ac1119cf5281e18
Chris Tate [Thu, 26 May 2016 00:34:16 +0000 (00:34 +0000)]
Merge "Merge "Backport of backup transport whitelist" into mnc-dev am:
2cfc6baa22 am:
600d4f61ca am:
c69aa838a8 am:
38a37f336f -s ours" into nyc-dev
am:
36a1b38e89
* commit '
36a1b38e899687b217fe6e043022ed83fc37386b':
Backport of backup transport whitelist
Change-Id: Iaac686d1ac503ab9799a1de1d10f8bb874d8199a
Stephan Linzner [Thu, 26 May 2016 00:33:05 +0000 (00:33 +0000)]
Merge "Un-deprecated Android mock testing APIs" into nyc-dev
am:
dac0708ea0
* commit '
dac0708ea0efab696cd772ab346becbcc03232e6':
Un-deprecated Android mock testing APIs
Change-Id: I21d0f3a65af94074ba477d4acaa20ff9686f9f5c
Andrii Kulian [Thu, 26 May 2016 00:24:07 +0000 (00:24 +0000)]
Merge "Fix exception when trying to update config of detached stack" into nyc-dev
Android Build Merger (Role) [Thu, 26 May 2016 00:23:59 +0000 (00:23 +0000)]
Merge "Merge "Backport of backup transport whitelist" into mnc-dev am:
2cfc6baa22 am:
600d4f61ca am:
c69aa838a8 am:
38a37f336f -s ours" into nyc-dev
Chris Tate [Thu, 26 May 2016 00:22:47 +0000 (00:22 +0000)]
Merge "Backport of backup transport whitelist" into mnc-dev am:
2cfc6baa22 am:
600d4f61ca am:
c69aa838a8
am:
38a37f336f -s ours
* commit '
38a37f336f96896146efc1a85310504bf4f77116':
Backport of backup transport whitelist
Change-Id: I63c06c0bdfc8a8a254bdf81fce5a76b46c59bfd8
TreeHugger Robot [Thu, 26 May 2016 00:22:28 +0000 (00:22 +0000)]
Merge "Un-deprecated Android mock testing APIs" into nyc-dev
Phil Weaver [Thu, 26 May 2016 00:18:34 +0000 (00:18 +0000)]
Merge "Improve accessibility window title behavior" into nyc-dev
am:
7ab1a4d286
* commit '
7ab1a4d286898acffd1f3b444f9efc9e1d2a104e':
Improve accessibility window title behavior
Change-Id: I29286da845751351f3dcf603efb12441a6efe74e
Phil Weaver [Thu, 26 May 2016 00:11:23 +0000 (00:11 +0000)]
Merge "Improve accessibility window title behavior" into nyc-dev
Sid Soundararajan [Thu, 26 May 2016 00:08:12 +0000 (17:08 -0700)]
Make content descriptions of task cards, the title description
Use the title description as content description for the task
card, this should be better for talkback.
BUG:
28594452
Change-Id: Idc97004f1370a35ea5328c4e9e46a72a9349c8f4
Roshan Pius [Wed, 25 May 2016 23:59:47 +0000 (23:59 +0000)]
Merge "BatteryStats: Allow for sample errors in wlan stats" into nyc-dev
am:
135c4760fd
* commit '
135c4760fddc7809ea5f7e9d58bc3f4b3a076875':
BatteryStats: Allow for sample errors in wlan stats
Change-Id: Ia7440d790dfe6f1c1e9d7c564cd9cc4f9df6342d
TreeHugger Robot [Wed, 25 May 2016 23:51:00 +0000 (23:51 +0000)]
Merge "BatteryStats: Allow for sample errors in wlan stats" into nyc-dev
Derek Tan [Wed, 25 May 2016 23:50:45 +0000 (23:50 +0000)]
Merge "Per API review, revert the API renaming CL." into nyc-dev
am:
03d3f4a6cb
* commit '
03d3f4a6cb2c2d7b92e5cff09e5e7daefba398e9':
Per API review, revert the API renaming CL.
Change-Id: Ic5fb3154e837742622e27fbc2d68eb19930a2faf
Adam Lesinski [Wed, 25 May 2016 23:45:14 +0000 (16:45 -0700)]
Use app's best locale if they override LocaleList
App's can technically override their configuration's Locale,
which means we must choose the overriden locale as the best,
and therefore set the LocaleList.setDefault() with that locale.
Bug:
28953437
Change-Id: I4b301fcd6bc426e37bb389d3a6f2b4a3c69ac33a
Adam Powell [Wed, 25 May 2016 23:36:41 +0000 (16:36 -0700)]
N is API 24
Change-Id: Ifea71ccff96c3c70f9f3e60ecdcb2b56af82bb08
Derek Tan [Wed, 25 May 2016 23:41:19 +0000 (23:41 +0000)]
Merge "Per API review, revert the API renaming CL." into nyc-dev
Philip P. Moltmann [Wed, 25 May 2016 23:22:24 +0000 (23:22 +0000)]
Merge "Move add-printer list headers to the right positions." into nyc-dev
am:
00e3c23265
* commit '
00e3c232656e648376c94a78b568c3ca1fe8c123':
Move add-printer list headers to the right positions.
Change-Id: I43e2a7a548bbb21223f1007c03c57a00aa966402
Christopher Tate [Wed, 25 May 2016 23:16:02 +0000 (23:16 +0000)]
Merge "Backport of backup transport whitelist" into mnc-dev am:
2cfc6baa22 am:
600d4f61ca
am:
c69aa838a8
* commit '
c69aa838a8f89ba7476ce554ecf5a19a6de78b28':
Backport of backup transport whitelist
Change-Id: I0151279dfa467d6f456c2cfb4066cbc2ff4f7365
Trevor Johns [Wed, 25 May 2016 23:10:56 +0000 (16:10 -0700)]
docs: Fix broken link in Volley training
Inline link from from "Making a Standard Request" to "Implementing a
Custom Request" had a typo in the URL string.
Change-Id: I8f7d79e47ea82f423b9e56ef6d908938564a3fe9
Dianne Hackborn [Wed, 25 May 2016 23:12:02 +0000 (16:12 -0700)]
Fix issue #
28964589: Binding dies when (unrelated) component is disabled in package
We go through the same path for uninstalling and changing an app...
both of which would do a full force stop. That is only appropriate
for uninstalling; for changing, we should just be killing its processes.
Change-Id: Ia87750d96d3e3eb7ee30841429eb926c20c5ad78
Philip P. Moltmann [Wed, 25 May 2016 23:10:25 +0000 (23:10 +0000)]
Merge "Move add-printer list headers to the right positions." into nyc-dev
Chris Tate [Wed, 25 May 2016 23:06:54 +0000 (23:06 +0000)]
Merge "Backport of backup transport whitelist" into mnc-dev am:
2cfc6baa22
am:
600d4f61ca
* commit '
600d4f61ca15b375c9acef64d52913f0ab823deb':
Backport of backup transport whitelist
Change-Id: I308a0f0284990dc8e327c581cac49db899ad6cfa
Chong Zhang [Wed, 25 May 2016 22:59:03 +0000 (22:59 +0000)]
Merge "Update dock stack create mode after rotation if dock side changed" into nyc-dev
am:
e55e4b7f73
* commit '
e55e4b7f73be3b3babd28581a839d0b9700d555d':
Update dock stack create mode after rotation if dock side changed
Change-Id: I1d795081651be6535603606de7a7728a98b42bf2
Stephan Linzner [Wed, 25 May 2016 22:48:29 +0000 (15:48 -0700)]
Un-deprecated Android mock testing APIs
Some mock APIs don't have an ATSL equivalent yet
will be deprecated in O timeframe now.
Change-Id: Ibb7ec32fba3d16f0ea02d100f4e4fc8f011288f0
Bug:
28295815
Miao Wang [Wed, 25 May 2016 22:50:08 +0000 (22:50 +0000)]
Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." am:
f1f13f98b5
am:
349e2f1558
* commit '
349e2f15585136b323f68a5479051d9531605eb4':
[RenderScript] Fix ScriptIntrinsicBlur documentation.
Change-Id: Icbc0bdb1f140aa528b1f06465a87db9c6934c592
Miao Wang [Wed, 25 May 2016 22:50:03 +0000 (22:50 +0000)]
Merge "Update documentation about copyTo and copyFrom." am:
4cd38c30e6
am:
e31342e692
* commit '
e31342e692c3df7bc791a9320a233d2e9cec7c8a':
Update documentation about copyTo and copyFrom.
Change-Id: Ifbfe89186dfbfa691bae798c5fadcfe6ed75a431
Christopher Tate [Wed, 25 May 2016 22:45:49 +0000 (22:45 +0000)]
Merge "Backport of backup transport whitelist" into mnc-dev
am:
2cfc6baa22
* commit '
2cfc6baa2286a256585a7fb6295f9b66ff641726':
Backport of backup transport whitelist
Change-Id: I73dff5d354cd5f26a7f2e68e16f8dd798d610fd3
Miao Wang [Wed, 25 May 2016 22:43:13 +0000 (22:43 +0000)]
Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation."
am:
f1f13f98b5
* commit '
f1f13f98b58467b69c0ac9d4ba43d3f083525966':
[RenderScript] Fix ScriptIntrinsicBlur documentation.
Change-Id: Ib2c03454a8fa19a279820a2809686646f54bdfc9
Miao Wang [Wed, 25 May 2016 22:43:07 +0000 (22:43 +0000)]
Merge "Update documentation about copyTo and copyFrom."
am:
4cd38c30e6
* commit '
4cd38c30e609c2ddb6ee3f8785750ff6a12c57d6':
Update documentation about copyTo and copyFrom.
Change-Id: I9125dec95270b265fba34db5ed6e9df6deaed5c3
Chong Zhang [Wed, 25 May 2016 22:42:55 +0000 (22:42 +0000)]
Merge "Update dock stack create mode after rotation if dock side changed" into nyc-dev
Chris Tate [Wed, 25 May 2016 22:30:56 +0000 (22:30 +0000)]
Merge "Backport of backup transport whitelist" into mnc-dev
Miao Wang [Wed, 25 May 2016 22:28:34 +0000 (22:28 +0000)]
Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation."
Chong Zhang [Wed, 25 May 2016 21:30:36 +0000 (14:30 -0700)]
Update dock stack create mode after rotation if dock side changed
On some devices (such as tablets) dock stack could be created on top,
but put to right after rotation. Dock create mode needs to be updated
in this case, otherwise when a new stack is attached to the display
(for example launch into now-cropped fullscreen stack),
attachDisplayContent() will use wrong dock mode to derive the bounds.
bug:
28942558
Change-Id: I83e66aeac94bd3f96c4b6a0a740acf76234bbe82
Sid Soundararajan [Wed, 25 May 2016 22:25:40 +0000 (22:25 +0000)]
Merge "Alternate method for adding dismiss in talkback" into nyc-dev
am:
436da616c8
* commit '
436da616c89cc860e71a858be8792fc068646d1e':
Alternate method for adding dismiss in talkback
Change-Id: I8dbad668aa3accbe9d91dc634cbcbd5d1d4e820b
Miao Wang [Wed, 25 May 2016 22:25:39 +0000 (22:25 +0000)]
Merge "Update documentation about copyTo and copyFrom."
Antonio Cansado [Wed, 25 May 2016 22:25:27 +0000 (22:25 +0000)]
Merge "Cleaning up NetworkStatsManager." into nyc-dev
am:
c45f0aea71
* commit '
c45f0aea71944464b7636023f56a53fa635c09e2':
Cleaning up NetworkStatsManager.
Change-Id: I236ffb5f753834931511d7df01333670de01604f
Sid Soundararajan [Wed, 25 May 2016 22:23:04 +0000 (22:23 +0000)]
Merge "Alternate method for adding dismiss in talkback" into nyc-dev
Antonio Cansado [Wed, 25 May 2016 22:17:20 +0000 (22:17 +0000)]
Merge "Cleaning up NetworkStatsManager." into nyc-dev
Siyamed Sinir [Wed, 25 May 2016 22:09:31 +0000 (22:09 +0000)]
Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev
am:
e747160509
* commit '
e747160509e71a05430168b1c8a28400b6a18403':
Fix TextView layout reuse when maxLines is set
Change-Id: I7f1d3acb519a91388dbf03db28ee039b5d4b7b1c
Siyamed Sinir [Wed, 25 May 2016 22:03:06 +0000 (22:03 +0000)]
Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev
Amanda Kassay [Wed, 25 May 2016 21:56:35 +0000 (21:56 +0000)]
Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am:
c68d8768c8" into mnc-io-docs am:
cb3ae33cfe am:
a475ff360c
am:
29b04437b1
* commit '
29b04437b18402abefb40e696adf6434db0bf914':
Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."
Change-Id: I1c53f8121ee43691354d66885e6c1c71c777c959
Eric Schmidt [Wed, 25 May 2016 21:56:31 +0000 (21:56 +0000)]
Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs am:
5548a7c59c am:
3c2709c6b7
am:
31e070a1b3
* commit '
31e070a1b35bf3658f8a803eeabe094ec1b2d826':
docs: Instant Apps broken link, wonky video thumbnail
Change-Id: If3669044623c465e5797eae64899042f3e5a9d00
Amanda Kassay [Wed, 25 May 2016 21:50:13 +0000 (21:50 +0000)]
Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am:
c68d8768c8" into mnc-io-docs am:
cb3ae33cfe
am:
a475ff360c
* commit '
a475ff360c9457ecbef6af97ca7228dc9cd5c139':
Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."
Change-Id: Ibe99c1f7e47acacf7b60f8ad66a7a3d658776413
Eric Schmidt [Wed, 25 May 2016 21:50:00 +0000 (21:50 +0000)]
Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs am:
5548a7c59c
am:
3c2709c6b7
* commit '
3c2709c6b7b40f0a31674a775f891ca4e198cfa5':
docs: Instant Apps broken link, wonky video thumbnail
Change-Id: Ib072e701b8793baba0c9da9a24748dc89b1dae55
Miao Wang [Wed, 13 Apr 2016 23:43:10 +0000 (16:43 -0700)]
[RenderScript] Fix ScriptIntrinsicBlur documentation.
Bug:
28177406
Change-Id: Icccf35857cf29f827a78704e7751c8791cda0d7b
(cherry picked from commit
c242fa6b5d7b8624b5ce710c1e2740c5bb9679dd)
Miao Wang [Fri, 1 Apr 2016 22:10:47 +0000 (15:10 -0700)]
Update documentation about copyTo and copyFrom.
Bug:
23159764
Bug:
26862970
- Add detailed description of AutoPadding
- Add comments to all the copy related APIs.
- Fix typos in the comments.
Change-Id: I2d045e0d90efd94f1407f88d3e35bcd42ea93fb9
(cherry picked from commit
3231e8e0220614f7b1628493da5f276f19faab7c)
Amanda Kassay [Wed, 25 May 2016 21:35:54 +0000 (21:35 +0000)]
Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am:
c68d8768c8" into mnc-io-docs
am:
cb3ae33cfe
* commit '
cb3ae33cfe5fdb73e648dc08bdf2ea0b19116b86':
Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."
Change-Id: I33fec5a25e6648db7b6fd0da06794c0ce7bd8ed5
Eric Schmidt [Wed, 25 May 2016 21:35:43 +0000 (21:35 +0000)]
Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs
am:
5548a7c59c
* commit '
5548a7c59cf6a41095c72189fee7e522b5cab8f1':
docs: Instant Apps broken link, wonky video thumbnail
Change-Id: I08d7e4c62072bffd01db4f1192cadbc1d033306b
Android Build Merger (Role) [Wed, 25 May 2016 21:28:19 +0000 (21:28 +0000)]
Merge "Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." am:
c68d8768c8" into mnc-io-docs
Alan Viverette [Wed, 25 May 2016 21:28:06 +0000 (21:28 +0000)]
Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev
am:
29c01336db
* commit '
29c01336db4b2db5582904597559b14563543054':
Fix DatePicker.setMin/MaxDate()
Change-Id: I34440f70e6771a6e97cd46e78548167f02bb5e82
Amanda Kassay [Wed, 25 May 2016 21:28:01 +0000 (21:28 +0000)]
Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."
am:
c68d8768c8
* commit '
c68d8768c84dd045d3db3f685a95963eb315be8c':
Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."
Change-Id: I40fa99170770712c4d844eab0d1e3d6fa9373d90
Andrii Kulian [Wed, 25 May 2016 21:27:39 +0000 (14:27 -0700)]
Fix exception when trying to update config of detached stack
There is an NullPointerException which can be reproduced with following steps
on angler:
1. In split-screen open activities from the same app.
Make sure to launch them from launcher.
2. Rotate device to landscape.
3. Force-stop the app using adb command.
After killing the app it will try to open launcher, which is fixed in
portrait mode on that device. This will update the configuration for all the
stacks, including already detached.
Bug:
28786255
Change-Id: Ia326c09cff9f1a3fb43cca5b48db29718553346a
Eric Schmidt [Wed, 25 May 2016 21:27:34 +0000 (21:27 +0000)]
Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs
Robin Lee [Wed, 25 May 2016 21:20:43 +0000 (21:20 +0000)]
Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev
am:
48b18f4fa9
* commit '
48b18f4fa994e201e3eb4cca1e7c823b198359c5':
Return legacy VPN info regardless of lockdown mode
Change-Id: I89c0784d5edae3c7ef9f8ec1c6ee4f823dbbae02
Alan Viverette [Wed, 25 May 2016 21:17:52 +0000 (21:17 +0000)]
Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev
Amanda Kassay [Wed, 25 May 2016 20:59:53 +0000 (20:59 +0000)]
Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."
This reverts commit
85b7df26975997826a738a46ae4ab797941175ea.
Change-Id: I5c0256cbdc0f3c3588f10eb5accef8cf68642bbb