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

82412 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
4522858dad am 63954229: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '6395422929df024d2bb29a490f9ac17cdb99bfc2':
  Import translations. DO NOT MERGE
 2012-07-30 15:05:08 -07:00
The Android Open Source Project
a21a60757d Reconcile with jb-mr1-release 
Change-Id: Ic5a38ec8411772c4bad01c3431d284d54b3c3d23
 2012-07-30 15:04:13 -07:00
Ying Wang
6395422929 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-07-30 15:01:31 -07:00
The Android Open Source Project
8f21770cb5 am dc7d4627: am 2606fc48: Reconcile with jb-mr0-release jb-release 
* commit 'dc7d4627418ee0e28db7840c95aaf58eadf7a7ae':
  Fix NPE on some phones at startup.
  Fix 6804479: "Emergency calls only" in notification shade
  Implement CMAS service category program results.
  Fix detection of CDMA cell broadcast messages.
  Fix our interpretation of apn setting's bearer.
  Implement CMAS service category program results.
  Fix detection of CDMA cell broadcast messages.
  Fix our interpretation of apn setting's bearer.
 2012-07-30 14:49:12 -07:00
The Android Open Source Project
dc7d462741 am 2606fc48: Reconcile with jb-mr0-release jb-release 
* commit '2606fc48cb2e65489056096227430b054c558767':
  Fix NPE on some phones at startup.
  Fix 6804479: "Emergency calls only" in notification shade
  Implement CMAS service category program results.
  Fix detection of CDMA cell broadcast messages.
  Fix our interpretation of apn setting's bearer.
  Implement CMAS service category program results.
  Fix detection of CDMA cell broadcast messages.
  Fix our interpretation of apn setting's bearer.
 2012-07-30 14:47:47 -07:00
The Android Open Source Project
2606fc48cb Reconcile with jb-mr0-release jb-release 
Change-Id: I241c11b89af86b312a9112a0004efb3ab6aaa3f6
 2012-07-30 14:43:53 -07:00
Peter Ng
09f18477e8 am a1f89c7b: am a3b69d1f: am 81a9bece: Merge "copy and image updates to patterns and building blocks" into jb-dev 
* commit 'a1f89c7b3414c353c8a7f6c48b62e4ad9ed6f3ea':
  copy and image updates to patterns and building blocks
 2012-07-30 14:42:45 -07:00
Fabrice Di Meglio
85c1765ea7 am 3330ae59: Merge "Improve Toast RTL support" into jb-mr1-dev 
* commit '3330ae59ff51701667b4644b036c55e59824f203':
  Improve Toast RTL support
 2012-07-30 14:42:42 -07:00
Peter Ng
a1f89c7b34 am a3b69d1f: am 81a9bece: Merge "copy and image updates to patterns and building blocks" into jb-dev 
* commit 'a3b69d1fa473460b8955fb28e4a1a7621ddd5947':
  copy and image updates to patterns and building blocks
 2012-07-30 14:41:24 -07:00
Adam Powell
2ebfee1640 am 859a62ce: Merge "Enforce a maximum size for action button icons." into jb-mr1-dev 
* commit '859a62ce92d8d1e40a4de5c76a30540860b80718':
  Enforce a maximum size for action button icons.
 2012-07-30 14:40:56 -07:00
Fabrice Di Meglio
3330ae59ff Merge "Improve Toast RTL support" into jb-mr1-dev 2012-07-30 14:40:32 -07:00
Peter Ng
a3b69d1fa4 am 81a9bece: Merge "copy and image updates to patterns and building blocks" into jb-dev 
* commit '81a9bece12ef855092b27c33a997f3fa7b7f2d98':
  copy and image updates to patterns and building blocks
 2012-07-30 14:39:54 -07:00
Adam Powell
859a62ce92 Merge "Enforce a maximum size for action button icons." into jb-mr1-dev 2012-07-30 14:37:46 -07:00
Peter Ng
81a9bece12 Merge "copy and image updates to patterns and building blocks" into jb-dev 2012-07-30 14:37:26 -07:00
Adam Powell
c0047d4e11 Enforce a maximum size for action button icons. 
Change-Id: Id9b5c1573cd40012229921fa8497cbe5ce340b1e
 2012-07-30 14:30:51 -07:00
Fabrice Di Meglio
bf0bc63def Improve Toast RTL support 
- use Locale from Context

Change-Id: Ic93bb6e3f9310d54d879c20754c9310154940565
 2012-07-30 14:06:58 -07:00
James Dong
2542d0de1c am 7267baba: Merge "Enabled application using VideoView to get information events from MediaPlayer" into jb-mr1-dev 
* commit '7267babae3695408daa96da1f5951c8f22e823a7':
  Enabled application using VideoView to get information events from MediaPlayer
 2012-07-30 13:39:22 -07:00
James Dong
7267babae3 Merge "Enabled application using VideoView to get information events from MediaPlayer" into jb-mr1-dev 2012-07-30 13:37:08 -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
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
Ying Wang
2d6cc0968e Import translations. DO NOT MERGE 
Change-Id: Ic5a1446767d3a1e29bd62eeb080215a73a0728c0
Auto-generated-cl: translation import
 2012-07-30 12:15:36 -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
The Android Automerger
7a714f11f9 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-07-30 09:46:04 -07:00
The Android Automerger
27716fdc3d merge in jb-mr1-release history after reset to master 2012-07-30 07:12:20 -07: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
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