OSDN Git Service
TreeHugger Robot [Thu, 26 May 2016 16:56:12 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Julia Reynolds [Thu, 26 May 2016 16:50:56 +0000 (16:50 +0000)]
Merge "Importance slider updates." into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 16:49:49 +0000 (16:49 +0000)]
Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev
Jason Monk [Thu, 26 May 2016 16:46:47 +0000 (16:46 +0000)]
Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev
Robin Lee [Thu, 26 May 2016 16:42:16 +0000 (16:42 +0000)]
Merge "Check if we're connected before marking a UID blocked" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 16:35:28 +0000 (16:35 +0000)]
Merge "add metrics for notification and group expansion" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 16:35:20 +0000 (16:35 +0000)]
Merge "boost starred people to at least high importance" into nyc-dev
Jonathan Basseri [Thu, 26 May 2016 15:50:03 +0000 (15:50 +0000)]
Merge "Change how TelephonyManager handles subscriptions." into nyc-dev
Ji Yang [Thu, 26 May 2016 15:40:11 +0000 (15:40 +0000)]
Merge "Rename carrier messaging API constant." into nyc-dev
Jeff Sharkey [Thu, 26 May 2016 15:31:04 +0000 (09:31 -0600)]
Cache IMountService for isUserKeyUnlocked() calls.
This avoids doing a ServiceManager lookup for every call through
this hot code-path.
Bug:
28946245
Change-Id: I210ce34b33e5b40a5ab4e92ddce87fc5e9964be2
Robin Lee [Tue, 24 May 2016 15:35:10 +0000 (16:35 +0100)]
Check if we're connected before marking a UID blocked
This kills the always-on test, and any third-party app that correctly
checks whether it's blocked before attempting to make a connection.
Only affects always-on VPN when lockdown=true.
Bug:
28909500
Change-Id: I87aa9598d3872ae2ec409c2b19d73052c21ec878
Julia Reynolds [Thu, 26 May 2016 15:07:49 +0000 (11:07 -0400)]
Importance slider updates.
Icon & tint.
Bug:
28911161
Change-Id: Id8c3a4b79326eb5073a600de49ac14ae7223b398
Jason Monk [Wed, 25 May 2016 18:22:01 +0000 (14:22 -0400)]
QS: Make hotspot go unavailable in airplane mode
Put the hotspot tile in the unavailable state whenever airplane
mode is on.
Change-Id: I7a6eb54c2e89a7a9736c72d8e58ab58e7e82d0a6
Fixes:
28881032
Michael Wright [Thu, 26 May 2016 14:03:46 +0000 (14:03 +0000)]
Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev
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 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 08:54:56 +0000 (08:54 +0000)]
Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev
Bill Yi [Thu, 26 May 2016 07:41:49 +0000 (00:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I20074824d92bd827a9f12d13f659d52286be1007
Auto-generated-cl: translation import
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: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 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 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: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
Jonathan Basseri [Wed, 25 May 2016 20:33:05 +0000 (13:33 -0700)]
Change how TelephonyManager handles subscriptions.
Addressing API council feedback, remove* all subscription ID arguments
from API calls, and provide a factory method to create a new
TelephonyManager which uses a given subId.
* The subId methods will be @hidden instead of deleted.
Bug:
28845064
Change-Id: I2de8ae9e45bc14962c7c20d7d076ec83bce92cd3
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
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: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: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: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
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
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
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
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
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
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
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: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: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: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
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
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
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
Alan Viverette [Wed, 25 May 2016 21:10:33 +0000 (17:10 -0400)]
Fix borderless colored button text color
Bug:
28962396
Change-Id: I8cd8d24c778e2174d268da7ad40e43a4cfc142eb
Chris Wren [Mon, 23 May 2016 15:16:32 +0000 (11:16 -0400)]
add metrics for notification and group expansion
Bug:
28146482
Change-Id: Id7f71873ba33f85c1a1f2c48b47f78d40df46c0d
Robin Lee [Wed, 25 May 2016 21:05:53 +0000 (21:05 +0000)]
Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev
Zach Kuznia [Wed, 25 May 2016 20:57:24 +0000 (20:57 +0000)]
Merge "Ensure MotionEvent.split() won't be given an invalid value." into nyc-dev
Chris Wren [Wed, 25 May 2016 20:37:17 +0000 (16:37 -0400)]
boost starred people to at least high importance
Bug:
28949659
Change-Id: If604062a282db5db463642315a8fa5f7cd6e597c
TreeHugger Robot [Wed, 25 May 2016 20:43:55 +0000 (20:43 +0000)]
Merge "API council feedback: hide and document." into nyc-dev
Mady Mellor [Wed, 25 May 2016 20:22:41 +0000 (20:22 +0000)]
Merge "Fix clipping not being activated on children in groups" into nyc-dev
Phil Weaver [Thu, 19 May 2016 22:27:07 +0000 (15:27 -0700)]
Improve accessibility window title behavior
Suppress the default, unlocalized strings from being read as title.
Bug:
28744278
Change-Id: Iea0f7d8fed3d6428ada725cf3ffa077ba974b74a
Zachary Kuznia [Fri, 13 May 2016 20:11:36 +0000 (13:11 -0700)]
Ensure MotionEvent.split() won't be given an invalid value.
b/
27496784
Change-Id: I28bb4ac5bb8a705e7af9b22b2b56cd4061aa06a0
TreeHugger Robot [Wed, 25 May 2016 19:16:12 +0000 (19:16 +0000)]
Merge "Force pending transactions to flush before screenshot." into nyc-dev
Siyamed Sinir [Wed, 25 May 2016 18:16:22 +0000 (11:16 -0700)]
Fix TextView layout reuse when maxLines is set
When maxLines is set on StaticLayout and the text is wrapped, during
onMeasure TextView couldn’t recognize the wrap in the layout and tried
to reuse the layout which in turn caused width calculation problems.
This CL checks if maxLines is set, and if there is a text cut-off in
order to reuse existing layout.
Bug:
28468120
Change-Id: Ide43df8512a09112715067cbadf29cc64fd53247
Mady Mellor [Wed, 25 May 2016 19:00:07 +0000 (19:00 +0000)]
Merge "Changes based on API council feedback for performContextClick" into nyc-dev
Philip P. Moltmann [Wed, 25 May 2016 18:51:11 +0000 (18:51 +0000)]
Merge "Add Samsung print recommendation plugin." into nyc-dev
Derek Tan [Wed, 25 May 2016 18:37:05 +0000 (18:37 +0000)]
Per API review, revert the API renaming CL.
Revert "Multi-SIM - Fixing inconsistent naming in CarrierConfigManager."
This reverts commit
3bf26b56056ea8071e4092bf9a66171c96f43909.
Bug:
28295813
Change-Id: I44e7925c86c68a79b8d962670baadea7a7227ca2
Chad Brubaker [Wed, 25 May 2016 18:36:47 +0000 (18:36 +0000)]
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am:
f2e0a719d0 am:
56f32483b0
am:
d1df52a46b
* commit '
d1df52a46beb5babd0d9f3257b2ade53c9c763cf':
Fix incorrect cleartext attribute
Change-Id: I613e1eae55525d0326a8513ed25903bbaf0d3fb9
Alex Klyubin [Wed, 25 May 2016 18:24:31 +0000 (18:24 +0000)]
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am:
f2e0a719d0
am:
56f32483b0
* commit '
56f32483b04723bf750e51badcfec3203c352d32':
Fix incorrect cleartext attribute
Change-Id: I689b8df2a928e63b7c0b06198b06e2c6798bcba5
Sid Soundararajan [Tue, 24 May 2016 23:12:41 +0000 (16:12 -0700)]
Alternate method for adding dismiss in talkback
This is an alternate solution. Not sure if this is better than
the current solution.
BUG:
28594452
Change-Id: I08b4ca8741ceb3491950ba779510b08775bd0ee7
Chad Brubaker [Wed, 25 May 2016 18:16:03 +0000 (18:16 +0000)]
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs
am:
f2e0a719d0
* commit '
f2e0a719d00c4a7c6865f6784efc9b3f88421136':
Fix incorrect cleartext attribute
Change-Id: I83bfa396764d6724ceb483e256a96b929c7886d4
Selim Cinek [Wed, 25 May 2016 18:14:56 +0000 (18:14 +0000)]
Merge "Fixed a bug where the expand button was invisible" into nyc-dev
Antonio Cansado [Wed, 25 May 2016 16:57:21 +0000 (09:57 -0700)]
Cleaning up NetworkStatsManager.
- Throwing SecurityExceptionand and IllegalArgumentException instead of null for new APIs
- removing @removed APIs
Bug:
27530098,
27379882
Change-Id: Ifbe65bfc5051aa33aff2baa22cfa8e67b0f7c358
Alex Klyubin [Wed, 25 May 2016 18:04:53 +0000 (18:04 +0000)]
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs
Chris Banes [Wed, 25 May 2016 17:57:11 +0000 (17:57 +0000)]
Merge "Fix text appearances not working in colored button styles" into nyc-dev