38619 Commits

Author SHA1 Message Date
John Reck
ef27453cf7 Merge "Cleanup attachFunctor" 2014-05-07 21:48:20 +00:00
John Reck
832b151465 Cleanup attachFunctor
Bug: 13961296

Change-Id: Id48d11bfcc234afd1fd7e4fdd409a50e7208c81d
2014-05-07 14:39:44 -07:00
Zhijun He
bc01db42d5 Camera: remove some DNG tags
Change-Id: I878e26414dcf5cedbcfd8c505b0c507f4548c035
2014-05-07 21:33:23 +00:00
John Reck
b6d9211d31 Merge "Implement TODO(romainguy)" 2014-05-07 21:24:25 +00:00
John Reck
63a0667325 Implement TODO(romainguy)
Bug: 14277445

Change-Id: Id52d6f7fcc023000adcc440bd4da67d9a673536b
2014-05-07 13:45:54 -07:00
Jason Monk
01d1d90753 Merge "Make Lock Task API public." 2014-05-07 19:18:23 +00:00
Jason Monk
a57e5e006b Make Lock Task API public.
Change-Id: Ieaf944dc69e206e091d8257e0f92013b082ceaac
2014-05-07 15:15:53 -04:00
Jason Monk
9d75ccb6a1 Merge "Make proxy API public" 2014-05-07 18:54:12 +00:00
Jason Monk
207900c23b Make proxy API public
Also exposed proxy-related functions that were on the
ConnectivityManager.

Change-Id: I9fb5f1bcc257a6198679ea1d56e18da2ec5a3b33
2014-05-07 14:23:53 -04:00
Amith Yamasani
007bbc0ed3 Fix javadoc typo
Use @return, not @returns

Change-Id: I6c8fab2d236cf9c68c79090d3830bc3e01c8aa6f
2014-05-07 10:23:44 -07:00
Guang Zhu
4297409e45 resolved conflicts for merge of 1e8a87dd to master
Change-Id: Id51218b4e2ca06344b5e7596ebde355fba9cfa54
2014-05-07 09:51:11 -07:00
Craig Mautner
77f5a0f517 Merge "Add attributes and flags for DocCentric." 2014-05-07 16:00:03 +00:00
Craig Mautner
2dac056179 Add attributes and flags for DocCentric.
Add Intent flag and attribute for auto removal of task from recents
once task completes.

Add manifest attribute for auto launching into doccentric. Equivalent
to Intent.FLAG_ACTIVITY_NEW_DOCUMENT.

Fixes bug 14586473.

Change-Id: I04acc9333c3725b4db94a954358eb78df507ff53
2014-05-07 08:41:27 -07:00
Adam Connors
010cfd4581 Add enableSystemApp methods to DevicePolicyManager
These methods allow profile or device owners to enable
systems apps pre-installed in the primary user in the
managed profile. Apps can be specified by either package
name or intent.

Bug: 13587051

Change-Id: Ifcbc68c139308506b6c18cf3c0ea62b8026ff75f
2014-05-07 16:20:38 +01:00
Jason Monk
10a38c06df Merge "Only show IME in navigation bar when it should" 2014-05-07 14:20:04 +00:00
Jason Monk
b605fecd9e Only show IME in navigation bar when it should
Add a flag to indicate that the IME should be shown.  This follows
the continuous ime notification boolean, and if there are multiple
input methods to choose from enabled.  This way the notification
and navigation button show up under the same circumstances (but
not on the same devices).

Change-Id: Ia6a2253061f1876f4bcc511de48c1078e9d96be5
2014-05-07 09:51:58 -04:00
Julia Reynolds
d46d0f9dcd Add new EDU user restrictions.
Change-Id: I6aad10466d99cda6be378c72025df686fe665071
2014-05-07 09:51:16 -04:00
Adam Powell
05ee2bd617 am bfbddcad: am 4f295fe8: Merge "Clean up WindowInsets API for release" into klp-modular-dev
* commit 'bfbddcad6004b7d178fb777c3a2b8b8a3dfe53ad':
  Clean up WindowInsets API for release
2014-05-07 13:20:21 +00:00
Guang Zhu
1e8a87dd3c am f31d73c9: Merge "send accessibility events on view property invalidation" into klp-modular-dev
* commit 'f31d73c9859a4124e5d4e618f4b147f55f693ef6':
  send accessibility events on view property invalidation
2014-05-07 12:43:59 +00:00
Ben Murdoch
aeac6d8eb1 Revert "Add attributes and flags for DocCentric."
Breaking the master build in check-api.

