Commit Graph

38408 Commits

Author SHA1 Message Date
Jay Civelli
915eade5dc Merge "Add new intent to prompt user for their device credential." 2014-07-15 00:22:01 +00:00
Jay Civelli
42feda4229 Add new intent to prompt user for their device credential.
Change-Id: I152c5efda7186d59f63c341b046896c65e37de1b
2014-07-14 18:08:04 -07:00
Aravind Akella
8b674abf4d Merge "Add PackageManager feature strings for relative humidity and temperature sensors." into lmp-dev 2014-07-14 18:38:08 +00:00
Santos Cordon
a5a2cf419d Merge "Implement multi-SIM capabilities (1/6) [DO NOT MERGE]" into lmp-dev 2014-07-14 18:38:02 +00:00
Alan Viverette
49a22e8202 Add window elevation for dialogs, clean up surface insets API
BUG: 13211941
Change-Id: I9d605d0b2fb24f9bf8e73fbecd520b6b52ae5751
2014-07-14 23:13:28 +00:00
Ruben Brunk
28c49c9d20 camera2: Update shader scaling matrix for legacy mode.
Bug: 15116722
Change-Id: Idaa4311dfd027b2d2b8ea5e2c6cba2da5779d753
2014-07-14 22:57:07 +00:00
Christopher Tate
a7835b6b6b Add Context.getNoBackupFilesDir()
This is an app-private filesystem space exactly like the one
reported by Context.getFilesDir(), with one exception:  files
placed here are never backed up by the full-backup infrastructure.
If an app attempts to back up any of its contents via the normal
API it's immediately ignored with a logged warning.

The restriction is also enforced on the restore side, because
apps using support libraries might wind up creating full backup
archives containing no_backup subdirs on pre-L devices (via
adb backup, Helium, &c.).  We check for this before passing the
restore data to the app, and drop it if we detect the situation
so that the app never sees the bits.

Bug 16240573

Change-Id: I11216a391f1d32117ec7ce15aafc9cd93d0337de
2014-07-14 22:56:04 +00:00
Jason Monk
8fd3800e78 Merge "Add missing lock task API" into lmp-dev 2014-07-14 18:37:56 +00:00
Jason Monk
386c94fdf9 Add missing lock task API
It seems that currently there is no un-hidden way to determine if
the device is in lock task.  This fixes that.

Change-Id: Ib5082b84de8073d261777b955fddff55367e5662
2014-07-14 16:42:24 -04:00
RoboErik
44583d351e Merge changes I51f2e466,I5b67cb3e into lmp-dev
* changes:
  Make PlaybackState immutable with a builder
  Add API to set a default session in Activity
2014-07-14 18:37:56 +00:00
Dake Gu
2178cee064 Merge "ActivityTransition: restore callee activity shared element position" into lmp-dev 2014-07-14 18:38:08 +00:00
Dake Gu
c18f4cc0f2 ActivityTransition: restore callee activity shared element position
Move the shared element of callee activity to animation start position,
then restore the measured size and locations to original values before
call requestLayout(),  this fixes cases for RecyclerView optimized layout
which offsets siblings by delta of measure size.

Change-Id: I6e43c036e26986605ff008aba476e30ebd270fd1
2014-07-14 13:59:43 -07:00
dcashman
9f92ffa927 Merge "Initial KeySet API." into lmp-dev 2014-07-14 18:38:08 +00:00
dcashman
9d2f441f9b Initial KeySet API.
Previously submitted but reverted due to doc-compilation bug.

