51957 Commits

Author SHA1 Message Date
Mike Reed
686534db8d switch to non-deprecated SkBlurStyle type
Will allow skia to remove SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE

Change-Id: I0039dd7e0e807080d2b4f9e648df93123dd09e8d
2014-05-30 21:05:47 +00:00
Martijn Coenen
c2e1dcd428 am 65f8da7f: Merge "Address HCE API review comments." into lmp-preview-dev
* commit '65f8da7f640ef87797fe16d139caa26d55378ab6':
  Address HCE API review comments.
2014-05-30 14:55:25 +00:00
Martijn Coenen
748fca45fc Merge "Address HCE API review comments." into lmp-preview-dev 2014-05-30 14:52:48 +00:00
Niels Egberts
a6cc9b85ad Markup support for framework
Change-Id: Ia5ad6cff7593c295944a90775a1b061c95f5cc3f
2014-05-30 13:48:09 +00:00
Jorim Jaggi
55cef957a3 am 151f3c15: Merge "Cache whether a password/pattern is set." into lmp-preview-dev
* commit '151f3c15cb909058a7d77faec44520439a2db4ca':
  Cache whether a password/pattern is set.
2014-05-30 12:34:53 +00:00
Jorim Jaggi
5c0727ff2d Merge "Cache whether a password/pattern is set." into lmp-preview-dev 2014-05-30 12:30:55 +00:00
Narayan Kamath
dfed4bc99f am f7871c31: am b9b31f4b: am bd4d3203: Merge "Support an ABI flag for instrumentation."
* commit 'f7871c31469c6245c1b232a15104704f7481103c':
  Support an ABI flag for instrumentation.
2014-05-30 11:51:03 +00:00
Keisuke Kuroyanagi
bf9767cd81 Null check for sentence level spell checking method.
Bug: 15334309
Change-Id: Id7dd440f7df37da76ae6381abe057ff92a76f4a1
2014-05-30 20:00:21 +09:00
Narayan Kamath
f7871c3146 am b9b31f4b: am bd4d3203: Merge "Support an ABI flag for instrumentation."
* commit 'b9b31f4b8eda123e7b544d1a0fa886576064adca':
  Support an ABI flag for instrumentation.
2014-05-30 10:49:00 +00:00
Narayan Kamath
b9b31f4b8e am bd4d3203: Merge "Support an ABI flag for instrumentation."
* commit 'bd4d320344833ce67dad3a4e10a61d0502a81d0e':
  Support an ABI flag for instrumentation.
2014-05-30 10:41:24 +00:00
Narayan Kamath
bd4d320344 Merge "Support an ABI flag for instrumentation." 2014-05-30 10:35:29 +00:00
Yuhao Zheng
e90a218cf1 Merge "Wifi Passpoint API change" 2014-05-30 06:48:48 +00:00
Paul Jensen
034bfbb113 Merge "Adjust Network's SocketFactory to restrict host name resolution to that Network" into lmp-preview-dev 2014-05-30 01:45:52 +00:00
Jinsuk Kim
3d9bae3500 Merge "Register HdmiControlService" 2014-05-30 01:39:59 +00:00
John Reck
30643dfcd1 am 7f0d1e19: Merge "Fix NPE in onVisibilityChanged" into lmp-preview-dev
* commit '7f0d1e193bbf2dc189c2de6e3329aac0afda1d76':
  Fix NPE in onVisibilityChanged
2014-05-30 01:06:22 +00:00
Jeff Brown
4027db5c3d Merge "Add support for wake gestures." 2014-05-30 01:03:25 +00:00
John Reck
432fe98297 Merge "Fix NPE in onVisibilityChanged" into lmp-preview-dev 2014-05-30 01:01:16 +00:00
John Reck
2dedafb48f Fix NPE in onVisibilityChanged
Bug: 15089790
 onVisibilityChanged may happen before the View is attached.
 Only attempt to re-set the update listener if mLayer is not null,
 as it means the View is attached and has already drawn once. If
 mLayer is null then the update listener will be set when the view
 next draws

Change-Id: I406e359a0a0720988f026f9cbde26afdb564ca92
2014-05-29 17:40:09 -07:00
Yuhao Zheng
8a9eb81df1 Wifi Passpoint API change
- hide package android.net.wifi.passpoint
- extend android.net.wifi APIs for Passpoint credential management
  > hide for preview

