109427 Commits

Author SHA1 Message Date
Dirk Dougherty
369d1980b9 am 9aaa8f30: am 0acf946b: Doc change: Add Colopl video to carousel and spotlight. cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
* commit '9aaa8f30393413a5a52c4494146b35de3124d8a0':
  Doc change: Add Colopl video to carousel and spotlight. cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
2013-07-23 12:45:37 -07:00
Dirk Dougherty
9aaa8f3039 am 0acf946b: Doc change: Add Colopl video to carousel and spotlight. cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
* commit '0acf946bb4968416d123ced337d8bb42eb17df8b':
  Doc change: Add Colopl video to carousel and spotlight. cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
2013-07-23 12:42:19 -07:00
Dirk Dougherty
0acf946bb4 Doc change: Add Colopl video to carousel and spotlight.
cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93

Change-Id: I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
2013-07-23 12:33:06 -07:00
Dianne Hackborn
57a7f5954c Add "adb shell am restart" command.
So you can restart the system without being root.

Change-Id: I89770f497833ecbe2b69e3a0cfafae7ef472a9f5
2013-07-23 11:51:22 -07:00
Dianne Hackborn
5cf6663c80 Merge "Add new facility for apps to declared their preferred intents." 2013-07-23 18:30:18 +00:00
Stan Chesnutt
9a3552bfca Merge "switch to v3 for NetworkLocator overlay, compatible with gcore FINN" 2013-07-23 18:00:25 +00:00
Geremy Condra
5830e07521 Merge "Fix supplimentary network connections with VPNs" 2013-07-23 17:58:33 +00:00
Craig Mautner
b816bedf6f Limit TYPE_SYSTEM_ERROR to system decor bounds.
Because windows of TYPE_SYTEM_ERROR lie in a layer above the
Navigation Bar they cannot be allowed to extend into the Navigation
Bar area or it will block touches to the Home button.

Fixes bug 9626315

Change-Id: Ib5e4a2d2954cb79adc98d69e3c43108cb1389cc9
2013-07-23 10:56:16 -07:00
Geremy Condra
1b6868cc4b Merge "Support multiple Vpn ManageDialogs" 2013-07-23 17:55:45 +00:00
Zhijun He
a874c6762d Merge "MediaFrameworkTest: Fix camera unit test failure" 2013-07-23 17:33:51 +00:00
Glenn Kasten
5bae9df4e8 Merge "Replace run-time PCM encodings by compile-time constants" 2013-07-23 17:32:10 +00:00
Glenn Kasten
6824a143c9 Merge "Remove unused includes" 2013-07-23 17:01:54 +00:00
Glenn Kasten
369dbf9a66 Merge "Use the utility logging methods and single tag" 2013-07-23 16:26:01 +00:00
Amith Yamasani
9dade39ec3 Merge "User restriction API to disable single-user restrictions feature." 2013-07-23 16:21:48 +00:00
Jean-Michel Trivi
2352228ff1 Merge "Launch voice-based searches as current user" 2013-07-23 16:20:26 +00:00
Jean-Michel Trivi
9020316ea3 Merge "Fix dump formatting of RemoteControlClient playback state dump" 2013-07-23 16:18:58 +00:00
Amith Yamasani
0343ec3abb User restriction API to disable single-user restrictions feature.
Change-Id: I80e08b38b5e32f3cb1af51398907510508ec199f
2013-07-23 09:17:21 -07:00
Glenn Kasten
4afca0cc90 Merge "Detect integer overflow" 2013-07-23 15:52:31 +00:00
Baligh Uddin
7b854fcc6e Merge "Import translations. DO NOT MERGE" 2013-07-23 15:39:46 +00:00
Chris Wren
51c7510e49 allow rich notifications in the heads up.
new shouldInterrupt logic: screen on, not locked, not dreaming, and
  priority above HIGH and noisy, or has fullscreen intent
draft of API allowing devs to give hints about head up display

reuse inflateViews()
add an expand helper to the heads up space
move some things into Entry for reuse

don't allow touches in first second
delay decay if touched
make decay time a resource

add a custom viewgroup for notification rows to get view management
out of the NotificationData class.