This reverts commit 5a8c07a2d2a35169f245908f6916355f09b3ebf4.

Change-Id: I985fa7ee02d704c34a551d901f6b36943542193d
2014-05-07 11:10:16 +00:00
Guang Zhu
f31d73c985 Merge "send accessibility events on view property invalidation" into klp-modular-dev 2014-05-07 07:38:59 +00:00
Craig Mautner
c6c035918a Add attributes and flags for DocCentric.
Add Intent flag and attribute for auto removal of task from recents
once task completes.

Add manifest attribute for auto launching into doccentric. Equivalent
to Intent.FLAG_ACTIVITY_NEW_DOCUMENT.

Fixes bug 14586473.

Change-Id: Ie6bbbd890fa5f76cc6f2dae5f4bce3c8b22e085c
2014-05-06 23:35:11 -07:00
Matthew Xie
ef10c85e3e Merge "Add transport param to Connect APIs" 2014-05-07 05:48:21 +00:00
Matthew Xie
8fce094491 Merge changes I0c808d51,I4ecf0ede
* changes:
  Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection.
  Add parse method to parse UUID from bytes for 16 bit, 32 bit and 128 bit Bluetooth UUIDs. Added unit tests.
2014-05-07 05:48:07 +00:00
Sharvil Nanavati
a0ee00ec13 Merge "Make sure BluetoothSocket#connect throws on error." 2014-05-07 05:22:21 +00:00
Tao Bai
fa1fd2cb7d Public WebView permission API
BUG: 13699047
Change-Id: Ibcc8c0d4f1bba4365cb71c1991a0fcb1d7febb94
2014-05-06 21:17:54 -07:00
Jim Miller
08fa40c5cb First pass at adding FingerprintManagerService
This adds a new service for monitoring and enrolling fingerprints
to the platform.

Fixed documentation links.

Change-Id: I66013be5e09be9c5f9746c46aacf32d3e26c3b73
2014-05-07 02:27:21 +00:00
Ganesh Ganapathi Batta
b88fa824ab Add transport param to Connect APIs
Support for passing preferred transport for GATT connections as part of
Connect APIs

Change-Id: I93938dce519b8fa12de41d7e8690dc9355ce2dc5
2014-05-06 19:20:46 -07:00
Sharvil Nanavati
37fce07bea Tear down PAN if we can't successfully complete a DHCP request
after establishing a PANU connection.

http://b/13731957

Change-Id: I0c808d5196c66783b52942ba7b7212bdce9f1c07
2014-05-06 19:20:46 -07:00
Wei Wang
82500dd866 Add parse method to parse UUID from bytes for 16 bit, 32 bit and 128 bit
Bluetooth UUIDs. Added unit tests.

Change-Id: I4ecf0ede02561a5e9815acf8a5a1309d5756b887
2014-05-06 19:20:46 -07:00
Sharvil Nanavati
3e8eb40950 Make sure BluetoothSocket#connect throws on error.
It sometimes fails silently, resulting in callers using the socket
even though it hasn't been initialized.

http://b/13909270

Change-Id: Ied08982b51d44c3d2dec72785888ea6c6497a664
2014-05-06 19:20:45 -07:00
Guang Zhu
84e2509823 send accessibility events on view property invalidation
from certain call sites of invalidateViewProperty, appropriate
accessibility event needs to be delivered as well.

Below is a list of call references found, ones with "*" are
modified by this change:

package: android.view
View
  *offsetLeftAndRight(int) (4 matches)
  *offsetTopAndBottom(int) (4 matches)
  *setAlpha(float)
  setCameraDistance(float) (2 matches)
  setLayerPaint(Paint)
  setPivotX(float) (2 matches)
  setPivotY(float) (2 matches)
  *setRotation(float) (2 matches)
  *setRotationX(float) (2 matches)
  *setRotationY(float) (2 matches)
  *setScaleX(float) (2 matches)
  *setScaleY(float) (2 matches)
  setTransitionAlpha(float)
  *setTranslationX(float) (2 matches)
  *setTranslationY(float) (2 matches)
ViewGroup
  *offsetChildrenTopAndBottom(int)
ViewOverlay
  OverlayViewGroup
    invalidateViewProperty(boolean, boolean) (2 matches)
ViewPropertyAnimator
  AnimatorEventListener
    onAnimationUpdate(ValueAnimator) (2 matches)

Bug: 14262013

