232698 Commits

Author SHA1 Message Date
Ben Wagner
a87b07d7fa Add support for gx font variation axes.
This adds an 'axis' child element to the 'font' element. The 'axis'
element has attributes 'tag' (a four byte identifier) and 'stylevalue'
(a float value) to the parser. This also modifies reading the font file
name in a backwards compatible fashion by using only the direct #text
children of the 'font' element. (Both the Minikin and Skia parsers now
allow the font file name on a separate line in the fonts.xml file).

This information is then passed through to Skia in order to select the
desired variation. The Skia parser already parses this way and has for
some time, so Chrome and WebView can already read this format.

Change-Id: I15623fe864fa92b2bf0705af5e389daedfb77e5c
(cherry picked from commit b8e367fb7428076ff2e4aa2a97adaed1ef806e92)
2016-02-12 16:28:35 +00:00
Paul Stewart
67a28e8c38 Merge "Revert "Properly map EAP-GTC for TTLS"" into mm-wireless-dev
am: 323561773f

* commit '323561773f43f561997155aed4654a6be3299511':
  Revert "Properly map EAP-GTC for TTLS"
2016-02-12 16:27:07 +00:00
Paul Stewart
323561773f Merge "Revert "Properly map EAP-GTC for TTLS"" into mm-wireless-dev 2016-02-12 16:23:43 +00:00
Paul Stewart
d3be75fd4b Revert "Properly map EAP-GTC for TTLS"
This reverts commit be5084b87aa6a5e97becac6a43b448fee34196c2.

Reverting to re-land after test team does their thing

Change-Id: Ia236b77f08d15f47efb5469478000ded3b0d7954
2016-02-12 16:21:01 +00:00
Paul Stewart
825fb3492a Merge "Properly map EAP-GTC for TTLS" into mm-wireless-dev
am: 724ea69e4b

* commit '724ea69e4b4d79d59629e8152f2b0183e13aa45e':
  Properly map EAP-GTC for TTLS
2016-02-12 16:12:37 +00:00
John Reck
7305edf08b Merge "Fix bytesPerPixel for SurfaceTexture" into nyc-dev 2016-02-12 16:11:31 +00:00
John Reck
623d223193 Fix bytesPerPixel for SurfaceTexture
Bug: 27158985
Change-Id: I148a86d76314681eb778292dd0eb64503375f328
2016-02-12 08:08:29 -08:00
Paul Stewart
724ea69e4b Merge "Properly map EAP-GTC for TTLS" into mm-wireless-dev 2016-02-12 16:07:19 +00:00
Narayan Kamath
8bff8a4e47 Merge "Track libcore change 9fbdd1b27de1a3d1005468108." into nyc-dev 2016-02-12 15:41:33 +00:00
Sergey Poromov
19ff7804b3 Merge "Use long for preflight check size in BackupManagerService." into nyc-dev 2016-02-12 15:06:00 +00:00
Kenny Guy
716a9e1892 Merge "Support FBE for managed profiles." into nyc-dev 2016-02-12 15:01:35 +00:00
Rubin Xu
0ca088f1a6 Merge "Maintain mSetupCompletedUsers for profiles correctly" into nyc-dev 2016-02-12 14:40:11 +00:00
Kenny Guy
b1b302660c Support FBE for managed profiles.
Allow launcher to see and attempt to launch non-crypto
aware application when profile is locked.
Hide unlock notification until parent user is unlocked.
Have unlock notitication use confirm credentials to unlock
the profile.
Updated notification strings as per suggestions in mocks
to make it clearer between users and profiles.

Bug: 27038260

Change-Id: If2d2c8148670d814544f4edd44193d15da32a289
2016-02-12 14:29:37 +00:00
Rubin Xu
5eb0f3b300 Maintain mSetupCompletedUsers for profiles correctly
When listening for USER_SETUP_COMPLETE changes, refresh the state for
the affected user instead of the current foreground user which excludes
the active managed profile.

Bug: 27061092
Change-Id: Iae525464d3d3faab9afb76aaf4304b9f10382e01
2016-02-12 14:11:27 +00:00
Clara Bayarri
29b13190cd Merge "Add support for current failed lock attempts and max attempts" into nyc-dev 2016-02-12 13:54:10 +00:00
Clara Bayarri
51e41ad887 Add support for current failed lock attempts and max attempts
This is needed from Settings to show a message informing the user
of the number of attempts before their work profile gets wiped
when using ConfirmDeviceCredentials.

