75572 Commits

Author SHA1 Message Date
Eric Fischer
3815860f3e Merge "Import translations. DO NOT MERGE" into jb-dev 2012-04-27 12:45:10 -07:00
Eric Fischer
023e0534c3 Import translations. DO NOT MERGE
Change-Id: I8196154b165235340eb698ceb86d694e2986bbe5
2012-04-27 12:41:40 -07:00
Eric Fischer
e167c9fcb3 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-04-27 12:32:40 -07:00
Eric Fischer
83f2a1e903 Import translations. DO NOT MERGE
Change-Id: Idd0d5aa4657025a03423e155237f820da534ce87
2012-04-27 12:24:55 -07:00
Robert Greenwalt
aa1346c5cb Merge "Add Usb control to svc." into jb-dev 2012-04-27 11:55:16 -07:00
Yoshihiko Ikenaga
bfb27bbefb Allow override of p2p dialogs
By default, we show dialogs for connection requests and for
user interaction for pin input from the framework.

For applications, that want to make the experience more seamless
we should allow automatic discovery and connection as long
as one app can control it. We allow this for a foreground
app alone right now.

This will be a hidden API for now.

Bug: 6411069
Change-Id: Id342e933073d30eb58bf5a03a47ca26a64df8ddb
Signed-off-by: isheriff@google.com
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2012-04-27 11:18:14 -07:00
Omari Stephens
ca7086f5bd Merge "Create a catch-all testcase to handle asynchronous crashes and ANRs" into jb-dev 2012-04-27 11:10:02 -07:00
Steve Block
886f138dfe Merge "Fix build warning due to WebSettings now being abstract" into jb-dev 2012-04-27 11:09:41 -07:00
Adam Powell
f2d75bc09a Merge "Use finishAffinity for automatic up navigation" into jb-dev 2012-04-27 11:02:31 -07:00
Daniel Sandler
11dea29451 Merge "Propagate change Id1393cef to tablet UI." into jb-dev 2012-04-27 10:24:34 -07:00
Daniel Sandler
f8d0494bf6 Merge "Allow nav bar height to vary between portrait and landscape." into jb-dev 2012-04-27 10:24:14 -07:00
Jeff Sharkey
f5d70fd2ad Merge "Protect system services with DUMP permission." into jb-dev 2012-04-27 10:16:40 -07:00
Robert Greenwalt
59d3d86811 Add Usb control to svc.
We used to have control over usb via ndc but recent changes removed that.
The reverse_tether.sh script needs control (on rooted devices) to run
so added this.

bug:4208971
Change-Id: I722fc0e14540890be0d79a0b7d22f23b2d57f20c
2012-04-27 10:06:16 -07:00
Irfan Sheriff
d52e0c791f Merge "Add support for changing p2p device name" into jb-dev 2012-04-27 09:55:37 -07:00
Irfan Sheriff
2bdefcab74 Add support for changing p2p device name
Change-Id: Ie13fe2adedd0bac6aa07b3369c4d6a05ef33cd24
Signed-off-by: isheriff@google.com
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2012-04-27 08:53:34 -07:00
Eric Laurent
c098198eb3 Merge "system and UI sounds volume policy" into jb-dev 2012-04-27 08:48:51 -07:00
Daniel Sandler
635fb490c5 Propagate change Id1393cef to tablet UI.
Bug: 5854958
Change-Id: I5c9976307ab13398ad2533a57f45d647040c3d4a
2012-04-27 10:46:17 -04:00
Daniel Sandler
9f65c4c34a Allow nav bar height to vary between portrait and landscape.
Change-Id: I1d69e0f4a1772bff6534c5c591e1def26d163708
2012-04-27 10:24:01 -04:00
Daniel Sandler
2c9ae75388 Finally, fix the teensy back button in landscape.
Bug: 5993561 (and friends)
Change-Id: I0ccde54ea145e945f1a02d0480585c32cd129911
2012-04-27 10:15:16 -04:00
Daniel Sandler
c2ee231b5e Merge "Lights out improvements." into jb-dev 2012-04-27 04:56:08 -07:00
Steve Block
d26286684b Fix build warning due to WebSettings now being abstract
WebSettings was made abstract in
https://android-git.corp.google.com/g/#/c/177360

current.txt was updated, but this causes a build warning because 16.txt was not
updated to match.