Bug: 6967056
Change-Id: I9bd7ef299a4c92c4b327f5b5d7e951f0753b4c8a
2014-07-14 12:50:51 -07:00
Jeff Sharkey
5028fb0357 Merge "Pass install result message; path selection." into lmp-dev 2014-07-14 18:37:56 +00:00
Alan Viverette
1dada3da99 DO NOT MERGE Remove sub-position scroller
BUG: 14477472
Change-Id: I019c58dedb383e9e906831c8e44bab8b88e92604
(cherry picked from commit 66072fe0e1494a851e54bc7756734141dfbf4fe0)
2014-07-14 19:03:43 +00:00
Ihab Awad
807fe0a19a Implement multi-SIM capabilities (1/6) [DO NOT MERGE]
- Split PhoneAccount into PhoneAccount & PhoneAccountMetadata
- Move PhoneAccount methods from TelephonyManager to TelecommManager

Bug:16292368
Change-Id: Ib440368d6bd0572b63c942360450fde5c27d84b9
(cherry picked from commit 936b3552b4a3569be9904c826b95b632886fb45d)
2014-07-14 18:19:27 +00:00
RoboErik
550116576c Add API to set a default session in Activity
We may have multiple remote sessions at once so an app needs a way
to specify a default session to route media and volume commands to
when its activity is in the foreground. This adds an api that works
in parallel with the default stream api on Activity.

bug:15727927
Change-Id: I5b67cb3e20647f9437d90aa65be63efe8c7865cf
2014-07-14 11:17:06 -07:00
Aravind Akella
8b8e74bd74 Add PackageManager feature strings for relative humidity and temperature sensors.
Change-Id: I56351f37f1c51517a3384b6040df0ed2be0c95b0
2014-07-14 18:01:55 +00:00
Jeff Sharkey
ad11eb52fe Pass install result message; path selection.
Oops, forgot to include message argument to invoke the new-style
callback.  Also use more robust way of generating cluster APK
directory names, and add more logging details on rename failure.

Change-Id: Ifa8abdd1db58b73e13b9a8077ec126cf20a0d90e
2014-07-14 10:57:04 -07:00
Svet Ganov
8fbd0dc303 Correct printer extra constant value.
We are passing the current printer to the custom print options activity.
Before we were using a constant specified in the java docs as it was
added past API change was possible. For this release a constant is
defined but its value was wrong and clients using the old (correct) value
could not look up the printer extra.

bug:16291822

Change-Id: Iaff6728865690caa8aaaa49a5911009d9f099148
2014-07-14 17:54:07 +00:00
Yorke Lee
ea16dec62b Merge "Add TRANSCRIPTION column to Calls table" into lmp-dev 2014-07-14 17:14:37 +00:00
Yorke Lee
9f41105768 Add TRANSCRIPTION column to Calls table
Bug: 10928782
Change-Id: I9ca266247cea0f4ce71576a88801034a6e6ee77b
2014-07-14 10:05:31 -07:00
Craig Mautner
a228ae95ea Add task affiliation
Introduces new flag Intent.FLAG_ACTIVITY_LAUNCH_BEHIND which
causes the newly launched task to affiliate with the launching task.
(Later this flag will also launch the task behind the current task).
This shows up in a new member of the RecentTaskInfo class. This also
causes the recents list returned by getRecentsInfo to be rearranged
so that affiliated tasks are together.

Fixes bug 16157517.

Change-Id: Ia1386af50da2f01809278b62d249f05c6a0de951
2014-07-11 21:18:27 +00:00
Igor Murashkin
30f01591c8 Merge "camera2: (LEGACY) Update flash modes to fix #testFlashControl CTS" 2014-07-11 17:04:34 +00:00
Igor Murashkin
396532ffb8 camera2: (LEGACY) Update flash modes to fix #testFlashControl CTS
Change-Id: I9b66a2b4393f4bc2272ecc94cd9a5c6273f3de59
2014-07-11 14:08:42 -07:00
Igor Murashkin
49a1d7b7de camera2: (legacy) Fixes for CaptureRequestTest#testAeModeAndLock
Change-Id: I5c1008cf34a9d98f67c36966e7cbf1c312979f97
2014-07-11 12:59:50 -07:00
Igor Murashkin
3e280b4bb2 camera2: (Legacy) Implement ae compensation step ranges and ae/awb locks
Characteristics:
* control.aeCompensationRange
* control.aeCompensationStep

