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
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
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
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
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
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
Amith Yamasani
61408a7ed2
Merge "Use correct layout style for Theme.Holo.Light." into jb-dev
2012-07-26 11:46:54 -07:00
Adam Cohen
c58392bc29
am a2c99407: am edc14f48: am df5919fd: Merge "Fixing cache pruning to avoid pruning those in the visible range" into jb-dev
...
* commit 'a2c99407db6ef00dfc6905f7e7701d083f819608':
Fixing cache pruning to avoid pruning those in the visible range
2012-07-25 23:05:43 -07:00
Scott Main
61fa1fa865
am 70b43e4f: am f1d4dc38: am db242310: Merge "docs: add Settings dev guide; a few changes to javadocs" into jb-dev
...
* commit '70b43e4fefbd3aa2e9fda9b10cc01e831d6ce94e':
docs: add Settings dev guide; a few changes to javadocs
2012-07-25 23:05:40 -07:00
Adam Cohen
a2c99407db
am edc14f48: am df5919fd: Merge "Fixing cache pruning to avoid pruning those in the visible range" into jb-dev
...
* commit 'edc14f48166757a1ab656d2016f5bc7ed7ab126c':
Fixing cache pruning to avoid pruning those in the visible range
2012-07-25 22:23:58 -07:00
Scott Main
70b43e4fef
am f1d4dc38: am db242310: Merge "docs: add Settings dev guide; a few changes to javadocs" into jb-dev
...
* commit 'f1d4dc3844510eb02cffd49c81ce2ec297758a6f':
docs: add Settings dev guide; a few changes to javadocs
2012-07-25 22:23:54 -07:00
Jeff Smith
440f32bbd4
am ddd88726: am 71930dd7: am a45746ef: Fix several cases of broken droiddoc syntax external issue 35214
...
* commit 'ddd88726a247e4100cb62b3dc9d0887ca2ae2ec4':
Fix several cases of broken droiddoc syntax external issue 35214
2012-07-25 22:13:40 -07:00
Scott Main
75b0524148
am 75bea2e8: am 7c00f816: am 2f5b61a7: Merge "docs: fix a bunch of links from javadocs to api guides and add some attributes to Spinner and Switch" into jb-dev
...
* commit '75bea2e8d35044233ba892bedf102ed08406d653':
docs: fix a bunch of links from javadocs to api guides and add some attributes to Spinner and Switch
2012-07-25 22:13:36 -07:00
John Huang
543b2084b8
am 23ecb2cc: am 4c259f3d: am 3e6a9f01: Merge "Fix tethering APNs" into jb-dev
...
* commit '23ecb2cc0bf4c36c72f4b890e9effce5094a2984':
Fix tethering APNs
2012-07-25 22:13:32 -07:00
Adam Cohen
2f97de5e17
am 94169a97: am 956aefb3: am 26ed04ba: Merge "Caching the FixedSizeRemoteViewsCaches across rotation" into jb-dev
...
* commit '94169a97fd8e553d8e46b6191d52b2b2f8f368e2':
Caching the FixedSizeRemoteViewsCaches across rotation
2012-07-25 22:13:28 -07:00
Adam Cohen
edc14f4816
am df5919fd: Merge "Fixing cache pruning to avoid pruning those in the visible range" into jb-dev
...
* commit 'df5919fd6f70471bba05ef9ea2f766627c0138d9':
Fixing cache pruning to avoid pruning those in the visible range
2012-07-25 21:49:56 -07:00
Scott Main
f1d4dc3844
am db242310: Merge "docs: add Settings dev guide; a few changes to javadocs" into jb-dev
...
* commit 'db24231057bdf8b11a10c772084cfc0e4294ec04':
docs: add Settings dev guide; a few changes to javadocs
2012-07-25 21:49:46 -07:00
Amith Yamasani
bfd070cfe1
Use correct layout style for Theme.Holo.Light.
...
Layout inherited from Theme.Light is incorrect.
Needed for fixes related to:
Bug: 6882764
Change-Id: I1c8217f8d9fcf7ece8fa5513766e7536a7c7e13d
2012-07-25 21:09:07 -07:00
Jeff Brown
aa871b0ff0
Fix build.
...
Change-Id: Ife2fd58447205407e41ce3d27e28a705b744bede
2012-07-25 20:06:22 -07:00
Jeff Brown
fa25bf5382
Add display manager skeleton.
...
The purpose of this change is to remove direct reliance on
SurfaceFlinger for describing the size and characteristics of
displays.
This patch also starts to make a distinction between logical displays
and physical display devices. Currently, the window manager owns
the concept of a logical display whereas the new display
manager owns the concept of a physical display device.
Change-Id: I7e0761f83f033be6c06fd1041280c21500bcabc0
2012-07-25 18:56:16 -07:00
Fabrice Di Meglio
bbcb123d49
Merge "Make TextView Marquee RTL-aware"
2012-07-25 18:37:25 -07:00
Fabrice Di Meglio
7d6f6c938c
Make TextView Marquee RTL-aware
...
- fix bug #6870530
Change-Id: Icd8aae19136cfd49ee475d26749978463e7f7f77
2012-07-25 18:05:24 -07:00
Adam Cohen
df5919fd6f
Merge "Fixing cache pruning to avoid pruning those in the visible range" into jb-dev
2012-07-25 16:20:58 -07:00
Jeff Brown
ffed02b95a
Merge "Stop using raw display size except in window manager."
2012-07-25 16:14:38 -07:00
Scott Main
db24231057
Merge "docs: add Settings dev guide; a few changes to javadocs" into jb-dev
2012-07-25 15:51:29 -07:00
Adam Cohen
591ff978e5
Fixing cache pruning to avoid pruning those in the visible range
...
-> Improves flashing on rotation of stack widgets, or other widgets
who's items use a lot of memory
Change-Id: I762b555ac1827861ed63ac5929972395f3080a0a
2012-07-25 15:20:37 -07:00
Jeff Smith
ddd88726a2
am 71930dd7: am a45746ef: Fix several cases of broken droiddoc syntax external issue 35214
...
* commit '71930dd77e4dc6f6be5c648019d2ab0da5f0584c':
Fix several cases of broken droiddoc syntax external issue 35214
2012-07-25 15:05:23 -07:00
Scott Main
75bea2e8d3
am 7c00f816: am 2f5b61a7: Merge "docs: fix a bunch of links from javadocs to api guides and add some attributes to Spinner and Switch" into jb-dev
...
* commit '7c00f81606de1880c3f28e54cea064c3b90da3e7':
docs: fix a bunch of links from javadocs to api guides and add some attributes to Spinner and Switch
2012-07-25 15:05:18 -07:00
John Huang
23ecb2cc0b
am 4c259f3d: am 3e6a9f01: Merge "Fix tethering APNs" into jb-dev
...
* commit '4c259f3d7bfc635de89386bb72df8529dcaeee6a':
Fix tethering APNs
2012-07-25 15:05:13 -07:00
Adam Cohen
94169a97fd
am 956aefb3: am 26ed04ba: Merge "Caching the FixedSizeRemoteViewsCaches across rotation" into jb-dev
...
* commit '956aefb3c54c5b5a33b7faca8ce5246981995f88':
Caching the FixedSizeRemoteViewsCaches across rotation
2012-07-25 15:05:09 -07:00
Ying Wang
f40d5cf3d1
Merge "Import translations. DO NOT MERGE"
2012-07-25 13:53:28 -07:00
Scott Main
bbb3f41e26
docs: add Settings dev guide;
...
a few changes to javadocs
Change-Id: I2d671aafe91e4c6e224e2a556a60dce9f93f11ae
2012-07-25 13:52:46 -07:00
Ying Wang
02f5c403ec
Import translations. DO NOT MERGE
...
Change-Id: I77ba36c634b0f17682c88f7b7d255950fc2906be
Auto-generated-cl: translation import
2012-07-25 12:33:36 -07:00
Irfan Sheriff
cba4d38820
Merge "Update WifiManager API"
2012-07-25 12:25:13 -07:00
Jeff Brown
a8b9defade
Stop using raw display size except in window manager.
...
We don't actually need the raw size in these places.
The logical size is good enough.
Starting to move dependencies on surface flinger
and window manager out of the Display class.
Change-Id: I2065bee8e5bf7f42c5a452dd1e8479e40ebb0d37
2012-07-25 11:38:48 -07:00
Jeff Smith
71930dd77e
am a45746ef: Fix several cases of broken droiddoc syntax external issue 35214
...
* commit 'a45746efadd11bb7dfab026fb3c81a25fae74ca4':
Fix several cases of broken droiddoc syntax external issue 35214
2012-07-25 10:56:03 -07:00