236126 Commits

Author SHA1 Message Date
sergeyv
bad9918391 Clean up and rename TypefaceImpl
bug:25865834
Change-Id: I77e8a627163e040a5c25865054a8a936052af367
2016-03-21 16:33:14 -07:00
sergeyv
dccca44ffd Reland: Move text logic from jni to hwui level
Initial CL: https://googleplex-android-review.git.corp.google.com/#/c/886854/

Change-Id: I9dfd85fe1d2a2c44f4360c8a29fd58d80e6f31c8
2016-03-21 15:55:46 -07:00
Jeff Sharkey
c57fc4787f Merge "Ignore wildcard network policies." into nyc-dev 2016-03-21 21:11:57 +00:00
Jeff Sharkey
5c2183a8cf Merge "Skip app widget config changes when user locked." into nyc-dev 2016-03-21 21:10:56 +00:00
Jeff Sharkey
3dc7c04d80 Merge "Check "Secure start-up" before toggling emulation." into nyc-dev 2016-03-21 21:10:35 +00:00
Jeff Sharkey
8953147400 Merge "Mark even more Bundles as defusable." into nyc-dev 2016-03-21 21:10:14 +00:00
Sergei Vasilinetc
6847953955 Merge "Revert "Move text logic from jni to hwui level"" into nyc-dev 2016-03-21 21:06:47 +00:00
Sergei Vasilinetc
afbd0f1fef Revert "Move text logic from jni to hwui level"
This reverts commit a7f6bba1a3565c19715e878dfe7f0e01022944ff.

Change-Id: If4f36f87a85411b6128fd92d391313803ccaf9dd
2016-03-21 21:03:40 +00:00
Alan Viverette
f2e6a10b38 Merge "Set drawable callbacks last" into nyc-dev 2016-03-21 20:25:14 +00:00
Sergei Vasilinetc
49658d4380 Merge "Move text logic from jni to hwui level" into nyc-dev 2016-03-21 20:11:27 +00:00
Wale Ogunwale
85941cff0c Merge "Added support to specify animation duration when resizing stack" into nyc-dev 2016-03-21 20:04:20 +00:00
Ruchi Kandoi
fb811aaf4d Merge "PowerManagerService: Adds a VrStateListener to track Vr Mode state changes." into nyc-dev 2016-03-21 19:37:52 +00:00
Ruben Brunk
6ed05a7047 Merge "Move setup to earlier boot phase." into nyc-dev 2016-03-21 19:32:16 +00:00
Phil Burk
566e7212ab Merge "Audio ENCODING_IEC61937: enforce use of CHANNEL_OUT_STEREO" into nyc-dev 2016-03-21 19:30:23 +00:00
Alan Viverette
aa43b1563c Merge "Account for top and bottom padding in ListPopupWindow" into nyc-dev 2016-03-21 19:30:15 +00:00
Chris Craik
4fd95b0d94 Merge "Handle unbounded drawPaint/drawGLFunction operations safely" into nyc-dev 2016-03-21 19:26:06 +00:00
Jeff Sharkey
7474fe7b42 Ignore wildcard network policies.
They never should have been persisted to disk in the first place.

Bug: 24972775
Change-Id: If9254f74455823f9fda9545fdf543fc7250a4016
2016-03-21 13:13:28 -06:00
Ruben Brunk
8507004a35 Move setup to earlier boot phase.
Bug: 27764094
Change-Id: I2a01b47129a3ef2a4ae37fbf98eb9ebe81061e62
2016-03-21 12:10:38 -07:00
Jeff Sharkey
1af4a7b5bf Skip app widget config changes when user locked.
Bug: 27377050
Change-Id: Ic63b06159cf59106b4e7bc62ec5f3e89d47321c5
2016-03-21 13:07:35 -06:00
Adrian Roos
6f54b224af Merge "Don't copy Bitmaps when cloning RemoteViews" into nyc-dev 2016-03-21 19:03:51 +00:00
Jeff Sharkey
5a78516897 Check "Secure start-up" before toggling emulation.
To fully emulate FBE we need to avoid the Cryptkeeper bounce, so
check to make sure user has disabled "Secure start-up" so vold can
unlock early during boot.