Bug: 26677759
Change-Id: I4b16f7dc2f415d0ce0215a3b7a646f98fabece33
2016-02-12 13:50:43 +00:00
Derek Sollenberger
67b1684a07 Merge "Update HWUI makefiles to support use by other targets (e.g. Skia)" into nyc-dev 2016-02-12 13:40:43 +00:00
Rubin Xu
d6c90a8883 Merge "Fix testApplicationRestrictionsManagingApp unit test" into nyc-dev 2016-02-12 11:53:45 +00:00
Narayan Kamath
36fb3a0e34 Track libcore change 9fbdd1b27de1a3d1005468108.
bug: 26689841
Change-Id: I3a0e5d3ab1ada313d73514913990a2aa19ad5b8f
2016-02-12 11:50:04 +00:00
Daniel U
43bb0a0643 Merge "Adopt HTML/CSS color values in fromHtml()" into nyc-dev 2016-02-12 11:24:56 +00:00
Shweta Chahar
239f248280 Merge "Remove higher speech rate settings." into nyc-dev 2016-02-12 11:18:33 +00:00
Erik Kline
1ec7ee58b8 resolve merge conflicts of 3b74289fdf to nyc-dev
Change-Id: Ib41c75bf44bdafbe57532717e8f41a4ed545d29c
2016-02-12 20:01:48 +09:00
Erik Kline
2c5927caeb Merge "Duplicate DhcpStateMachine public constants into DhcpClient" into nyc-dev 2016-02-12 10:51:54 +00:00
Gustav Sennton
7a002a215d Merge "Move current WebView provider from Settings.Secure to Settings.Global" into nyc-dev 2016-02-12 10:35:24 +00:00
Erik Kline
09bf13574e Duplicate DhcpStateMachine public constants into DhcpClient
This is so we can ultimately delete DhcpStateMachine altogether.

Bug: 24837343
Bug: 26991160
Change-Id: If116639e5f72c97cfc67f748dc5f6433dccd9cf0
2016-02-12 19:02:39 +09:00
Erik Kline
3b74289fdf Duplicate DhcpStateMachine public constants into DhcpClient
This is so we can ultimately delete DhcpStateMachine altogether.

Bug: 24837343
Bug: 26991160
Change-Id: If116639e5f72c97cfc67f748dc5f6433dccd9cf0
2016-02-12 17:10:15 +09:00
Phil Burk
d817dfd531 Merge "AudioTrack: fix docs for return code for setBufferSizeInFrames()" into nyc-dev 2016-02-12 06:32:14 +00:00
Roozbeh Pournader
79f7dc8fa2 Merge "Fix locale matching algorithm for resources" into nyc-dev 2016-02-12 05:19:37 +00:00
Roozbeh Pournader
4de4596ac1 Fix locale matching algorithm for resources
We get ResTables two different ways: one is from AAPT, another from
settings-based requests from the Java side. In the settings-based
requests, localeScript will be autocomputed, but for AAPT-filled
tables (especially if they come from older versions of AAPT), we need
to compute the script.

Previously, locales that came from packages were incorrectly assumed
to have "undeterminable" scripts, rather than "undetermined" scripts.
This led to us mistakenly falling back to the old logic of requiring
the locales' countries to match, rather than just looking at computed
scripts.

Bug: 27157452

Change-Id: Id7e346d3ecfb17273ffb63de5bcb4849a6eafbbd
2016-02-12 05:18:38 +00:00
Tomasz Mikolajewski
48599c0668 Do not show directory change animation on screen rotation.
When more than one level deep directory is opened.

Bug: 27090439
Change-Id: I73e789a820af3b710f0981ac12f5ea43cc389cf6
(cherry picked from commit f908640fd07b4734b8ef235ed2849ea20c55acab)
2016-02-12 04:24:58 +00:00
Tyler Gunn
99d5635929 Merge "IMS RAT Reporting in Registration Unsol" into mm-wireless-dev
am: 989594638a

* commit '989594638ad2aa7360cf39b5ea67c137a9078c86':
  IMS RAT Reporting in Registration Unsol