Change-Id: I36464f110cfa0dabc3f35db7db6c35c27e8ee2ba
2013-07-23 11:38:56 -04:00
Glenn Kasten
4e693f558f Merge "Verify that AudioRecord object is initialized for more APIs" 2013-07-23 15:22:39 +00:00
Glenn Kasten
7fc7230787 Merge "Remove redundant AudioRecord. qualifiers" 2013-07-23 15:03:14 +00:00
Glenn Kasten
004f2b7835 Merge "Return the record state locked" 2013-07-23 14:51:30 +00:00
Glenn Kasten
9ad3afe52e Merge "Return correct status for android.media.AudioRecord.read(short[]...)" 2013-07-23 14:32:27 +00:00
Ben Murdoch
597256e128 Update WebView.loadDataWithBaseURL documentation.
Clarify behavior around base URLs with data: vs. non-data: schemes.

Bug: 9894754
Change-Id: I335253c07a13f3d4a5485b6ff11e53bd1580a890
2013-07-23 15:15:21 +01:00
Martijn Coenen
434249ef62 Re-use "name" attribute for NFC AIDs.
Change-Id: I92895e0f21a639897c45ec184580c43ba8b22dca
2013-07-22 19:47:57 -07:00
Zhijun He
229019e6af MediaFrameworkTest: Fix camera unit test failure
Fix for testSubmitStreamingRequest failure

Change-Id: I2e22a56b3da90112a668c2185b05eb9288cde392
2013-07-22 18:08:30 -07:00
Jean-Michel Trivi
f47634edfe Fix dump formatting of RemoteControlClient playback state dump
Take into account the two types of undefined plyback position.
Only use "ms" unit when there is a position to write.
Fix misplaced ",".

Change-Id: I5033ec6ee7480f1ac525af7b7b0a9da259614783
2013-07-22 17:47:11 -07:00
Romain Guy
d1233575b5 Merge "Use the parameter type as part of the methods cache key" 2013-07-23 00:03:51 +00:00
Romain Guy
484f4d6282 Use the parameter type as part of the methods cache key
Change-Id: Ie204d16b62028fc1eb35cc7cb3244654e1360a37
2013-07-22 16:59:31 -07:00
David Christie
82edc9b348 Add WorkSource capability to LocationManager
Change-Id: I0fbbad0879b87ecc75a503bf7963356595bf4b96
2013-07-22 16:50:13 -07:00
Jean-Michel Trivi
dcd40c0e57 Launch voice-based searches as current user
Launch the voice-based interactions (voice search, web search) as
 the current user.

Change-Id: I5a038feea24346c3c94f86097f574ffdc499cf60
2013-07-22 16:46:42 -07:00
Chris Craik
98427708a8 Merge "Ensure glActiveTexture is cleaned up correctly on functor resume" 2013-07-22 23:31:20 +00:00
Chris Craik
9ab2d18475 Ensure glActiveTexture is cleaned up correctly on functor resume
Change-Id: I103d7d63b17289d599c2c08dcc442cfba9b8e51d
2013-07-22 16:21:55 -07:00
Martijn Coenen
fd23eca5ba Merge "First shot at (host-based) card emulation APIs." 2013-07-22 23:20:01 +00:00
Jean-Michel Trivi
2342543328 Merge "Refactor for audio focus, remote control, media button handling" 2013-07-22 23:14:26 +00:00
Jean-Michel Trivi
fa9a69805b Refactor for audio focus, remote control, media button handling
Extract audio focus, remote control and media button handling
 outside of AudioService without any changes in functionality.
 Moving logic to new class, MediaFocusControl.
Introduce interface for managing volum control logic, VolumeController.
 The VolumePanel class implements this interface.

Change-Id: I72bda2e0670c26e61ff076fd729c15f9f1156dc5
2013-07-22 16:09:15 -07:00
Craig Mautner
358a8cc678 Merge "Add null check to StackBox containment test." 2013-07-22 22:54:15 +00:00
Dianne Hackborn
b09491f271 Add new facility for apps to declared their preferred intents.
This is an extension from the existing data/etc/perferred-apps
facility.  Now applications pre-installed on the system image
can declare which intents they would like to be considered the
preferred app for.  When the system firsts initializes, or the
application settings are reset, these are used to configured
the current preferred app settings appropriately.