Request/Result:
* control.aeExposureCompensation
* control.aeLock
* control.awbLock

Change-Id: I911616c9cf3e0e9a03a0cb383bcf232cab8ca772
2014-07-11 12:59:50 -07:00
Igor Murashkin
7ee78d1ee3 camera2: (legacy) Implement AF/AE regions for request and result
* Also stop lying about max AE regions (now reports the truth)

Change-Id: I567a1e6c58ed0bfb77cc09787393ea18eba5d613
2014-07-11 12:59:49 -07:00
Amith Yamasani
f6e2fcc2ea Improvements to Restrictions API
Convert restrictions provider to a service instead of a receiver.
Add a way to get pending responses from restrictions provider.
Add AbstractRestrictionsProvider.
Add a callback API for responses.

Removed some constants in RestrictionsManager.
Added new constants for errors and error codes.
Much improved javadocs.

Bug: 16176009

Change-Id: I838a50fabc80b94b632294b3a55cd5d8092acf55
2014-07-13 07:17:56 -07:00
Jeff Brown
5c6a8e3222 Merge changes I3c19e008,I2c7c6013,I5cfd37d9 into lmp-dev
* changes:
  Update media session test application for new media router.
  Initial draft of new MediaRouter APIs.
  Delete first draft of media routing APIs.
2014-07-10 21:35:02 +00:00
Jeff Brown
1a937b04e6 Initial draft of new MediaRouter APIs.
This patch introduces basic infrastructure for the new MediaRouter
API.  The code is fully documented but incompletely implemented.
It is being submitted not to facilitate API reviews.

MediaRouter is a new class that applications used to discovery,
connect to, and control media devices as represented by media
destinations and their routes.  Routes may offer a variety of
capabilities.  This new class is a much more powerful replacement
for the existing MediaRouter.

MediaRouteService is a base class for creating media route services
which third-parties can implement to make routes available to
applications.  It is analoguous to the MediaRouteProvider
infrastructure of the old media router support library but it
is designed to be integrated into the framework and enable a
variety of new usages such as remote display projection.

Stay tuned for more...

Change-Id: I2c7c6013d9f751d71e83697e7fc9e49bf7751fef
2014-07-14 04:38:14 -07:00
Eino-Ville Talvala
b942b05093 Deprecate android.hardware.Camera
__
             ||
             ||
             ||
             ||---____-----+
             ||    \_/     |
             ||   /. .\    |
             ||  ||---||   |
             ||   |___|    |
             ||    | |     |
             ||---____-----+
             ||
             ||
             ||
_____________||_________________

Replaced by android.hardware.camera2

- Also deprecate MediaRecorder#setCamera
- Also deprecate all Camera inner classes
- Update reference documentation in various classes to point to camera2
- Add note to camera API guide that it uses the old API
  (until a new guide is available)
- Remove old hidden raw sensor format; superceded by RAW_SENSOR.

Change-Id: I3d839765fc9b9aae906751ee32d6956ef40451ce
2014-07-13 21:45:57 -07:00
Barnaby James
12b6bb44c1 Merge "Add VoiceInteraction request type for successful actions." 2014-07-10 21:09:47 +00:00
Barnaby James
d3fdb8bed8 Add VoiceInteraction request type for successful actions.
Add CompleteVoiceRequest to VoiceInteractor to allow apps to indicate when a voice interaction was successfully completed.

Change-Id: I1481cfe96e9e2495d88a7a4fb62263bdd1e03c54
2014-07-11 10:34:50 -07:00
Svetoslav
15cbc8a032 Addressing comments for the print preview feature.
Change-Id: Ib72140a912e22f859258d970e0d1c4ef06e807d5
2014-07-11 16:46:46 +00:00
Chet Haase
685206cb03 Merge "Optimize gatherTransparentRegions to account for transparent bg" 2014-07-10 20:49:26 +00:00
Chet Haase
2b45a16b8b Optimize gatherTransparentRegions to account for transparent bg
gatherTransparentRegions() incorrectly takes the background into account
even when that background drawable is a completely transparent ColorDrawable
(which you can get by calling View.setBackgroundColor(0)). Checking
the opacity of the drawable allows us to ignore drawables that are not
visible.

