The Android Automerger
4b22662d95
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-01 19:05:25 -07:00
Michael Jurka
9de90c1c57
Merge "Use clock's widget as the default keyguard widget" into jb-mr1-lockscreen-dev
2012-11-01 18:59:54 -07:00
Michael Jurka
67a871d857
Use clock's widget as the default keyguard widget
...
Also, if we have no widgets in lockscreen,
reinflate the default widget. If that fails,
inflate the built-in clock (KeyguardStatusView)
Change-Id: I2e90ab0893c993a755700e075e4a8ac5a685e0f2
2012-11-01 18:50:21 -07:00
Jim Miller
324545d7c8
Merge "Add configurable em-dash separator for all concatenated keyguard strings" into jb-mr1-lockscreen-dev
2012-11-01 18:17:51 -07:00
Jim Miller
e9be140771
Add configurable em-dash separator for all concatenated keyguard strings
...
Fixes bug 7459426
Change-Id: I2e4944f25f3e4e62b734bc57db628f1b3ce263cd
2012-11-01 18:16:37 -07:00
Winson Chung
b1260af2f5
Merge "Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)" into jb-mr1-lockscreen-dev
2012-11-01 18:13:01 -07:00
Ed Heyl
10d29e1550
am 39912f7f: Merge commit \'87bb019e57eddcedd4aeca180ac36bdf1d42064a\' into jb-mr1-dev
...
* commit '39912f7fcd5bfc4943bac1746c3ff2a9f1d93043':
2012-11-01 18:10:32 -07:00
Daniel Sandler
ebbf5eea2b
Merge changes Ib3133583,I0262172d into jb-mr1-lockscreen-dev
...
* changes:
Show "wrong password" on password screen, not "wrong PIN"
Restore incorrect-PIN lockouts.
2012-11-01 18:09:14 -07:00
Ed Heyl
39912f7fcd
Merge commit '87bb019e57eddcedd4aeca180ac36bdf1d42064a' into jb-mr1-dev
2012-11-01 18:06:35 -07:00
Winson Chung
e72855e670
Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)
...
Change-Id: I28ebbd04d90a1ea2a721c28d3bce7ccea31a33e9
2012-11-01 18:05:52 -07:00
Svetoslav Ganov
a94c3194ff
Cannot click on partially visible views in touch exploration.
...
1. In touch exploration mode the system clicks in the center of the
accessibility focus rectangle. However, if this rectangle is only
partially shown on the window or on the screen the system may not
be able to perform the click, if the accessibility focus center
is not on the screen, or click on the wrong window, if the access
focus center is outside of the window.
This change clips the rectangle to the window bounds which and the
display bounds. This will ensure no clicks are sent to the wrong
window and no clicks are sent outside of the screen.
bug:7453839
Change-Id: I79f98971e7ebcbb391c37284467dc76076172c5f
2012-11-01 16:27:05 -07:00
Scott Main
2681faafae
docs: explain implicit permissions applied by sdk versions
...
bug: 7453055
Change-Id: I59ba2de6108b5209ff0db6b084fc0a887c5f2cce
2012-11-01 15:59:22 -07:00
Jeff Brown
d2592635c1
am 62831a7b: Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev
...
* commit '62831a7bd02868316ad1a16dcf13c98896fdbbdc':
Eliminate potential reentrance from unregisterInputChannel.
2012-11-01 15:46:10 -07:00
Jeff Brown
62831a7bd0
Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev
2012-11-01 15:42:33 -07:00
Scott Main
ed7a026269
am 30fd78e2: am a47776c9: am 2cff3eea: am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
...
* commit '30fd78e27294cd7104f6589ab10f3f3dd1e65fcc':
new dashboard stats for 11/1, platform version only
2012-11-01 15:39:24 -07:00
Scott Main
30fd78e272
am a47776c9: am 2cff3eea: am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
...
* commit 'a47776c9f889242b3bcff0ff2d113d50da342262':
new dashboard stats for 11/1, platform version only
2012-11-01 15:37:31 -07:00
Scott Main
a47776c9f8
am 2cff3eea: am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
...
* commit '2cff3eeaeb419fcdfc7307c2c52a653483c76ddb':
new dashboard stats for 11/1, platform version only
2012-11-01 15:34:42 -07:00
Scott Main
2cff3eeaeb
am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
...
* commit 'f19804b5e994d183e6f6eeb512f74f2380ffd533':
new dashboard stats for 11/1, platform version only
2012-11-01 15:31:53 -07:00
Scott Main
f19804b5e9
Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
2012-11-01 15:28:34 -07:00
Laurent Tu
82c292e078
am 7ab7f538: Hide new location APIs and undeprecate old ones
...
* commit '7ab7f538924371a9dd4be7a27a6ae3b4c04b301c':
Hide new location APIs and undeprecate old ones
2012-11-01 15:27:23 -07:00
Laurent Tu
7ab7f53892
Hide new location APIs and undeprecate old ones
...
Hide all new location APIs related to LocationRequest/Geofence and
undeprecate all deprecated APIs consequently to the LocationRequest and
Geofence introduction. Also introduce LocationRequestUnbundled for
LocationProviders to use.
Change-Id: I5b116c7d342041f45b341c88a4b6813571118018
2012-11-01 15:22:22 -07:00
Scott Main
f3e08f3d2c
am 465c3753: Merge "docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263" into jb-mr1-dev
...
* commit '465c37533ac1fb76d76b062452ae19afb84aab0a':
docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263
2012-11-01 15:18:06 -07:00
Dianne Hackborn
872e3d36ee
am b9372de0: Merge "More debugging for issue #7343200 Fails to show wallpaper in the..." into jb-mr1-dev
...
* commit 'b9372de07d3329928f28104bb997aab57237504c':
More debugging for issue #7343200 Fails to show wallpaper in the...
2012-11-01 15:16:27 -07:00
Scott Main
74474e75e0
new dashboard stats for 11/1, platform version only
...
Change-Id: If6e9633170793e45abfdc94ef215f45edd64e547
2012-11-01 15:15:39 -07:00
Scott Main
465c37533a
Merge "docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263" into jb-mr1-dev
2012-11-01 15:14:25 -07:00
Adam Cohen
f19cce180f
Merge "Revert "Pushing state persistence to a background thread"" into jb-mr1-lockscreen-dev
2012-11-01 15:12:54 -07:00
Dianne Hackborn
b9372de07d
Merge "More debugging for issue #7343200 Fails to show wallpaper in the..." into jb-mr1-dev
2012-11-01 15:12:23 -07:00
Adam Cohen
b6f83374cc
Revert "Pushing state persistence to a background thread"
...
This reverts commit 039206a9b40d2188eb735f56ee51f131555c9dd3
Change-Id: I30fa07bf55a489562831b6334768b28bed638ef8
2012-11-01 15:12:07 -07:00
Victoria Lease
64e591934c
am 1e701979: Merge "fix NLP for COARSE applications, build FLP with SDK" into jb-mr1-dev
...
* commit '1e701979a031f42ee0fa0a07b151f6c61314e2e4':
fix NLP for COARSE applications, build FLP with SDK
2012-11-01 15:10:53 -07:00
Dianne Hackborn
529e744d31
More debugging for issue #7343200 Fails to show wallpaper in the...
...
...background for lockscreen sometimes and remains black / blank
There was a bunch of state not being put into the dumpsys output.
In particular, the current wallpaper target of the WindowAnimator
was not being included. I think the problem is that these targets
are not being updated from the main window manager state at some
point where they need to be.
Change-Id: Ic795047f6aea9b6f72d5550bccc9f8d76c6ecb67
2012-11-01 15:09:10 -07:00
Adam Cohen
6917cec8de
Merge "Pushing state persistence to a background thread" into jb-mr1-lockscreen-dev
2012-11-01 15:08:03 -07:00
Victoria Lease
1e701979a0
Merge "fix NLP for COARSE applications, build FLP with SDK" into jb-mr1-dev
2012-11-01 15:07:56 -07:00
Adam Cohen
039206a9b4
Pushing state persistence to a background thread
...
Change-Id: If776bc22c48525ba91dc7e4dd0e27de92612f2f5
2012-11-01 15:06:44 -07:00
Adam Powell
dc08142aab
Merge "Keyguard - fix overzealous sliding security view" into jb-mr1-lockscreen-dev
2012-11-01 15:02:32 -07:00
Adam Powell
9c2c77f8bd
Keyguard - fix overzealous sliding security view
...
Bug 7453429
Change the detection of sliding the security view to require crossing
the border between sections in the correct direction. This also
improves the feel of re-opening the slider.
Change-Id: I57797f926e017ea2cf41f7c48e0fe77ac0f78460
2012-11-01 14:54:45 -07:00
Svetoslav Ganov
7f0458ec01
am 7e1a45d8: Merge "Fix accessibility API injection." into jb-mr1-dev
...
* commit '7e1a45d8af9d02fc552d65f2abcaefe3096b2c9c':
Fix accessibility API injection.
2012-11-01 14:52:28 -07:00
Svetoslav Ganov
7e1a45d8af
Merge "Fix accessibility API injection." into jb-mr1-dev
2012-11-01 14:49:20 -07:00
Chris Craik
87bb019e57
am a84c9639: Merge "Avoid tesselation path when useCenter is set" into jb-mr1-dev
...
* commit 'a84c963936bf23ac4aaec3b17cd70ce50906b24a':
Avoid tesselation path when useCenter is set
2012-11-01 14:37:12 -07:00
Chris Craik
a84c963936
Merge "Avoid tesselation path when useCenter is set" into jb-mr1-dev
2012-11-01 14:33:58 -07:00
Robert Ly
893634aa1d
am f9e7b618: am 93a9a0a2: am 0fc15da0: am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
...
* commit 'f9e7b61867316057f80a92804da0b5800bd4c01a':
docs: google market -> google play
2012-11-01 14:26:18 -07:00
alanv
992ceefbcf
Fix accessibility API injection.
...
Also adds a heartbeat check so that if something does go wrong while adding
the JavaScript APIs, we don't attempt to use the JavaScript-based screen
reader.
Bug: 7450237
Change-Id: Ifbce77cf93115f658386c520b8226941607b2afe
2012-11-01 14:25:50 -07:00
Robert Ly
f9e7b61867
am 93a9a0a2: am 0fc15da0: am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
...
* commit '93a9a0a2bc2173d942f2c37d0751a9e4df8ecb24':
docs: google market -> google play
2012-11-01 14:23:30 -07:00
Robert Ly
93a9a0a2bc
am 0fc15da0: am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
...
* commit '0fc15da00597c5a017c1d8eed8f34064c702e4c2':
docs: google market -> google play
2012-11-01 14:19:18 -07:00
Robert Ly
0fc15da005
am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
...
* commit '677c1e14fbd991a46b5496d0873b7ca155fd71fb':
docs: google market -> google play
2012-11-01 14:16:47 -07:00
Robert Ly
677c1e14fb
Merge "docs: google market -> google play" into jb-dev-docs
2012-11-01 14:14:26 -07:00
Geremy Condra
7dcacd559a
Change android.permission.SERIAL_PORT to signature|system.
...
Bug: 7367956
Change-Id: I0bc65936ba59c43c18d9a6ba52affff4c921f2fb
2012-11-01 14:10:21 -07:00
Joe Malin
601dbad9c2
am 1f177cb8: am e639d67a: am d2e16346: am ac294abb: Revision to Notifications API guide
...
* commit '1f177cb87a87b26fe302298f96197766ebddaf96':
Revision to Notifications API guide
2012-11-01 14:02:49 -07:00
Joe Malin
1f177cb87a
am e639d67a: am d2e16346: am ac294abb: Revision to Notifications API guide
...
* commit 'e639d67aeb0e2758f2480c25e8ab007918701ed3':
Revision to Notifications API guide
2012-11-01 14:00:54 -07:00
Joe Malin
e639d67aeb
am d2e16346: am ac294abb: Revision to Notifications API guide
...
* commit 'd2e163461ee8aa79d4560f38e924a7edc44ad4dd':
Revision to Notifications API guide
2012-11-01 13:58:02 -07:00
Victoria Lease
779b77455f
fix NLP for COARSE applications, build FLP with SDK
...
In this commit, we provide a means for unbundled location providers
to attach an EXTRA_NO_GPS_LOCATION to the Locations that they report.
We also build FusedLocation against the SDK rather than the internal
tree.
Used in conjunction with I394ded497b8de40d1f85618bff282553cdf378cb
to fix NLP for applications with only ACCESS_COARSE_LOCATION
permission.
Bug: 7453355
Change-Id: Ie696f7abff9ef5237740ab87fe9f537a1c812c54
2012-11-01 13:55:36 -07:00