You use this with a new <preferred> tag under your activity,
which indicates which intents you would like to be the preferred
handler for.  The syntax for this is written much like an
intent filter, however semantically it is not really an intent
filter and so has some important differences:

- You can not use globbing patterns (for SSPs or paths).
- You can use only one action (if you use more than one it
  will only use the first one, so be careful).

Semantically what this is actually used for is a template
from which to generate a set of Intent objects, which are used
to probe the current environment in order to see if there are
multiple activities that can handle the Intent and, if so,
generate a new preferred setting for that pointing to your app.

As an example, here is how the preferred tag might be written
for the Maps application:

            <preferred>
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
                <data android:scheme="http" />
                <data android:scheme="https" />
                <data android:host="maps.google.com" />
                <data android:path="/" />
                <data android:pathPrefix="/maps" />
            </preferred>
            <preferred>
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
                <data android:scheme="geo" />
            </preferred>

From this, we generate the following set of potential Intents
to be matched, all with ACTION_VIEW, CATEGORY_DEFAULT+CATEGORY_BROWSABLE:

Change-Id: I7fd42aec8b6109c7dd20012529662362f1b7437a
http://maps.google.com/
http://maps.google.com/maps
https://maps.google.com/
https://maps.google.com/maps
geo:
2013-07-22 15:30:11 -07:00
Martijn Coenen
ce1279686b Merge "Add host-based card emu feature to PackageManager." 2013-07-22 22:29:21 +00:00
Romain Guy
03903b3bc8 Merge "Use global indices array to draw layers" 2013-07-22 22:16:03 +00:00
Igor Murashkin
6944165014 Merge "camera2 api: marshal rect, size, string for metadata" 2013-07-22 21:38:55 +00:00
Romain Guy
448455fe78 Use global indices array to draw layers
An array of indices local to a layer would only be necessary if
we changed the way we resolve T-junctions. Since we only ever
draw quads, let's just use the indices we use everywhere else.

This change also uses the global indices array to render list
of colored rectangles to save on the number of vertices generated
CPU-side.

Change-Id: Ia6d1970b0e9247805af5a114ca2a84b5d0b7c282
2013-07-22 14:37:21 -07:00
Stan Chesnutt
39062ddff2 switch to v3 for NetworkLocator overlay, compatible with gcore FINN
http://b/8245654

Change-Id: I2ff95b3b9e138b57bc630f760476bbb7d748342a
2013-07-22 14:33:30 -07:00
Michael Wright
c9cc2d0ddc Merge "Fix swipe end location" 2013-07-22 21:31:05 +00:00
Michael Wright
0f80f4b584 Merge "Take advantage of KeyEvent.isConfirmKey" 2013-07-22 21:30:02 +00:00
Joe Fernandez
0c11469a44 am 0db151ff: am 874b2ba1: am c4624d2e: Merge "docs: Android 4.3 Platform Release Notes" into jb-mr2-dev
* commit '0db151ff1a4aef1c56096d8c325821196b61f317':
  docs: Android 4.3 Platform Release Notes
2013-07-22 14:07:06 -07:00
Joe Fernandez
0db151ff1a am 874b2ba1: am c4624d2e: Merge "docs: Android 4.3 Platform Release Notes" into jb-mr2-dev
* commit '874b2ba1f997401ad3dd0a5d192269ac682906a3':
  docs: Android 4.3 Platform Release Notes
2013-07-22 14:04:47 -07:00
Joe Fernandez
874b2ba1f9 am c4624d2e: Merge "docs: Android 4.3 Platform Release Notes" into jb-mr2-dev
* commit 'c4624d2efbeab6c9ef89def696421aaa086025bd':
  docs: Android 4.3 Platform Release Notes
2013-07-22 14:01:24 -07:00
Michael Wright
77a2dabf01 Fix swipe end location
Change-Id: I997ca30dc5399b36e13516c4aeadbdf6fa357df7
2013-07-22 13:58:45 -07:00