Bug: 15191967
Change-Id: Ic90818cf5c91e93dd7890774543e08b842edc594
2014-05-29 16:18:36 -07:00
Zhijun He
d1cc293a5b am 504d5486: Merge "Camera2: Fix availableCapabilities incorrect type" into lmp-preview-dev
* commit '504d5486de89ef425d0acd04363e8131f3686991':
  Camera2: Fix availableCapabilities incorrect type
2014-05-29 23:15:34 +00:00
Zhijun He
81b0ba2606 Merge "Camera2: Fix availableCapabilities incorrect type" into lmp-preview-dev 2014-05-29 23:11:53 +00:00
Raph Levien
ca672f2758 am 953fe800: Merge "Language and variant selection for Minikin" into lmp-preview-dev
* commit '953fe800caf1771217ff1e828d6aa93fbc16729c':
  Language and variant selection for Minikin
2014-05-29 22:38:34 +00:00
Christopher Tate
e6f7493ba8 Merge "Provide stable concrete wrapper for backup transport API" 2014-05-29 22:36:59 +00:00
Raph Levien
2070252f98 Merge "Language and variant selection for Minikin" into lmp-preview-dev 2014-05-29 22:30:30 +00:00
John Reck
2cfc0e543f am 894bb170: Merge "Enable debug stuffs" into lmp-preview-dev
* commit '894bb1701ae15b87af1e3bfe865fe191081cc806':
  Enable debug stuffs
2014-05-29 22:27:12 +00:00
John Reck
aee470c023 Merge "Enable debug stuffs" into lmp-preview-dev 2014-05-29 22:23:41 +00:00
Jeff Brown
a20dda4a6e Add support for wake gestures.
Bug: 15137158
Change-Id: I171c3269a7a16a00083e16e1cc4c7c1c2b98c05e
2014-05-29 15:22:40 -07:00
Christopher Tate
74318c98a0 Provide stable concrete wrapper for backup transport API
This initial version is a simple pass-through of the existing
IBackupTransport AIDL definition.

Change-Id: I0f6c9ffc7101f82127ab61ba6cba9f5003af6a0c
2014-05-29 15:19:21 -07:00
John Reck
fe5e7b7346 Enable debug stuffs
Bug: 14596762
 * dumpsys gfxinfo implemented
 * profile GPU visual_bars implemented

Change-Id: Icb948a9d5af5989b5615504d0d76ade64b93ef5b
2014-05-29 15:00:29 -07:00
Raph Levien
f9e3d31127 Language and variant selection for Minikin
This is the frameworks/base side of what's needed to support language
selection (especially Han unification, but also compact/elegant
selection for scripts that require more vertical space).

This is part of the fix for bug 15179652 "Japanese font isn't shown on
LMP".

Change-Id: I8f0f3aa9a1915659f8d0b590cf1c56529356049a
2014-05-29 14:21:24 -07:00
Christopher Tate
3d5e5c7b26 Merge "DO NOT MERGE Implementation of TaskManager reschedule/cancel" into lmp-preview-dev 2014-05-29 21:17:32 +00:00
Martijn Coenen
df48db3c7c Address HCE API review comments.
Remove AidGroup from public APIs.

Bug: 15089341
Change-Id: Ia8e038a12891abc6f1a8e82dbf30b8952e0b1fd7
2014-05-29 21:10:01 +00:00
Jinsuk Kim
8692fc68a4 Stop publishing HdmiCecService, start publishing HdmiControlService
HdmiCecService will soon be deprecated and replaced with HdmiControlService.
Stopped publishing the service, and turned the corresponding manager to
stub so that it will do nothing but print out a warning msg instead.

Will help the app transition to the new service in the meantime. Once
the migration is finished, will gut out all the HdmiCecService/
HdmiCecManager stuff.

Change-Id: Ic34a69c4fb99f4e5a2c8323538195204ab16a545
2014-05-29 21:09:43 +00:00
Zhijun He
421ddbe670 Camera2: Fix availableCapabilities incorrect type
Bug: 15168075
Change-Id: I50553d740101b7db1b7695344bf4cdf9c5cd1cf9
2014-05-29 21:00:26 +00:00
Adam Powell
4926f12f31 am f8884777: Merge "Remove default toolbar content inset for action bars" into lmp-preview-dev
* commit 'f8884777303d7788ec1684e3e502d564519dc759':
  Remove default toolbar content inset for action bars