2016-02-12 03:45:32 +00:00
Tyler Gunn
989594638a Merge "IMS RAT Reporting in Registration Unsol" into mm-wireless-dev 2016-02-12 03:40:08 +00:00
Jorim Jaggi
ec1d075e5f Fix NullPointerException
Change-Id: Ifce7af5ac6aacc04fb621f3afd707164f36ba980
2016-02-11 19:22:43 -08:00
Jorim Jaggi
e26334ba1a Merge "Handle light status bar for split-screen" into nyc-dev 2016-02-12 03:12:18 +00:00
Daichi Hirono
0abde68519 Merge "Add error message for locked device." into nyc-dev 2016-02-12 02:51:17 +00:00
Daichi Hirono
2965776ba4 Add error message for locked device.
If the remote MTP device is a smartphone, it does not provide files
until a user unlocks the device. The CL adds specific error message for
the situation.

BUG=26318917

Change-Id: Ic4c34609c55ec9c99b7b8a9143d6dae3835784e3
2016-02-11 18:45:30 -08:00
Daichi Hirono
46d537716e Merge "Open the connected device in Files app when tapping notification." into nyc-dev 2016-02-12 02:38:29 +00:00
Jim Miller
f77d612568 Update FBE notification strings
Fixes bug 26863154

Change-Id: I6b130a8ba6e21e2cbd47551aabf5fc3e31f6f1c0
(cherry picked from commit 6338561c925fc4885275949d29193c14e83db71f)
2016-02-12 02:22:36 +00:00
Adam Lesinski
d7d584b225 Merge "AAPT: Remove warnings for public resources without comments" into nyc-dev 2016-02-12 01:42:16 +00:00
Fyodor Kupolov
50b5616dcc Merge "Clear calling identity before setting restrictions" into nyc-dev 2016-02-12 01:37:38 +00:00
Daichi Hirono
90b345138f Merge "Show specific error message for busy device." into nyc-dev 2016-02-12 01:02:53 +00:00
Daichi Hirono
f4fe20ad71 Merge "Returns "application/octet-stream" for unknown types of MTP files." into nyc-dev 2016-02-12 00:51:29 +00:00
Felipe Leme
089c9c0c6c Merge "Optimized add|removeRestrictBackgroundWhitelistedUid()." into nyc-dev 2016-02-12 00:50:47 +00:00
Phil Burk
cd0e210651 AudioTrack: fix docs for return code for setBufferSizeInFrames()
Also added some documentation links that were failing before.

Change-Id: I0a744dd0a3d3e1d09f643b35d976863fa0422d10
Signed-off-by: Phil Burk <philburk@google.com>
2016-02-11 16:42:13 -08:00
Felipe Leme
e2dd62ea5a Merge "Split bugreport identifier into id and pid." into nyc-dev 2016-02-12 00:40:40 +00:00
Daichi Hirono
1e3744441a Open the connected device in Files app when tapping notification.
Previously when tapping the MTP devce notification, MtpDocumentsProvider
opens home direcotry in Files app. The CL adds data URI of connected
device to the intent so that MtpDocumentsProvider can open the connected
device's root in Files app.

BUG=26611224
Change-Id: I97ecd6669852cd2fc875294cbcbf5660fbfaa0da
2016-02-11 16:36:49 -08:00
Etan Cohen
fa8e9aabe2 NAN: Disable all DBG flags.
am: 7d6c389edf

* commit '7d6c389edf41ef8ce490fa7af963484f9502cbc1':
  NAN: Disable all DBG flags.
2016-02-12 00:35:10 +00:00
Winson Chung
34f5c494df Merge changes If90955f4,I9fa48c06,Ib4681a43 into nyc-dev
* changes:
  Adding view debug annotations to simplifying debugging state.
  Disallow launching third party apps in safe mode.
  Drawing thumbnail background color for empty space in view.
2016-02-12 00:29:43 +00:00
Tomasz Mikolajewski
1f0c3f04a7 Merge "Fix arguments order in DocumentsContract.moveDocument()." into nyc-dev 2016-02-12 00:26:45 +00:00
Jae Seo
d0e47d0aef Merge "TIF: Separate service connection errors from recording errors" into nyc-dev 2016-02-12 00:05:01 +00:00