Change-Id: Ibc9ed438f476ad10a6ad8df668142958c5903f55
2014-05-06 18:23:15 -07:00
Jeff Brown
6c8e788e37 Merge "Fix crash due to texture view callback threading invariants." 2014-05-07 00:47:08 +00:00
Adam Powell
bfbddcad60 am 4f295fe8: Merge "Clean up WindowInsets API for release" into klp-modular-dev
* commit '4f295fe8c66ef2878d93be420f73745d88422e35':
  Clean up WindowInsets API for release
2014-05-07 00:35:31 +00:00
Jeff Brown
c7282e57cd Fix crash due to texture view callback threading invariants.
Allow the client of a SurfaceTexture to specify the Handler to
which the update callback should be directed to avoid unnecessary
scheduling ping-pong between threads.

Fixed an invalid assumption in TextureView that it is attached
to the main looper which could result in a crash under certain
circumstances.  In normal app processes, it is true that TextureViews
must be created on the main looper since hardware rendering is
currently only supported on the main looper.  However, in the
system server, UI components run a different thread.  Although
hardware rendering is normally disabled in the system server,
it may be enabled for certain developer features.

Bug: 14445309
Change-Id: I5ae17ad018b9ef05ba87ec2f972c7c82e2bca70a
2014-05-06 17:13:43 -07:00
Chet Haase
5f9ea81c99 Doc fix in TypeEvaluator method docs
Change-Id: Ie20ba820b0a3a6b8f0f6120dfcfc8bba6adf29b3
2014-05-06 17:07:16 -07:00
Adam Powell
f4a3941ebe Clean up WindowInsets API for release
Hide window decor inset methods and rename the clone* methods to have
less baggage.

Bug 14566960

Change-Id: Ia06bb959fd77acd6ff69f337c3200047a529612a
2014-05-06 16:27:59 -07:00
Glenn Kasten
8547e7022e Merge "Add AudioFormat.getBytesPerSample and use it" 2014-05-06 23:09:07 +00:00
Zhijun He
379af01292 Camera2: Add missing capture result tags
All capture request tags should be available in capture result.

Bug: 14059883
Change-Id: I0aa8d7341b14fbbd627b17eb316bb016ff1fc316
2014-05-06 21:46:27 +00:00
Dan Stoza
9bd01ef0c6 Merge "Enable changing display configuration" 2014-05-06 21:08:15 +00:00
Jeff Brown
a93369a819 am 84aaf124: Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev
* commit '84aaf124b762b9eeb0957aaea9df8424a429b148':
  Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)
2014-05-06 20:30:49 +00:00
Jeff Brown
996e269d93 Merge "Plumb display state and interactive information to BatteryStats." 2014-05-06 20:28:36 +00:00
Jeff Brown
84aaf124b7 Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev 2014-05-06 20:27:34 +00:00
Adam Powell
5f97930fc5 am c41fa708: am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev
* commit 'c41fa708271e204a7983aba291389ea1554227b2':
  onWindowDismissed API cleanup
2014-05-06 20:24:23 +00:00
Jeff Brown
e95c3cd895 Plumb display state and interactive information to BatteryStats.
Fixes an issue where dozing was treated the same as the screen
being fully on.  Now dozing is treated the same as the screen
being fully off which is slightly better.  The decision of how
to represent this state is now internal to the battery stats
so it can be improved later.

Removed noteInputEvent() since it is unused.

Bug: 14480844
Change-Id: Iee8cf8dce1a1f91c62678bb6d3d9fe567ad6db42
2014-05-06 13:23:53 -07:00
Adam Powell
c41fa70827 am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev
* commit 'a0516e7ad12a647cc40fb5651e8d14cd39571c7a':
  onWindowDismissed API cleanup
2014-05-06 20:20:40 +00:00
Jeff Brown
01ee6f6cf7 Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)
Fixes an issue where dozing was treated the same as the screen
being fully on.  Now dozing is treated the same as the screen
being fully off which is slightly better.  The decision of how
to represent this state is now internal to the battery stats
so it can be improved later.

Removed noteInputEvent() since it is unused.

Bug: 14480844
Change-Id: Iee8cf8dce1a1f91c62678bb6d3d9fe567ad6db42
2014-05-06 13:18:19 -07:00
Adam Powell
a0516e7ad1 Merge "onWindowDismissed API cleanup" into klp-modular-dev 2014-05-06 20:17:31 +00:00
Chris Craik
55d47f6be8 Merge "Fix pivot update rejection logic" 2014-05-06 20:17:29 +00:00
Dan Stoza
00101052b5 Enable changing display configuration
This allows querying and switching display device configurations
through the ISurfaceComposer/SurfaceComposerClient interface.

Bug: 14320401
Change-Id: Ie4363bc8353d95428f1114ea48e5b1c8976e1730
2014-05-06 11:34:06 -07:00