Issue #13465427 Performance suggestion: View.setBackgroundColor(0) should set background to null

Change-Id: Ic552bf6a07cc9229fd32febc3ada73a0701cad0c
2014-07-11 13:38:51 -07:00
Wei Wang
af74e66e29 Unhide Bluetooth batch APIs. Deprecate BluetoothAdpater scan APIs. (1/2)
Change-Id: Ib0c4ea6c8372a15473269660355fb5ccf4284457
2014-07-11 11:06:10 -07:00
Dianne Hackborn
3c58775a12 Merge "Allow INTERACT_ACROSS_USERS for service access." 2014-07-10 20:49:26 +00:00
Makoto Onuki
a2295e65dc Enterprise caller-id: framework/base/Telephony
It's basically equivalent to http://ag/500455 and http://ag/499160.

Now "Send to voicemail" and the missed call notification uses the enterprise
lookup; they now work with a corp contact too.

Bug 15779911

Change-Id: I8a87f45ba7299cfbc516eb44326e02258e38cf63
2014-07-11 17:34:55 +00:00
Dianne Hackborn
409297da18 Allow INTERACT_ACROSS_USERS for service access.
But only if the two users are in the same profile.  Also
apply the same rule for the recently allowed interaction
across content providers.

The activity manager now keeps track of which users are in
the same profile group, and the handleIncomingUser function has
an option to allow a non-full caller to do the interaction
if the two users are in the same profile group.

Spread this joy all over the place.

Also turn off multi-user on Svelte devices.

Change-Id: I231484ea2a6bfccbb3cd51357d7a387bd75039ea
2014-07-11 10:30:04 -07:00
Paul Jensen
5d59e785e1 Readjust location of NETID_UNSET definition.
This is a tweak to my 8ec11bb change I a-little-too-hastily committed.

Change-Id: Ibeee9382109994c66227d1c42aac749e2a274ed7
2014-07-11 16:53:39 +00:00
Alexandra Gherghina
83231457d3 Adds hidden startActivityForResultAsUser APIs
Bug: 16056552
Change-Id: Ib50f95782748a9dfdb2ee64225971128ac78e1c8
2014-07-14 12:47:09 +01:00
Yohei Yukawa
4267dbea26 Merge "Use a bit more descriptive name for a parameter" 2014-07-10 21:43:01 +00:00
Yohei Yukawa
bb9f624252 Use a bit more descriptive name for a parameter
The current parameter name "index" in
CursorAnchorInfo.Builder#setComposingText is a bit hard
to understand.

This CL names it with "composingTextStart" to clarify its usage.

Change-Id: I504939b8d2b48875d8baa9630b5a4f04a5d66dbe
2014-07-12 01:11:45 +09:00
Paul Jensen
1397751c7f Merge "Define NETID_UNSET in ConnectivityManager." 2014-07-10 21:21:20 +00:00
Paul Jensen
bcc76d345c Define NETID_UNSET in ConnectivityManager.
This allows some cleanup and removal of dead code.

bug:15489928
Change-Id: Iaf0507bc2e8ec6dcc253f01f61c5b221d46581f9
2014-07-11 12:00:10 -04:00
Narayan Kamath
1dcdbb5af5 Merge "Unhide Build.SUPPORTED_ABIS and friends." 2014-07-10 20:16:40 +00:00
Narayan Kamath
1adf4002e7 Unhide Build.SUPPORTED_ABIS and friends.
Also deprecates Build.CPU_ABI and Build.CPU_ABI2.

bug: 15018047

Change-Id: If8bda8481b29442c0208ba8a72ec0037e813946c
2014-07-12 11:54:01 +01:00