Bug: 27595501
Change-Id: Ic0d03f94982534381671e1039f14d1fd06bc0e4e
2016-03-21 13:02:09 -06:00
Deepanshu Gupta
e00ffb51b8 Merge "Add guard around getXmlFileParser() call" into mnc-ub-dev
am: 8662173  -s ours

* commit '86621737fc1ba2d6ce7cb97e61fc8ce186eb851a':
  Add guard around getXmlFileParser() call
2016-03-21 18:59:59 +00:00
Deepanshu Gupta
86621737fc Merge "Add guard around getXmlFileParser() call" into mnc-ub-dev 2016-03-21 18:53:57 +00:00
Abodunrinwa Toki
a4dad9ec31 Merge "Update A11y IME switch button content description." into nyc-dev 2016-03-21 18:46:50 +00:00
Jeff Sharkey
f0ec2e0050 Mark even more Bundles as defusable.
Bug: 27766193
Change-Id: Ib027ac7b40c7a575a76f289faabde9655338865e
2016-03-21 12:37:57 -06:00
Tyler Gunn
dfc1ee0162 Merge "Correct naming issues with video calling carrier config items." into nyc-dev 2016-03-21 18:37:09 +00:00
Chris Tate
8384d815d0 Merge "Fix deadlock when full data backup times out" into nyc-dev 2016-03-21 18:31:59 +00:00
Matt Sarett
d126b1ed5d Merge "Work-around paletted image decoding bug in SDK_JELLYBEAN" into nyc-dev 2016-03-21 18:26:19 +00:00
Tenghui Zhu
68e5b9601a Merge "API review: Hide ComplexColor and GradientColor" into nyc-dev 2016-03-21 18:19:54 +00:00
Wale Ogunwale
e75a9adfbd Added support to specify animation duration when resizing stack
Needed for sys-ui to control the duration of various Pip transitions.

Bug: 27674339
Change-Id: I7bad27aaa19755a73c594e88b88b56db033e1a45
2016-03-21 11:17:19 -07:00
Phil Burk
621dbc8740 Audio ENCODING_IEC61937: enforce use of CHANNEL_OUT_STEREO
Prevent developers from using a channelMask that will fail.

Bug: 27721209
Change-Id: I87ad67caedaedf6ed2230165cb1687a2a0b74703
Signed-off-by: Phil Burk <philburk@google.com>
2016-03-21 11:15:02 -07:00
Phil Weaver
104138198f Merge "Clarify docs about event recycling." into nyc-dev 2016-03-21 18:11:27 +00:00
Teng-Hui Zhu
e03c469fd4 API review: Hide ComplexColor and GradientColor
b/27532267

Change-Id: I01582e067ec8f4897c34dcec0f7c14700c40e02b
2016-03-21 11:09:16 -07:00
Samuel Tan
07ece5936d Merge "Disallow guest user from changing Wifi settings" into nyc-dev 2016-03-21 17:58:39 +00:00
Christopher Tate
1f4c450342 Fix deadlock when full data backup times out
The code was attempting to let a reported error in the app <-> engine
surface take precedence over apparent success at the engine <-> transport
handoff surface.  However, in the case of timeout, this is inappropriate.
It was leading to deadlock because the engine runs free, with socket-closed
as its shutdown signals for determinism.  In this case that means that
having accidentally asked it to finish and report the final result, we
locked up forever since the data it was writing dutifully to the engine
was no longer being consumed, and the actual teardown signals were never
sent.

The fix is to properly express the error-state hierarchy: only when the
engine <-> transport layer is not issuing its own abort is the app-data-
moving layer consulted about errors detected at that surface.

Bug 22348852

