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

33390 Commits

Author SHA1 Message Date
Fabrice Di Meglio
cb57869cc3 am e2a7c66d: am 619e4dca: Merge "Improve ListPopupWindow RTL support" into jb-mr1-dev 
* commit 'e2a7c66da05411336a8584f177794487ac8cc4c3':
  Improve ListPopupWindow RTL support
 2012-07-30 13:11:58 -07:00
Fabrice Di Meglio
619e4dca8e Merge "Improve ListPopupWindow RTL support" into jb-mr1-dev 2012-07-30 11:29:20 -07:00
Fabrice Di Meglio
1d3d7da331 Improve ListPopupWindow RTL support 
- add Javadoc for new method setLayoutDirection()
- fix one issue where the layout direction would not be set
when the popup was recreated

Change-Id: Ic53a8b0d01dc86e03e9bf5f09195af77404dca39
 2012-07-30 11:27:31 -07:00
Elliott Hughes
776708222a Merge "Fix Time.parse and Time.parse3339 crashing bugs." 2012-07-30 08:03:02 -07:00
Mikhail Naganov
ce76ca51d8 Add 'getValue' methods to WebSettings.TextSize and ZoomDensity enums. 
As the 'value' fields in these enums are not public, it isn't possible to
retrieve the enum value if the WebViewProvider implementation is defined in a
different package to the API. Adding public hidden methods to fix this.

Change-Id: Ia5fb1332d0043e127b4bad03a295d8abf1a5e5b9
 2012-07-30 14:20:01 +01:00
Jeff Brown
893717968f am d3d62f2d: am fa14d824: Merge "Move and rename user activity event type constants." into jb-mr1-dev 
* commit 'd3d62f2d06652cd311363809b6bb25bf9776d1d3':
  Move and rename user activity event type constants.
 2012-07-27 18:28:10 -07:00
Jeff Brown
66fead4227 am 006ba8a2: am af3fb232: Merge "Flatten power manager wake lock constants." into jb-mr1-dev 
* commit '006ba8a226236af2189e62a221ae932344b79210':
  Flatten power manager wake lock constants.
 2012-07-27 18:26:27 -07:00
Jeff Brown
4316da201d am ba8d9167: am e288e180: Merge "Implement equals() and hashCode() like a good little object." into jb-mr1-dev 
* commit 'ba8d91670ce4d3ae3dd52cf51202e40ca603b63d':
  Implement equals() and hashCode() like a good little object.
 2012-07-27 18:23:27 -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
1fd1d493c9 am 397aca12: am 722565a6: Merge "Fix inconsistency in user activity types." into jb-mr1-dev 
* commit '397aca12c9d5ffaddab0fc70a05b8cb443f04a75':
  Fix inconsistency in user activity types.
 2012-07-27 18:21:37 -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
Jeff Sharkey
0cdb1e7376 Merge "API to adjust network stats." 2012-07-27 17:52:25 -07:00
Adam Cohen
d27fe479fd am a5ad7665: am 6089a88c: am 86371474: am 47db02ba: Merge "No longer parceling FixedSizeRemoteViewsCaches" into jb-dev 
* commit 'a5ad76657da1d3616e3f4c6d341bd07a6bbf8025':
  No longer parceling FixedSizeRemoteViewsCaches
 2012-07-27 17:48:55 -07:00
Jeff Sharkey
4f0659c0bb API to adjust network stats. 
Enables system apps to correctly account network usage performed on
behalf of another application.

Bug: 6695246
Change-Id: I39e243afd57936b6b30157a6ca511a17b6c55c39
 2012-07-27 17:47:21 -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
Romain Guy
7711c5e38f am ccb0ef83: am c3e4f0a7: Merge "Rename drawGeneralText to drawText" into jb-mr1-dev 
* commit 'ccb0ef8361edbe1660c5441ecbc22c592c7cb44e':
  Rename drawGeneralText to drawText
 2012-07-27 16:47:01 -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
f024c92e5a am fbfbaf19: am ab88f986: Merge "Split NST handler events away from CS internals." into jb-mr1-dev 
* commit 'fbfbaf198006bfaa7347f3a3ea76e51cb30079ba':
  Split NST handler events away from CS internals.
 2012-07-27 16:25:08 -07:00
Romain Guy
b424672310 am 4bbf3db9: am a0aa479c: am 97e27072: am dfac68ea: Merge "Corrected typo when checking InputStream methods" 
* commit '4bbf3db965908ccb0a228075dcbc937a1a1f8bd0':
  Corrected typo when checking InputStream methods
 2012-07-27 16:24:58 -07:00
Nick Kralevich
1a9b845da7 am 588fc0dc: am 89630ec8: Merge "ClipData: html attribute values should always be escaped" into jb-mr1-dev 
* commit '588fc0dc5a274d3e16bc58ff12d359a5bd44b853':
  ClipData: html attribute values should always be escaped
 2012-07-27 16:23:13 -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
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
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
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
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
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
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
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
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
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