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
Adam Powell
35466be15c am c2ced7be: am e72a6e97: am fc92eb94: am 2ffb1acb: Merge " Fix preload classname for phone policy." 
* commit 'c2ced7bef651397cb5aad80160c81eac517d6692':
  Fix preload classname for phone policy.
 2012-07-30 13:18:28 -07:00
Adam Powell
c2ced7bef6 am e72a6e97: am fc92eb94: am 2ffb1acb: Merge " Fix preload classname for phone policy." 
* commit 'e72a6e977b8436a993c427cf489f2ae05fdeface':
  Fix preload classname for phone policy.
 2012-07-30 13:16:03 -07:00
Adam Powell
e72a6e977b am fc92eb94: am 2ffb1acb: Merge " Fix preload classname for phone policy." 
* commit 'fc92eb94c413ebae1016d10460ee62e92f0c1a64':
  Fix preload classname for phone policy.
 2012-07-30 13:13:22 -07:00
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
e2a7c66da0 am 619e4dca: Merge "Improve ListPopupWindow RTL support" into jb-mr1-dev 
* commit '619e4dca8e9dfe4daa0754b0568a7590788cd50e':
  Improve ListPopupWindow RTL support
 2012-07-30 13:10:21 -07:00
Adam Powell
fc92eb94c4 am 2ffb1acb: Merge " Fix preload classname for phone policy." 
* commit '2ffb1acbb704fa9d87fe496d5b7f3053e02799df':
  Fix preload classname for phone policy.
 2012-07-30 13:10:06 -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
Adam Powell
2ffb1acbb7 Merge " Fix preload classname for phone policy." 2012-07-30 10:46:12 -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
d3d62f2d06 am fa14d824: Merge "Move and rename user activity event type constants." into jb-mr1-dev 
* commit 'fa14d824d235c33b137a429c3eb6818f273407ab':
  Move and rename user activity event type constants.
 2012-07-27 18:25:27 -07:00
Jeff Brown
006ba8a226 am af3fb232: Merge "Flatten power manager wake lock constants." into jb-mr1-dev 
* commit 'af3fb2325ef43450916882d85928abc5e474133f':
  Flatten power manager wake lock constants.
 2012-07-27 18:23:44 -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
ba8d91670c am e288e180: Merge "Implement equals() and hashCode() like a good little object." into jb-mr1-dev 
* commit 'e288e180bb22ed14b6b55f7299af66a5a98106c8':
  Implement equals() and hashCode() like a good little object.
 2012-07-27 18:21:03 -07:00
Jeff Brown
397aca12c9 am 722565a6: Merge "Fix inconsistency in user activity types." into jb-mr1-dev 
* commit '722565a67dcd744e303deebc2e14cdeb447e73d7':
  Fix inconsistency in user activity types.
 2012-07-27 18:19:17 -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
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