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

82248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
2d6cc0968e Import translations. DO NOT MERGE 
Change-Id: Ic5a1446767d3a1e29bd62eeb080215a73a0728c0
Auto-generated-cl: translation import
 2012-07-30 12:15:36 -07:00
Jeff Brown
fa14d824d2 Merge "Move and rename user activity event type constants." into jb-mr1-dev 2012-07-27 18:23:22 -07:00
Jeff Brown
af3fb2325e Merge "Flatten power manager wake lock constants." into jb-mr1-dev 2012-07-27 18:21:19 -07:00
Jeff Brown
e288e180bb Merge "Implement equals() and hashCode() like a good little object." into jb-mr1-dev 2012-07-27 18:18:51 -07:00
Jeff Brown
722565a67d Merge "Fix inconsistency in user activity types." into jb-mr1-dev 2012-07-27 18:17:28 -07:00
Jeff Brown
b696de5c10 Move and rename user activity event type constants. 
Change-Id: Ie565808796773b6896e71ddfac6aaaf8031de846
 2012-07-27 18:14:56 -07:00
Jeff Brown
155fc70252 Flatten power manager wake lock constants. 
We only support a few basic kinds of wake locks.  Rather than
pretend that we could support other weird combinations of features,
just get rid of the feature bits.

Deprecated other wake lock types.  We really want to encourage
developers to use FLAG_KEEP_SCREEN_ON instead of managing
their own wake locks, even though its behavior is not
exactly equivalent.

Change-Id: Idfeb0bc6efff0ef2736e47f72a06e69e5a16996e
 2012-07-27 18:14:54 -07:00
Jeff Brown
94838913ab Implement equals() and hashCode() like a good little object. 
Change-Id: I06fc8f96586c72095ffa142d52fbd71af05cee97
 2012-07-27 18:14:53 -07:00
Jeff Brown
df693de4fe Fix inconsistency in user activity types. 
Looks like BatteryStats was not updated when we reduced the number
of user activity types from 7 to 3.

Change-Id: I7465f86c78baa561a6555c33f681553b870827f2
 2012-07-27 18:14:52 -07:00
Adam Cohen
6089a88ca5 am 86371474: am 47db02ba: Merge "No longer parceling FixedSizeRemoteViewsCaches" into jb-dev 
* commit '86371474de700494d9b7b324c8650858d9b18b50':
  No longer parceling FixedSizeRemoteViewsCaches
 2012-07-27 17:45:00 -07:00
Adam Cohen
86371474de am 47db02ba: Merge "No longer parceling FixedSizeRemoteViewsCaches" into jb-dev 
* commit '47db02bad8fed67025669c41ef0c0dd9cafe7ed2':
  No longer parceling FixedSizeRemoteViewsCaches
 2012-07-27 17:42:30 -07:00
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
Adam Cohen
47db02bad8 Merge "No longer parceling FixedSizeRemoteViewsCaches" into jb-dev 2012-07-27 17:40:34 -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
Adam Cohen
4a9df8dda5 No longer parceling FixedSizeRemoteViewsCaches 
-> Related to issue 6854767

Change-Id: Ib9a9ef827a739ef9efbe6f11dcc4765004fa0c51
 2012-07-27 16:04:40 -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&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
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