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
Ying Wang
7570ca3269 Merge "Import translations. DO NOT MERGE" 2012-07-30 15:01:36 -07:00
Ying Wang
6395422929 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-07-30 15:01:31 -07:00
Kenny Root
515087d1c5 Explicitly set lib dir permissions during unlink 
The default umask changed, so we have to explicitly set the mode of the
lib directory when we create it in unlinklib.

Bug: 6857022
Change-Id: I06fc3f29e99d686bbbb96184d8c314d4cc57e9fe
 2012-07-30 15:01:20 -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
Romain Guy
0a088f5d46 Fix android.opengl.Matrix frustum's generation 
External bug report: http://code.google.com/p/android/issues/detail?id=35646

Change-Id: I845783c05da46855f0c1d824c9a367f0e4673b85
 2012-07-30 14:06:35 -07:00
James Dong
34f48b78a3 am 2542d0de: am 7267baba: Merge "Enabled application using VideoView to get information events from MediaPlayer" into jb-mr1-dev 
* commit '2542d0de1c0a1d304439e8281107694adb2202d4':
  Enabled application using VideoView to get information events from MediaPlayer
 2012-07-30 13:41:35 -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
Winson Chung
21dd5622a4 Merge "Fixing issue where screenshot error message is clipped and share action is missing subject. (Bug 6800151, Bug 6721459)" 2012-07-30 13:20:14 -07:00
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
Nick Pelly
48c5eb018b DO NOT MERGE. Add package-name-prefix blacklist for location updates. 
The Settings.Secure value locationPackagePrefixBlacklist and
locationPackagePrefixWhitelist contains comma seperated package-name
prefixes.

Location & geo-fence updates are silently dropped if the receiving
package name has a prefix on the blacklist. Status updates are
not affected. All other API's work as before.

A content observer is used so run-time updates to the blacklist
apply immediately. There is both a blacklist and a whitelist.
The blacklist applies first, and then exemptions are allowed
from the whitelist. In other words, if your package name prefix
matches both the black AND white list, then it is allowed.

Change-Id: I4ea2ad56fa6bd75d32151bc250ac25c26a5777c4
 2012-07-30 13:17:30 -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
Ying Wang
b53f727eea Import translations. DO NOT MERGE 
Change-Id: I87b7ad85d5d21f304a48d4d13af7ed0533b2ff72
Auto-generated-cl: translation import
 2012-07-30 12:29:12 -07:00
Ying Wang
03d9cceb49 Import translations. DO NOT MERGE 
Change-Id: I97ce7638235fa333079ad58968e178fac007cf93
Auto-generated-cl: translation import
 2012-07-30 12:23:52 -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
Elliott Hughes
776708222a Merge "Fix Time.parse and Time.parse3339 crashing bugs." 2012-07-30 08:03:02 -07:00
The Android Automerger
27716fdc3d merge in jb-mr1-release history after reset to master 2012-07-30 07:12:20 -07:00
Mikhail Naganov
56936a1f51 Deprecate WebSettings.LOAD_NORMAL cache mode. 
After the switch to the Chromium network stack, this setting is
effectively the same as LOAD_DEFAULT, and having two settings
with the same meaning is confusing.

This change is blocking https://android-git.corp.google.com/g/205883 in CTS

Change-Id: I02cc23477f107e7f4cec37dcbad4f25503b5e840
 2012-07-30 14:54:49 +01: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