Change-Id: I4e00297361048509fab236f292c07d8a0df28f28
2012-04-27 12:08:43 +01:00
Steve Block
7e279bc91a Merge "Tweak JavaDoc for WebSettings.setAllowUniversalAccessFromFileURLs() and setAllowFileAccessFromFileURLs()" into jb-dev 2012-04-27 03:19:04 -07:00
Ben Murdoch
c6911d47d1 Merge "Create WebViewDatabaseClassic from WebViewDatabase." into jb-dev 2012-04-27 01:39:59 -07:00
Pannag Sanketi
b33c34cc25 Merge "Resolving the black screen / crash in effects" into jb-dev 2012-04-26 22:34:03 -07:00
Adam Powell
897b1dd610 Use finishAffinity for automatic up navigation
Change-Id: I2ac1971e82c499e8bafe13fcc113c5594c34864b
2012-04-26 19:53:41 -07:00
Dianne Hackborn
73214f619a Merge "Fix launcher icon size for tvdpi." into jb-dev 2012-04-26 19:33:37 -07:00
Dianne Hackborn
493f74e5a4 Merge "Add new Activity.finishAffinity() method." into jb-dev 2012-04-26 19:25:41 -07:00
Dianne Hackborn
d0356a19c1 Fix launcher icon size for tvdpi.
We didn't have a case for tvdpi, so ended up in the default
scaling.  This resulting in us using 319 instead of 320.

Fixed the default case to round, and added explicit cases
for tvdpi since this is a standard density.

Change-Id: I752b924e1556af94682428c8c0ed7c75d15ac4a4
2012-04-26 19:03:12 -07:00
Dianne Hackborn
ecc5a9cca0 Add new Activity.finishAffinity() method.
It's cool!

Change-Id: I9fdcd9535b7f1ca2b311d3a1b23e5d058977b095
2012-04-26 18:56:09 -07:00
Adam Cohen
e6eb929142 Merge "Fix NPE in RemoteViews (issue 6408103)" into jb-dev 2012-04-26 18:45:18 -07:00
Adam Cohen
c431c156bb Fix NPE in RemoteViews (issue 6408103)
Change-Id: I3e7ff2941b721c2c0c5c4e7d598df794b105c391
2012-04-26 18:42:17 -07:00
Eric Laurent
6d5176638c system and UI sounds volume policy
Implement a more consistent policy for system and UI sounds (key clicks, lock/unlock,
camera shutter, DTMF, low battery...):
- All system sounds are played over STREAM_SYSTEM stream type.
- The STREAM_SYSTEM volume that was previously fixed now tracks the volume of a "master"
stream type. This "master" stream type is STREAM_RING for phones and STREAM_MUSIC for
tablets which corresponds to the stream whose volume is modified by default by the volume
keys.
- The STREAM_SYSTEM volume ranges from -24dB to -6dB (-24dB to -12dB over headphones) when the
"master" stream volume ranges from its min to its max.
- DTMF tones are played over STREAM_DTMF that tracks the "master" stream volume in the same
manner with the following exception: when in call, DTMF stream tracks STREAM_VOICE_CALL volume.
- Camera shutter sound is played over STREAM_SYSTEM_ENFORCED stream that tracks the "master"
stream volume except in countries where regulation enforces this sound. In this case
its volume is fixed and cannot be muted.
- Low battery sound is played over STREAM_SYSTEM and therefore has a tunable volume and is
heard while in call.

Issue 6344620.
Issue 6069229.
Issue 6213100.

Change-Id: I53a237878ead596e706c5dbbb1420e62cde32bd7
2012-04-26 18:36:56 -07:00
Jeff Sharkey
eb4cc492c9 Protect system services with DUMP permission.
Change-Id: I5e53859f8b8e5473e54eca43ebd7de841f1a05ff
2012-04-26 18:17:29 -07:00
Yu Shan Emily Lau
f18222da3c Merge "Fix the test cases which fail to launch the camera in the device which only has one camera." into jb-dev 2012-04-26 17:29:15 -07:00
Yu Shan Emily Lau
e35b3e052d Fix the test cases which fail to launch the camera
in the device which only has one camera.

