Kenny Root
c669559dc3
am b5a4b5d3: Merge "Allow updated system apps to retain priority" into honeycomb
...
* commit 'b5a4b5d300bc05a969181155a4f155a79241f792':
Allow updated system apps to retain priority
2011-01-12 12:00:13 -08:00
Kenny Root
b5a4b5d300
Merge "Allow updated system apps to retain priority" into honeycomb
2011-01-12 11:58:11 -08:00
Kenny Root
502e9a47c6
Allow updated system apps to retain priority
...
Previously any updated system apps would not be able to have a greater
than 0 priority on an activity intent filter. Moving the priority check
later in the package scanning allows it to apply to updated system
packages as well.
Cherry-pick from gingerbread branch
Bug: 2572398
Change-Id: I95d8b6360bf7a3f39cd7a1ff09e1ee57e11583d8
2011-01-12 11:57:23 -08:00
Jaikumar Ganesh
f487d72215
Add ability to parse keyboard fixed pin auto pair blacklist.
...
Try auto pairing with such keyboards.
Also fix bug where dynamic auto pairing file was not being created.
Change-Id: I93afb96fee8bc4f245f96ec5961979c620de7948
2011-01-12 11:56:15 -08:00
James Dong
5df82ef953
am cb0f6d0b: Merge "Speed up MP3Extractor using cached reads" into honeycomb
...
* commit 'cb0f6d0b42b264ec6aa2a98fe210d72ed10f73ed':
Speed up MP3Extractor using cached reads
2011-01-12 11:56:01 -08:00
Alex Sakhartchouk
941f86590c
am 27d11608: Merge "Adding ability to load cubemaps from individual faces." into honeycomb
...
* commit '27d116085ebbb112ec1fd959763a027ec08f7179':
Adding ability to load cubemaps from individual faces.
2011-01-12 11:55:54 -08:00
James Dong
cb0f6d0b42
Merge "Speed up MP3Extractor using cached reads" into honeycomb
2011-01-12 11:54:32 -08:00
Alex Sakhartchouk
27d116085e
Merge "Adding ability to load cubemaps from individual faces." into honeycomb
2011-01-12 11:53:42 -08:00
Jamie Gennis
b598fb9072
Implement crop & transform for SurfaceTexture.
...
This change adds support for the setCrop and setTransform methods of the
SurfaceTexture C++ class. The crop and transform for the current
texture will be accessed by applications as a single texture coordinate
transform matrix.
Change-Id: I6482bf96f680e5c175364e848936db3908d6c8f8
2011-01-12 11:28:38 -08:00
Dianne Hackborn
4389434c1d
Make ProgressDialog a little less lame.
...
Change-Id: Ic3f1dd8ba32dd02d422ee6f05fff5541e54bb8a1
2011-01-12 11:17:17 -08:00
Kristian Monsen
4cfa64479f
am 7a8f01ab: Merge "Add a static method to get the InputStream of a content URL" into honeycomb
...
* commit '7a8f01abf98b6212358ea0e0401879093d2c0f93':
Add a static method to get the InputStream of a content URL
2011-01-12 11:17:13 -08:00
Kristian Monsen
40e086c422
am 6c5e4dc2: Merge "Adding a static method to get the size of a content url" into honeycomb
...
* commit '6c5e4dc2312f0b6a3c02972c382d5a047793e734':
Adding a static method to get the size of a content url
2011-01-12 11:17:11 -08:00
Kristian Monsen
7a8f01abf9
Merge "Add a static method to get the InputStream of a content URL" into honeycomb
2011-01-12 11:15:20 -08:00
Kristian Monsen
6c5e4dc231
Merge "Adding a static method to get the size of a content url" into honeycomb
2011-01-12 11:15:09 -08:00
Leon Scroggins
b45a263343
Differentiate between clicks for focus and actual clicks.
...
Bug:3344162
Requires a change in external/webkit.
Change-Id: I6650a3084926fe4c241ccd7deca146e44460f29c
2011-01-12 14:13:28 -05:00
Michael Jurka
bc5340548b
am b609881f: Merge "Add sym_def_app_icon to mipmap directory" into honeycomb
...
* commit 'b609881fb0f27c7e6fd3ec955a35d2c78a5852ab':
Add sym_def_app_icon to mipmap directory
2011-01-12 11:08:28 -08:00
Michael Jurka
b609881fb0
Merge "Add sym_def_app_icon to mipmap directory" into honeycomb
2011-01-12 11:06:44 -08:00
Chet Haase
0ba9ab2956
am 535d5eda: Merge "New interpolator resources now found in interpolator/ directory" into honeycomb
...
* commit '535d5edad225a2855e952a1883310c4a0fa43b72':
New interpolator resources now found in interpolator/ directory
2011-01-12 11:04:22 -08:00
Chet Haase
535d5edad2
Merge "New interpolator resources now found in interpolator/ directory" into honeycomb
2011-01-12 11:01:50 -08:00
Huahui Wu
012acc8620
am 342bfbf9: Merge "b/3340946 Fix NPE caused by null gesture detector." into honeycomb
...
* commit '342bfbf94fa806be8fefa7ff905ba0a0b0b98df0':
b/3340946 Fix NPE caused by null gesture detector.
2011-01-12 10:59:22 -08:00
Huahui Wu
342bfbf94f
Merge "b/3340946 Fix NPE caused by null gesture detector." into honeycomb
2011-01-12 10:57:51 -08:00
Dianne Hackborn
20acd9d93d
am 6014527c: Add "min size" facility to the Window class.
...
* commit '6014527c350895383b99ba91d3d009a32b1d22a6':
Add "min size" facility to the Window class.
2011-01-12 10:39:58 -08:00
Huahui Wu
8465cc9d88
b/3340946 Fix NPE caused by null gesture detector.
...
Gmail use WebView without instantiating the gesture detector. The Gmail team replied that they don't need the pinch to zoom feature so we can safely skip multi-touch events for them.
Change-Id: Id60a4d4583979ef5b420fff04c4ca097c0594024
2011-01-12 10:37:11 -08:00
Amith Yamasani
5980cbbc9c
Use light preference panel drawable for Theme.Light
...
Bug: 3281676
Change-Id: I16c5cca277e8d6d5e80f8b72b7b67456e7352889
2011-01-12 10:37:00 -08:00
Dianne Hackborn
6014527c35
Add "min size" facility to the Window class.
...
This allows us to have a new dialog theme that behaves like an alert dialog
for both Dialog and Activity versions. Very useful with so many more things
being displayed as dialogs on our nice large screen.
Note I didn't change the existing dialog themes to have this behavior, since
it will probably break things. Instead there is a new variation. And the
DialogWhenLarge variations now use this for their dialog form, to fix many
of the real new dialogs we have that need this behavior.
Removed the public definition of the one alert dialog theme. None of the
others have ever been public, this one shouldn't be.
Added new .Panel versions of the Holo themes, like we already had for the
original themes.
Changed the alert dialog layout to no longer use WeightedLinearLayout,
since the window now takes care of that. This allowed for the removal
of the xlarge version of those layouts.
Change-Id: I0c8372bde25eb9af47404a719b3f07230baf73bf
2011-01-12 10:33:13 -08:00
Andreas Huber
4bca5e19d5
Fail to parse duration instead of asserting, if the server response cannot be parsed.
...
Change-Id: I42324468edca5ccce29486059091da8e64f36326
related-to-bug: 3338518
2011-01-12 10:31:04 -08:00
Kenny Root
af604587c9
Add sym_def_app_icon to mipmap directory
...
The default activity icon was a drawable so different densities were
being stripped out during build time. Copying it to the mipmap
directory allows all different scales to be used.
Bug: 3325002
Change-Id: Id7138aa243ba11c02b33f0e3e9154569542592e8
2011-01-12 10:14:21 -08:00
Jaikumar Ganesh
ac6f13dc68
Revert "Add temporary hack for keyboards not following spec."
...
This reverts commit 8cc316e4f4458725f78b2b7ebde2f780f9b8447b.
2011-01-12 10:08:57 -08:00
James Dong
31d8a03e44
Speed up MP3Extractor using cached reads
...
Change-Id: I53a5ed76bc2f76f0c184f3800b5448f677117ae3
2011-01-12 09:49:15 -08:00
Mike Lockwood
1c4e88d0b0
Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media
...
This rips out some complicated code that was added since gingerbread
that is no longer necessary.
Change-Id: Iab5ecb7314c06221475ce01ef483f34f17003b06
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-12 12:48:13 -05:00
Mike Lockwood
35a2ea2fbf
Remove permission android.permission.WRITE_MEDIA_STORAGE
...
Access to the /data/media directory is now restricted exclusively to the
sdcard daemon, so there is no longer a need for this permission.
Change-Id: Iea8400f0eee167df19cc231c502d251a364f98b3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-12 12:48:13 -05:00
Patrick Scott
b3b7197cd4
am 92a9a3c5: Merge "Do not merge." into honeycomb
...
* commit '92a9a3c5ef9774863b4cee93d43b67582a02c2f0':
Do not merge.
2011-01-12 09:47:09 -08:00
Patrick Scott
92a9a3c5ef
Merge "Do not merge." into honeycomb
2011-01-12 09:44:59 -08:00
Patrick Scott
d1737edc13
Do not merge.
...
Cherry picked:
Add an api to toggle content url access.
By default, WebView allows access to content providers on the system. This
setting allows applications to turn off content urls.
Bug: 1196879
Change-Id: I49eaea6d7b9ccc3b3a4443d712222556087568c0
2011-01-12 12:42:51 -05:00
Glenn Kasten
5ac80dde04
am e5cf7f2b: Merge "Fix race in buffer ref counting." into honeycomb
...
* commit 'e5cf7f2bc51913d87bf97c8a1885f736edc5f0bc':
Fix race in buffer ref counting.
2011-01-12 09:36:00 -08:00
Glenn Kasten
e5cf7f2bc5
Merge "Fix race in buffer ref counting." into honeycomb
2011-01-12 09:34:37 -08:00
Glenn Kasten
4e26bc686b
Fix race in buffer ref counting.
...
Change-Id: Id47c30469c3e3ec293ed2ef574a191275b5044d6
2011-01-12 09:22:07 -08:00
Cary Clark
45c674304e
am 688b0af6: Merge "add null check to copy selection" into honeycomb
...
* commit '688b0af6a888a8a427d9a4c82fedf3e345e6ae34':
add null check to copy selection
2011-01-12 08:21:03 -08:00
Cary Clark
688b0af6a8
Merge "add null check to copy selection" into honeycomb
2011-01-12 08:19:24 -08:00
Chet Haase
efcceb856a
New interpolator resources now found in interpolator/ directory
...
Change-Id: Ib08200d71fce1706a0c683df104f0ff3d777ca17
2011-01-12 07:41:31 -08:00
Robert Greenwalt
1ea7e5df91
am a78e9f05: Merge "Fix any_connection reporting." into honeycomb
...
* commit 'a78e9f055834030ebe25480004f667f4bca35232':
Fix any_connection reporting.
2011-01-12 07:19:05 -08:00
Robert Greenwalt
a78e9f0558
Merge "Fix any_connection reporting." into honeycomb
2011-01-12 07:16:56 -08:00
Cary Clark
7170bb6391
add null check to copy selection
...
This prevents a toast from appearing
if copyselection is done initially.
bug:3339016
Change-Id: If6f91b8f3794b3807fb3319fc542838abd431c64
2011-01-12 10:12:15 -05:00
Kristian Monsen
3ede315d65
Add a static method to get the InputStream of a content URL
...
Part of fix for bug 2862096
Change-Id: I91f7e7aa1f0fef10b1617e91a167594d4de41b71
2011-01-12 11:53:28 +00:00
Kristian Monsen
80ff5d82bd
Adding a static method to get the size of a content url
...
Part of fixes for bug 2862096
Change-Id: I86f1255c17efb367fac54b69b8de220d2874fc70
2011-01-12 10:21:17 +00:00
satok
52b1826568
am 31d9d895: Merge "Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals"." into honeycomb
...
* commit '31d9d895d79977fa4e6dff2491b209fbeb21c61b':
Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals".
2011-01-12 01:20:24 -08:00
satok
31d9d895d7
Merge "Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals"." into honeycomb
2011-01-12 01:17:58 -08:00
Brad Fitzpatrick
43194ce05e
am 52d70722: am cb842753: Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore"
...
* commit '52d70722654548d156bd7a1cb8c1f05b94b09f06':
Closing cursor in finalizer to avoid GREF and fd leak in acore
2011-01-12 00:04:27 -08:00
Dianne Hackborn
5eefd98aa3
am a9d8a69a: am 9aac2e2b: Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
...
* commit 'a9d8a69a044c8e0c2d3268ed98bd17063faaeb1e':
Referencing of "r.record.name" is occured, when "r.record" is null.
2011-01-12 00:04:18 -08:00
Chris Tate
ba96a561e2
am 69f8d3c6: (-s ours) am bbff7ed4: DO NOT MERGE : Ensure that the first post-restore backup pass is correct
...
* commit '69f8d3c667669dc1858c21ee798c0f836f53235e':
DO NOT MERGE : Ensure that the first post-restore backup pass is correct
2011-01-12 00:04:12 -08:00