Jason Sams
3655e44d8b
Fix readback lengths
...
Change-Id: I4c5f29af03ed3babceef741aa3a982244cfc65d1
2012-07-27 14:33:50 -07:00
Craig Mautner
39df578acd
Fix build.
...
Change-Id: I52bbebae38912a4fb71c96174b3d4d8eb6be10c1
2012-07-27 14:30:59 -07:00
Jason Sams
f063fa0c30
Merge "Add fisheye filter to Image Processing benchmark" into jb-mr1-dev
2012-07-27 14:18:55 -07:00
Fabrice Di Meglio
bad7eed8aa
Merge "Add removeRule() to RelativeLayout LayoutParams" into jb-mr1-dev
2012-07-27 14:08:16 -07:00
Fabrice Di Meglio
5b5a6579cf
Merge "Make SearchView RTL aware" into jb-mr1-dev
2012-07-27 13:59:20 -07:00
Craig Mautner
706708d5aa
Merge "Small step towards supporting multiple displays" into jb-mr1-dev
2012-07-27 13:59:20 -07:00
Romain Guy
dfac68eacc
Merge "Corrected typo when checking InputStream methods"
2012-07-27 13:58:12 -07:00
Nick Kralevich
c92db39137
ClipData: html attribute values should always be escaped
...
Failure to properly escape HTML attribute values can lead to
XSS attacks. Technically, HTML of the form
<a href="http://www.google.com/search?x=a&y=b ">blah</a>
is malformed (but widely accepted). Such links should be written as
<a href="http://www.google.com/search?x=a&y=b ">blah</a>
See: http://www.w3.org/TR/1999/REC-html401-19991224/appendix/notes.html#h-B.2.2
Change-Id: I188ded00b4cac44acb38884d4728c4cf9500f3b6
2012-07-27 13:27:00 -07:00
Fabrice Di Meglio
a4c1030870
Add removeRule() to RelativeLayout LayoutParams
...
- add this helper API as there are already several example of
developers doing it "by hand"
Change-Id: Icd15edfd75eb47de1f90f847b263b4d513c13810
2012-07-27 13:16:42 -07:00
Fabrice Di Meglio
3a69bea302
Make SearchView RTL aware
...
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)
Change-Id: I7e7b51dccdd3b111e0594509334579b0502d24c8
2012-07-27 13:12:39 -07:00
Craig Mautner
6881a10557
Small step towards supporting multiple displays
...
Change-Id: I353449c2b464394988c7e0203656b5851a0c9127
2012-07-27 13:04:51 -07:00
Jean-Michel Trivi
1f9196a8e5
Relax rules for media apps to stay on RemoteControlDisplay
...
The playback of notification would make the display of the
RemoteControlClient disappear from the lockscreen.
Fixed by modifying which AudioFocus owner to consider when
reevaluating how the RemoteControlDisplay needs to be updated:
use the first (starting from the top of the AudioFocus stack) that
uses STREAM_MUSIC, or that uses any other stream type for a short
period.
Change-Id: Id7cef00c5eed1f6ebfa59634eea8e2c9b2f3f5eb
2012-07-27 11:34:02 -07:00
Rajeev Sharma
bb0dbf7373
Add vignette filter to Image Processing test
...
Add a vignette filter, mostly based on the GLSL version in
android.filterpacks.imageproc.VignetteFilter but with more input options.
Change-Id: I6f38a0ca09d35566104ec8e8523548399b8704a0
2012-07-27 11:03:52 -07:00
Rajeev Sharma
bb2c947636
Add fisheye filter to Image Processing benchmark
...
Add a fisheye filter, mostly based on the GLSL version in
android.filterpacks.imageproc.FisheyeFilter but with the configurable center
functionality from the JNI version in the original PhotoEditor.
Change-Id: I6be7d82bf2ad564919f9e675ac9a445fae6c440a
2012-07-27 11:01:36 -07:00
Stephen Hines
a80ea657f3
Merge "Add vignette filter to Image Processing test"
2012-07-27 10:20:27 -07:00
Stephen Hines
f0b4c89588
Merge "Add missed line in fisheye.rsh"
2012-07-27 09:34:57 -07:00
Daniel Sandler
dd4ef49f45
Persistent 'emergency calls' banner in the notification panel.
...
While carrier info (or SSID for devices without mobile data)
will still be shown in a floating text view at the bottom of
the notification shade, emergency-calls-only mode will now
be shown in the notification panel header so that it cannot
be obscured by notifications.
Change-Id: I714b6801be2b9b631b86b51d229440445eff5e76
2012-07-27 11:19:54 -04:00
Edward Savage-Jones
8ac41bb79e
Corrected typo when checking InputStream methods
...
Corrected a small typo where Java InputStream methods are
incorrectly checked when creating a JNI InputStream adaptor.
Change-Id: I5f14897e0d5ddceb4b2af6be46769713f0487624
2012-07-27 15:14:24 +02:00
Scott Main
036e32f85c
am 582c8cd3: am 527d14dc: am 587616a6: am cdd0c59a: docs: add links to new Settings dev guide
...
* commit '582c8cd3848cdf251f9ee636ac150d8817ed1f5b':
docs: add links to new Settings dev guide
2012-07-26 22:56:15 -07:00
Scott Main
582c8cd384
am 527d14dc: am 587616a6: am cdd0c59a: docs: add links to new Settings dev guide
...
* commit '527d14dc3c2fd72f1cdfaaa7e249456778fe93e4':
docs: add links to new Settings dev guide
2012-07-26 22:52:36 -07:00
Scott Main
527d14dc3c
am 587616a6: am cdd0c59a: docs: add links to new Settings dev guide
...
* commit '587616a670cfa4dc532e30643052b428cd376138':
docs: add links to new Settings dev guide
2012-07-26 22:34:55 -07:00
Rajeev Sharma
a2ed8f8050
Add vignette filter to Image Processing test
...
Add a vignette filter, mostly based on the GLSL version in
android.filterpacks.imageproc.VignetteFilter but with more input options.
Change-Id: I6f38a0ca09d35566104ec8e8523548399b8704a0
2012-07-26 21:46:10 -07:00
Matthew Xie
b3143870eb
am 315dbcca: am ada1f638: Merge "Reset priority on unbond" into jb-mr1-dev
...
* commit '315dbccac4f44a90c9b4787c6b1c36cef374b97a':
Reset priority on unbond
2012-07-26 21:22:20 -07:00
Matthew Xie
315dbccac4
am ada1f638: Merge "Reset priority on unbond" into jb-mr1-dev
...
* commit 'ada1f638b67f47f1cfc88a89c150c2383fefcfff':
Reset priority on unbond
2012-07-26 21:17:45 -07:00
Matthew Xie
ada1f638b6
Merge "Reset priority on unbond" into jb-mr1-dev
2012-07-26 21:15:24 -07:00
Matthew Xie
c27e138079
am fb442580: am 1103d005: Merge "Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled" into jb-mr1-dev
...
* commit 'fb442580d73b28ac59fc1640d9bcdebaac085a0a':
Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled
2012-07-26 20:58:45 -07:00
Matthew Xie
fb442580d7
am 1103d005: Merge "Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled" into jb-mr1-dev
...
* commit '1103d0056c18dda032772df57d9b141b730b7fa0':
Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled
2012-07-26 20:57:23 -07:00
Matthew Xie
1103d0056c
Merge "Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled" into jb-mr1-dev
2012-07-26 20:54:47 -07:00
Matthew Xie
7eb7c3e4c5
am 90a01e6b: am ab455da3: Merge "handle NullPointerException in cases where a proxy call to AdapterService is called after Adapter Service is stopped." into jb-mr1-dev
...
* commit '90a01e6bd204b1e156e545b577b9782e568b3bee':
handle NullPointerException in cases where a proxy call to AdapterService is called after Adapter Service is stopped.
2012-07-26 20:43:48 -07:00
Matthew Xie
90a01e6bd2
am ab455da3: Merge "handle NullPointerException in cases where a proxy call to AdapterService is called after Adapter Service is stopped." into jb-mr1-dev
...
* commit 'ab455da3640d462114d2fe58d9c7f816a6663852':
handle NullPointerException in cases where a proxy call to AdapterService is called after Adapter Service is stopped.
2012-07-26 20:41:08 -07:00
Matthew Xie
ab455da364
Merge "handle NullPointerException in cases where a proxy call to AdapterService is called after Adapter Service is stopped." into jb-mr1-dev
2012-07-26 20:38:40 -07:00
Rajeev Sharma
9dda365d8d
Add missed line in fisheye.rsh
...
Typo fix. Previously unnoticed as filter was only tested with default image.
Change-Id: I482036cdf78ef660845eca82fb62cf697f5a8eff
2012-07-26 20:35:44 -07:00
Ravi Nagarajan
82e57fe174
Reset priority on unbond
...
Change-Id: I8232c666bde26235ad527c96e5218fc1b3e7a1db
2012-07-26 19:20:32 -07:00
Swaminatha Balaji
c61eb2617d
Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled
...
Change-Id: I82d05eacb6c7fae6eb1ebf246d2fce7314ff0a75
2012-07-26 19:19:51 -07:00
Syed Ibrahim M
305f240dc1
handle NullPointerException in cases where a proxy
...
call to AdapterService is called after Adapter
Service is stopped.
Change-Id: I009787f03f9a013b9b06fcb7e3f6241c850f8cd2
2012-07-26 18:11:23 -07:00
Stephen Hines
21e8f7ae0c
Merge "Add fisheye filter to Image Processing benchmark"
2012-07-26 18:02:52 -07:00
Rajeev Sharma
a8477e39a9
Add fisheye filter to Image Processing benchmark
...
Add a fisheye filter, mostly based on the GLSL version in
android.filterpacks.imageproc.FisheyeFilter but with the configurable center
functionality from the JNI version in the original PhotoEditor.
Change-Id: I091cba747299809095f6586e16a9221cdc2b2e7d
2012-07-26 17:58:08 -07:00
The Android Automerger
84f7354e1a
merge in jb-mr0-release history after reset to jb-dev
2012-07-26 17:49:40 -07:00
Scott Main
587616a670
am cdd0c59a: docs: add links to new Settings dev guide
...
* commit 'cdd0c59a0108036895796dcb2bea69ff5eef26ca':
docs: add links to new Settings dev guide
2012-07-26 17:41:01 -07:00
Scott Main
cdd0c59a01
docs: add links to new Settings dev guide
...
Change-Id: I04444ec0c4c1c278569b64f15cbbc7e8c1c623cd
2012-07-26 17:03:51 -07:00
Fabrice Di Meglio
04cef6ff8b
am b113ca42: (-s ours) am 0590c1b6: Merge "Make CheckedTextView RTL aware - DO NOT MERGE" into jb-mr1-dev
...
* commit 'b113ca42a0104293c486ec194760cf1066bbdd98':
Make CheckedTextView RTL aware - DO NOT MERGE
2012-07-26 17:03:04 -07:00
Jason Sams
5a2ec48e5a
Merge "Fix readback lengths"
2012-07-26 16:58:47 -07:00
Fabrice Di Meglio
b113ca42a0
am 0590c1b6: Merge "Make CheckedTextView RTL aware - DO NOT MERGE" into jb-mr1-dev
...
* commit '0590c1b64f8d73da3ccb582d5a865d4918b40733':
Make CheckedTextView RTL aware - DO NOT MERGE
2012-07-26 16:58:10 -07:00
Jason Sams
eadb60fc4f
Fix readback lengths
...
Change-Id: I4c5f29af03ed3babceef741aa3a982244cfc65d1
2012-07-26 16:56:01 -07:00
Fabrice Di Meglio
0590c1b64f
Merge "Make CheckedTextView RTL aware - DO NOT MERGE" into jb-mr1-dev
2012-07-26 16:55:59 -07:00
Fabrice Di Meglio
e2386c184a
Make CheckedTextView RTL aware - DO NOT MERGE
...
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)
Change-Id: Ic647e105571e01e9773e4c27e9f52997d24c408e
2012-07-26 16:54:06 -07:00
Fabrice Di Meglio
7b3982d11e
Merge "Make CheckedTextView RTL aware"
2012-07-26 16:52:56 -07:00
Katie McCormick
836af35ab3
Merge "Doc update: Misc minor GCM updates."
2012-07-26 16:50:58 -07:00
Fabrice Di Meglio
5c795b54b8
Make CheckedTextView RTL aware
...
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)
Change-Id: I1479dcf397876e7f4b610812c6c72f069598b3c9
2012-07-26 16:50:26 -07:00
Katie McCormick
d27c70ab34
Doc update: Misc minor GCM updates.
...
Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
2012-07-26 16:30:23 -07:00