Change-Id: Ia34087715e49f1aa3e86f3f85cb4e77168323321
2012-04-26 17:10:29 -07:00
Makoto Onuki
ccdf0afbd7 Merge "Update streamitems javadoc" into jb-dev 2012-04-26 15:47:35 -07:00
Omari Stephens
a6a353653d Create a catch-all testcase to handle asynchronous crashes and ANRs
Bug: 5913065
Change-Id: I391aff6919a9586159ec0898279e7254eed990f8
2012-04-26 15:46:30 -07:00
Pannag Sanketi
2f708ce9cc Resolving the black screen / crash in effects
b:/6278826
The SurfaceTextureTarget Filter was not unregistering the surface
on closing leading to crashes and blank screens.

Change-Id: Ia9f6fc69b92d5a5e2e1e3803969152d11528aa3d
2012-04-26 15:46:17 -07:00
Makoto Onuki
46891a8f1c Update streamitems javadoc
ACCOUNT_TYPE and ACCOUNT_NAME query parameters were required in API level 15.
We've removed the check for JB, but in order to keep compatibility with HC
apps still need to add those parameters.

Bug 5135278

Change-Id: Ib9b9751c9017c53905047045816a44c5a279fa64
2012-04-26 15:41:48 -07:00
Adam Cohen
2938ac3f9f Merge "Enabling RemoteViews to have a landscape and portrait layout" into jb-dev 2012-04-26 15:35:13 -07:00
Amith Yamasani
7a4be122cd Merge "Add some missing getters for XML/Java API consistency." into jb-dev 2012-04-26 15:28:52 -07:00
Steve Block
ef16315080 Tweak JavaDoc for WebSettings.setAllowUniversalAccessFromFileURLs() and setAllowFileAccessFromFileURLs()
Bug: 6212665
Change-Id: Ifc5c83cfee7cf63edbe2c65c55617eb01ea9eced
2012-04-26 23:25:29 +01:00
Eric Fischer
16fb5d444c Merge "Import translations. DO NOT MERGE" into jb-dev 2012-04-26 15:25:17 -07:00
Dianne Hackborn
8e6159b821 Merge "Add traces for window manager and activity manager." into jb-dev 2012-04-26 15:24:18 -07:00
Eric Fischer
2be1523ba9 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-04-26 15:20:58 -07:00
Brian Colonna
6bc7591640 Merge "Changes to biometric sensor interface in lockscreen" into jb-dev 2012-04-26 14:41:18 -07:00
Brian Colonna
ea8441e22a Changes to biometric sensor interface in lockscreen
This cleans up the biometric sensor interface - the interface between
lockscreen and Face Unlock.  Not only does it document the interface,
but it also makes two noteworthy changes to the interface:

1) Instead of calling mBiometricUnlock.start() with a parameter to
tell it whether to suppress itself, lockscreen makes all of the
decisions about whether the biometric unlock should be started or not
and only calls start() if it should be started.  Passing a parmeter to
tell a function to not start itself was strange, but it was a
necessary intermediate step in the process of fixing this interface.

2) Instead of calling mBiometricUnlock.initializeView() with a top
view that the biometric unlock should attach to, lockscreen now
provides the biometric unlock with the actual view it is allowed to
work in.  This keeps lockscreen in control of where the biometric
sensor is allowed to display.

A few things were also cleaned up within the Face Unlock
implementation of the biometric interface:

1) Changes needed to match the requirements of the improved biometric
sensor interface, including moving the functions into an order that
makes more sense.

2) The bind() function was only being called from start(), which has
turned into only a couple of lines of code, so the bind() code has
been just put inline into the start() function, which mirrors the
stop() function which has the unbind() code in it.

3) The showArea() function was really just one line of code with a
check.  It was being called from two places.  The showArea() code is
now just written inline in those two places, which makes the code
much easier to follow.

4) Renamed occurrences of FaceLock to Face Unlock.

Change-Id: Ie95ce21dcc77170381af9ce320f2675dfe249741
2012-04-26 17:31:29 -04:00
Mike Lockwood
9ad1b11326 Merge "Make audio routing Intents protected" into jb-dev 2012-04-26 14:30:31 -07:00
Eric Fischer
130f95b1e0 Import translations. DO NOT MERGE
Change-Id: I8816757eeaf3b8b2b01964ec030ef3ca5f24ff7a
2012-04-26 14:23:36 -07:00
Irfan Sheriff
aeeee6a364 Merge "Fix flag on network state change broadcast" into jb-dev 2012-04-26 14:21:22 -07:00