Change-Id: I8987be0c4f708116dfeb08098d7222241ed317f3
2016-03-21 10:51:34 -07:00
Alan Viverette
1e2c2d4509 Account for top and bottom padding in ListPopupWindow
Bug: 27550635
Change-Id: Icbd3190c35dfeb915cfb9f0b08a2f9d2b1307b24
2016-03-21 13:45:33 -04:00
Adrian Roos
7da889d81d Don't copy Bitmaps when cloning RemoteViews
Bug: 27385859
Fixes: 27385859

Change-Id: I9f0768b20e6e71d5366eb21df76c984bfe6989b1
2016-03-21 10:39:16 -07:00
Alan Viverette
43a21c0500 Set drawable callbacks last
Bug: 27554777
Change-Id: I3ef9981bfafcb2a674304c9da10e4f5b1e66f932
2016-03-21 13:35:39 -04:00
Tenghui Zhu
aaa725647e Merge "Document the cache bitmap behavior for VD" into nyc-dev 2016-03-21 17:30:44 +00:00
Siyamed Sinir
6eccafd339 New Linkify.addLinks function with set of known schemes
A new addLinks function is added that accepts a default scheme and a
set of known schemes. Default scheme is applied whenever the link found
does not start with one of the given known schemes.

Moreover, previously JavaDoc for addLinks functions with a single scheme
parameter described that the scheme attribute will be prepended to the
links that do not have 'a' scheme. The code actually checks if the link
starts with the given scheme and prepends if not. JavaDoc updated
accordingly.

Bug: 26985901
Change-Id: I94ea81dcf83ba7a6b6cd47c10fe8fb277964eb15
2016-03-21 10:27:31 -07:00
Ajay Nambi
1981e602ad Ril Error codes: Voice related messages
am: 499a8da

* commit '499a8da1daa82f29eecd59f99721a1cdd52db716':
  Ril Error codes: Voice related messages
2016-03-21 17:06:21 +00:00
Phil Weaver
96fea022f2 Clarify docs about event recycling.
Bug: 27454838
Change-Id: I65d0ced3198dc6ad45b99e4932a0d6e32306cf10
2016-03-21 10:05:49 -07:00
Ajay Nambi
499a8da1da Ril Error codes: Voice related messages
This change adds new error codes for messages
related to voice

Bug: 27038563
Change-Id: Id3a212c0b12e1feb26b0836fad3f9399d6dec19c
2016-03-21 16:59:58 +00:00
Paul Mclean
24a99f1157 Merge "Fix a javadoc @see error" into nyc-dev 2016-03-21 16:33:05 +00:00
Phil Weaver
45ebfd339f Merge "Fix decision handle accessibility events." into nyc-dev 2016-03-21 16:28:50 +00:00
Abodunrinwa Toki
b4b2b431d8 Update A11y IME switch button content description.
Bug: 27676215
Change-Id: I563b0b422e0f3a751db1280be91500b08c0e1ff7
2016-03-21 16:14:10 +00:00
Deepanshu Gupta
13d2e2e10b Add guard around getXmlFileParser() call
Prevents the need to update the LayoutLib API level.

Bug: http://b.android.com/202942
Change-Id: I507239148ab8d6d45406624dba569c8b7197f979
2016-03-21 08:53:13 -07:00
Paul McLean
455388bdb8 Fix a javadoc @see error
Bug: 26194337
Change-Id: I7945058e0948238e9b2be7e5d8a7dc3ac4d814dc
2016-03-21 09:50:18 -06:00
Tony Mak
8c536f91f1 Show work challenge directly when there is no device lock
The trick is to switch to home stack first and then start the activity
of the targeted task again to trigger the intercepting code.
And back button in the lock screen page brings user to launcher
instead of the work app.

Change-Id: Ic0305dbcb63fec2a8287b12f3e76e70d4268d423
2016-03-21 14:29:17 +00:00
Geoff Mendal
47fcbd823c Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-21 14:28:16 +00:00