Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,361 Commits 3 Branches 0 Tags
4316da201ddbca5f5c1886b591eed6908e3b6583
Commit Graph

24383 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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&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
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
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
7eb7c3e4c5 am 90a01e6b: am ab455da3: Merge "handle NullPointerException in cases where a proxy call to AdapterService is called after Adapter Service is stopped." into jb-mr1-dev 
* commit '90a01e6bd204b1e156e545b577b9782e568b3bee':
  handle NullPointerException in cases where a proxy call to AdapterService is called after Adapter Service is stopped.
 2012-07-26 20:43:48 -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
Fabrice Di Meglio
5c795b54b8 Make CheckedTextView RTL aware 
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)

Change-Id: I1479dcf397876e7f4b610812c6c72f069598b3c9
 2012-07-26 16:50:26 -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
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
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