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

82576 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
James Dong
a0ba79473b Enabled application using VideoView to get information events from MediaPlayer 
o related-to-bug: 6851811

Change-Id: I78a73a33b6ddfaea76f2ba13b6990c153fb696c6
 2012-07-27 18:05:11 -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
Adam Cohen
a5ad76657d am 6089a88c: am 86371474: am 47db02ba: Merge "No longer parceling FixedSizeRemoteViewsCaches" into jb-dev 
* commit '6089a88ca54cd18c7f598185389dd2fd1b36114c':
  No longer parceling FixedSizeRemoteViewsCaches
 2012-07-27 17:47:30 -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
Dirk Dougherty
a662f83841 am 7be72f64: am f852a1d3: am 9ddc6ed3: am 36e055bd: Doc change: fix typo. 
* commit '7be72f646fd6d8a57d97268dd1b9c9ffe725cdae':
  Doc change: fix typo.
 2012-07-27 17:45: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
Dirk Dougherty
7be72f646f am f852a1d3: am 9ddc6ed3: am 36e055bd: Doc change: fix typo. 
* commit 'f852a1d3f55e25380b9d6e41e727e8b04f317840':
  Doc change: fix typo.
 2012-07-27 17:43:39 -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
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
ccb0ef8361 am c3e4f0a7: Merge "Rename drawGeneralText to drawText" into jb-mr1-dev 
* commit 'c3e4f0a72baff805b434fd6b24cb29b3dc68e98d':
  Rename drawGeneralText to drawText
 2012-07-27 16:44:39 -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
Daniel Sandler
b4036e4c3c am b4e619c4: am fbf30896: am 5cb62df6: am dd4ef49f: Persistent \'emergency calls\' banner in the notification panel. 
* commit 'b4e619c4c15c135a8f480e981374eb4112e6eef6':
  Persistent 'emergency calls' banner in the notification panel.
 2012-07-27 16:24:26 -07:00
Jason Sams
c5218460d8 am d2d6fbd0: am e9f5f8e0: Merge "Fix readback lengths" into jb-mr1-dev 
* commit 'd2d6fbd0be030ccc9319fc5c587076797bfb47dc':
  Fix readback lengths
 2012-07-27 16:24:23 -07:00
Stephen Hines
c82a05ba7d am 4dc1303b: am 5590027b: Merge "Add vignette filter to Image Processing test" into jb-mr1-dev 
* commit '4dc1303be18442a3b9cb5b066ab60c97a56abda9':
  Add vignette filter to Image Processing test
 2012-07-27 16:23:33 -07:00
Fabrice Di Meglio
9c073fc875 am 16c860e4: am d395ea12: Merge "Fix the build" into jb-mr1-dev 
* commit '16c860e4ffa5e72ba2513f02102cc427d3adff18':
  Fix the build
 2012-07-27 16:23:17 -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
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