Dirk Dougherty
f852a1d3f5
am 9ddc6ed3: am 36e055bd: Doc change: fix typo.
...
* commit '9ddc6ed30f2fa23d6946fca2ef0ddb17f23845b5':
Doc change: fix typo.
2012-07-27 17:42:12 -07:00
Dirk Dougherty
9ddc6ed30f
am 36e055bd: Doc change: fix typo.
...
* commit '36e055bd2e55d9b8f13d0d0d37259fa0ce5507d1':
Doc change: fix typo.
2012-07-27 17:39:42 -07:00
Dirk Dougherty
36e055bd2e
Doc change: fix typo.
...
Change-Id: Icd0d01a3047e86544dcea9188499e1433778184a
2012-07-27 17:36:07 -07:00
Romain Guy
c3e4f0a72b
Merge "Rename drawGeneralText to drawText" into jb-mr1-dev
2012-07-27 16:42:52 -07:00
Romain Guy
c25259519f
Rename drawGeneralText to drawText
...
Change-Id: I5062ea5b0605fc7af27f410fafc930d10f38e926
2012-07-27 16:41:22 -07:00
Jeff Sharkey
ab88f9864e
Merge "Split NST handler events away from CS internals." into jb-mr1-dev
2012-07-27 16:04:56 -07:00
Romain Guy
a0aa479c0e
am 97e27072: am dfac68ea: Merge "Corrected typo when checking InputStream methods"
...
* commit '97e270721bf29d25b513c1f2be71a8543d048f5d':
Corrected typo when checking InputStream methods
2012-07-27 15:54:30 -07:00
Daniel Sandler
fbf3089665
am 5cb62df6: am dd4ef49f: Persistent \'emergency calls\' banner in the notification panel.
...
* commit '5cb62df6bdac4aaab7a1c1b1ef849ec213ff028b':
Persistent 'emergency calls' banner in the notification panel.
2012-07-27 15:51:31 -07:00
Jason Sams
e9f5f8e020
Merge "Fix readback lengths" into jb-mr1-dev
2012-07-27 15:51:01 -07:00
Romain Guy
97e270721b
am dfac68ea: Merge "Corrected typo when checking InputStream methods"
...
* commit 'dfac68eacc60c130e54345d98bd45c99573cb627':
Corrected typo when checking InputStream methods
2012-07-27 15:49:23 -07:00
Daniel Sandler
5cb62df6bd
am dd4ef49f: Persistent \'emergency calls\' banner in the notification panel.
...
* commit 'dd4ef49f4545dad2a6503d29e129472aba5392fc':
Persistent 'emergency calls' banner in the notification panel.
2012-07-27 15:46:20 -07:00
Stephen Hines
5590027b9b
Merge "Add vignette filter to Image Processing test" into jb-mr1-dev
2012-07-27 15:21:08 -07:00
Fabrice Di Meglio
d395ea124b
Merge "Fix the build" into jb-mr1-dev
2012-07-27 14:48:10 -07:00
Nick Kralevich
89630ec877
Merge "ClipData: html attribute values should always be escaped" into jb-mr1-dev
2012-07-27 14:46:19 -07:00
Fabrice Di Meglio
f2c278551c
Fix the build
...
- update current.txt
Change-Id: I98d6cfbe71564dcded8d8d757dd183ba678d4184
2012-07-27 14:45:44 -07:00
Jean-Michel Trivi
72787c1b7a
Merge "Relax rules for media apps to stay on RemoteControlDisplay" into jb-mr1-dev
2012-07-27 14:43:41 -07:00
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
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
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
Matthew Xie
ada1f638b6
Merge "Reset priority on unbond" into jb-mr1-dev
2012-07-26 21:15:24 -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
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
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
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
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
Scott Main
b37165782b
am f64e9a8f: am 03345389: Merge "Delete everything from the shareables/ directory to save space on dac. All of the training ZIPs are now located in development/samples/training/zips/ Added a readme file to explain this change toward using cloud storage instead." into
...
* commit 'f64e9a8fe9e6a75bd217705cd15a72b2dedf00cf':
Delete everything from the shareables/ directory to save space on dac. All of the training ZIPs are now located in development/samples/training/zips/ Added a readme file to explain this change toward using cloud storage instead.
2012-07-26 15:45:24 -07:00
Scott Main
f64e9a8fe9
am 03345389: Merge "Delete everything from the shareables/ directory to save space on dac. All of the training ZIPs are now located in development/samples/training/zips/ Added a readme file to explain this change toward using cloud storage instead." into jb-dev
...
* commit '0334538983ee7031bf06c4961ce6185e099ef655':
Delete everything from the shareables/ directory to save space on dac. All of the training ZIPs are now located in development/samples/training/zips/ Added a readme file to explain this change toward using cloud storage instead.
2012-07-26 15:43:06 -07:00
Scott Main
0334538983
Merge "Delete everything from the shareables/ directory to save space on dac. All of the training ZIPs are now located in development/samples/training/zips/ Added a readme file to explain this change toward using cloud storage instead." into jb-dev
2012-07-26 15:40:24 -07:00
Jean-Baptiste Queru
33806e25b1
Remove unnecessary stagefright notices
...
They now live in frameworks/media
Change-Id: Ic8b457c422359f260d6a1fed8c499b74aa9c6491
2012-07-26 14:10:16 -07:00
Jeff Sharkey
4c628eba48
Split NST handler events away from CS internals.
...
Instead of sharing event space, use a different handler backed by
the same looper.
Change-Id: I11f1e4701c341665770ca640f3cba0c295bb7561
2012-07-26 14:09:09 -07:00
Amith Yamasani
2b8c4b076d
am 6232812a: am 61408a7e: Merge "Use correct layout style for Theme.Holo.Light." into jb-dev
...
* commit '6232812a8a398b7d1849e1959679010897ef82d2':
Use correct layout style for Theme.Holo.Light.
2012-07-26 11:51:06 -07:00
Amith Yamasani
6232812a8a
am 61408a7e: Merge "Use correct layout style for Theme.Holo.Light." into jb-dev
...
* commit '61408a7ed230b636263e6c410f62b1932a486ef9':
Use correct layout style for Theme.Holo.Light.
2012-07-26 11:49:12 -07:00