2014-05-29 20:53:00 +00:00
Adam Powell
8d1de048d7 Merge "Remove default toolbar content inset for action bars" into lmp-preview-dev 2014-05-29 20:48:52 +00:00
Dongwon Kang
4792881e6f am 3dc91b99: Merge "Fix a typo on TvContract." into lmp-preview-dev
* commit '3dc91b99281d53f414bb4db4bd2e5a61bbb86483':
  Fix a typo on TvContract.
2014-05-29 20:27:17 +00:00
Dongwon Kang
ec80df818f Merge "Fix a typo on TvContract." into lmp-preview-dev 2014-05-29 20:23:53 +00:00
Adam Powell
11223ffd37 Remove default toolbar content inset for action bars
While this may still be a good idea in the long run, it has a number
of negative effects on the layout for activities that never plan to
use a navigation button. Needs further consideration with UX.

Change-Id: If418e6124601f3978fa169ac9c9f48fc39409fec
2014-05-29 12:39:10 -07:00
Adam Powell
7d330757d9 am ee1a3f16: Merge "Fix for setting Toolbar content descriptions" into lmp-preview-dev
* commit 'ee1a3f1612cb69fe5567bf7cde2496a4774ab8ed':
  Fix for setting Toolbar content descriptions
2014-05-29 19:27:17 +00:00
Adam Powell
2fd1d454b8 Merge "Fix for setting Toolbar content descriptions" into lmp-preview-dev 2014-05-29 19:23:48 +00:00
Paul Jensen
8ef3401d2a Adjust Network's SocketFactory to restrict host name resolution to that Network
bug: 13885501

Change-Id: Iab9a5a2e060fe261f4be9ba974c1a55fb6b9c98b
(cherry picked from commit 92064edf55ee11967d9cc7529125236ee8e469b2)
2014-05-29 19:17:06 +00:00
Adam Powell
8e5372fe93 Fix for setting Toolbar content descriptions
Allow resid 0 as a null content description.

Change-Id: I0663feac229a77d5efffece2bd686de4ee99d840
2014-05-29 12:16:09 -07:00
Paul Jensen
2d6f265d00 Implement bind-to-network functionality of android.net.Network.
This is implemented by calling through to netd_client.
Included are functions to bind-to-network-for-process strictly for DNS to
facilitate startUsingNetworkFeature() reimplementation.

bug: 13885501

Change-Id: Ib22c7d02ea81d251bdfeeb0f64a47ce32eefcb1b
(cherry picked from commit dbf76f898f1f57eb74722358087c926d2f529bda)
2014-05-29 18:53:57 +00:00
Ed Heyl
08d62965d3 Merge "changes related to moving the trust agent setting s in thne security menu" 2014-05-29 18:39:54 +00:00
George Mount
fffa58ef3e am 225f5d1c: Merge "Moved shared element motion to be in called Activity." into lmp-preview-dev
* commit '225f5d1c69395301f9782cc38714e5ca5db5e3d5':
  Moved shared element motion to be in called Activity.
2014-05-29 18:20:22 +00:00
George Mount
eb61eb786a Merge "Moved shared element motion to be in called Activity." into lmp-preview-dev 2014-05-29 18:14:48 +00:00
Craig Mautner
7a18498559 am b5b37c2b: Merge "Add methods to coordinate unlock animation." into lmp-preview-dev
* commit 'b5b37c2babe744acb002ed9b8556a9d9cd2202fc':
  Add methods to coordinate unlock animation.
2014-05-29 16:52:13 +00:00
Craig Mautner
71ac80c46a Merge "Revert "Modify task navigation to return to recent tasks." DO NOT MERGE" into lmp-preview-dev 2014-05-29 16:51:24 +00:00
Craig Mautner
b9a6c8ad99 Revert "Modify task navigation to return to recent tasks." DO NOT MERGE
This reverts commit 1a4e211e03f1f795d935058e27356a0e8bc5df7c.

Change-Id: Ia691b93347c7eb2395933e5a5ba385ea94e08d6f
2014-05-29 16:50:59 +00:00