drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,382 Commits 1 Branch 0 Tags
Commit Graph

82382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
a8a90adf1a am 069c9024: am 72787c1b: Merge "Relax rules for media apps to stay on RemoteControlDisplay" into jb-mr1-dev 
* commit '069c90245b10297c216dca9ea71a3152013eb491':
  Relax rules for media apps to stay on RemoteControlDisplay
 2012-07-27 16:23:10 -07:00
Craig Mautner
72a00185f1 am 7c9629fd: am 39df578a: Fix build. 
* commit '7c9629fdee5e656f8fa6b6f5506805e42682c0aa':
  Fix build.
 2012-07-27 16:23:06 -07:00
Jeff Sharkey
fbfbaf1980 am ab88f986: Merge "Split NST handler events away from CS internals." into jb-mr1-dev 
* commit 'ab88f9864e67aca97df8dcca8e99c17854a54510':
  Split NST handler events away from CS internals.
 2012-07-27 16:08: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
Adam Cohen
4a9df8dda5 No longer parceling FixedSizeRemoteViewsCaches 
-> Related to issue 6854767

Change-Id: Ib9a9ef827a739ef9efbe6f11dcc4765004fa0c51
 2012-07-27 16:04:40 -07:00
Romain Guy
4bbf3db965 am a0aa479c: am 97e27072: am dfac68ea: Merge "Corrected typo when checking InputStream methods" 
* commit 'a0aa479c0eadd446dc9159195c175e3a5fe083c0':
  Corrected typo when checking InputStream methods
 2012-07-27 15:59:16 -07:00
Daniel Sandler
b4e619c4c1 am fbf30896: am 5cb62df6: am dd4ef49f: Persistent \'emergency calls\' banner in the notification panel. 
* commit 'fbf30896653b7a3eb09ea110b1ef4c21c1059977':
  Persistent 'emergency calls' banner in the notification panel.
 2012-07-27 15:56:07 -07:00
Jason Sams
d2d6fbd0be am e9f5f8e0: Merge "Fix readback lengths" into jb-mr1-dev 
* commit 'e9f5f8e020b9809312c7f6b06339dacb57f94507':
  Fix readback lengths
 2012-07-27 15:55:30 -07:00
Jason Sams
2a32dd41d1 resolved conflicts for merge of 2bed8d02 to master 
Change-Id: I27d2322a6e00aaf5165597d024e5b3289cd4ba49
 2012-07-27 15:54:37 -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
Fabrice Di Meglio
4ebc23322b am b607d2c4: am bad7eed8: Merge "Add removeRule() to RelativeLayout LayoutParams" into jb-mr1-dev 
* commit 'b607d2c4ed0677f52e563c75ef61fb32fe9ff3d8':
  Add removeRule() to RelativeLayout LayoutParams
 2012-07-27 15:51:10 -07:00
Fabrice Di Meglio
1c3000f5ee am e0eb91e8: am 5b5a6579: Merge "Make SearchView RTL aware" into jb-mr1-dev 
* commit 'e0eb91e8ad7954f1ca3a85c3bbe11a2844564827':
  Make SearchView RTL aware
 2012-07-27 15:51:03 -07:00
Jason Sams
e9f5f8e020 Merge "Fix readback lengths" into jb-mr1-dev 2012-07-27 15:51:01 -07:00
Craig Mautner
043aa5990f am cf6c5758: am 706708d5: Merge "Small step towards supporting multiple displays" into jb-mr1-dev 
* commit 'cf6c57583d60dbcc8512d60cf1a22f297e6b5a04':
  Small step towards supporting multiple displays
 2012-07-27 15:50:56 -07:00
John Reck
4b1f839d23 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2012-07-27 15:50:55 -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
Stephen Hines
4dc1303be1 am 5590027b: Merge "Add vignette filter to Image Processing test" into jb-mr1-dev 
* commit '5590027b9b44eb4cabe415720278b85c30d720a8':
  Add vignette filter to Image Processing test
 2012-07-27 15:46:46 -07:00
Fabrice Di Meglio
16c860e4ff am d395ea12: Merge "Fix the build" into jb-mr1-dev 
* commit 'd395ea124be07cab29eb7ee72526dbe79daa634d':
  Fix the build
 2012-07-27 15:46:39 -07:00
Nick Kralevich
588fc0dc5a am 89630ec8: Merge "ClipData: html attribute values should always be escaped" into jb-mr1-dev 
* commit '89630ec8777804b728c50caeb1ae6fcf810e435f':
  ClipData: html attribute values should always be escaped
 2012-07-27 15:46:35 -07:00
Jean-Michel Trivi
069c90245b am 72787c1b: Merge "Relax rules for media apps to stay on RemoteControlDisplay" into jb-mr1-dev 
* commit '72787c1b7a48b3a00c33503ccaa40f1bad9da89f':
  Relax rules for media apps to stay on RemoteControlDisplay
 2012-07-27 15:46:31 -07:00
Craig Mautner
7c9629fdee am 39df578a: Fix build. 
* commit '39df578acddb739d7608e458533904bf5814c0da':
  Fix build.
 2012-07-27 15:46:27 -07:00
Jason Sams
2bed8d02bf am f063fa0c: Merge "Add fisheye filter to Image Processing benchmark" into jb-mr1-dev 
* commit 'f063fa0c30be849d0e067fb40d6f388b7c0d8340':
  Add fisheye filter to Image Processing benchmark
 2012-07-27 15:46: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
Fabrice Di Meglio
b607d2c4ed am bad7eed8: Merge "Add removeRule() to RelativeLayout LayoutParams" into jb-mr1-dev 
* commit 'bad7eed8aa27fa1c0b417b805b47881a1ec532d7':
  Add removeRule() to RelativeLayout LayoutParams
 2012-07-27 15:46:20 -07:00
Fabrice Di Meglio
e0eb91e8ad am 5b5a6579: Merge "Make SearchView RTL aware" into jb-mr1-dev 
* commit '5b5a6579cf384643686f6bd476003fb4b106963a':
  Make SearchView RTL aware
 2012-07-27 15:46:16 -07:00
Craig Mautner
cf6c57583d am 706708d5: Merge "Small step towards supporting multiple displays" into jb-mr1-dev 
* commit '706708d5aad8659ee272824866afefe93a909cf4':
  Small step towards supporting multiple displays
 2012-07-27 15:46:12 -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&amp;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