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

22478 Commits

Author SHA1 Message Date
Adam Powell
0e3c9ad31f Merge "Bug 4563099 - Action bar tabs - place second row tabs on top in the absence of home/up" 2011-06-09 11:14:41 -07:00
Adam Powell
310849abb1 Bug 4563099 - Action bar tabs - place second row tabs on top in the 
absence of home/up

Change-Id: I9d656962161f0cb26cecbc85991b347d2e951c76
 2011-06-09 11:11:43 -07:00
John Reck
6d70fcf830 Merge "Don't cut velocity" 2011-06-09 11:07:54 -07:00
John Reck
7c272964c2 Don't cut velocity 
Bug: 4545016

Change-Id: I0ebad82c1cc54c2e4e29f3827c3755edda9f47a5
 2011-06-09 10:31:19 -07:00
Gilles Debunne
31bc2f9252 Merge "Add SwitchPreference" 2011-06-09 10:25:25 -07:00
Jeff Sharkey
760145e3af Merge "Persist network stats using AtomicFile." 2011-06-09 10:22:27 -07:00
Steve Block
430ad47334 Merge "Fixes WebView.loadData() to avoid constructing invalid URLs." 2011-06-09 10:16:29 -07:00
Jeff Sharkey
3f3913550c Persist network stats using AtomicFile. 
Implements read/write of network stats using AtomicFile, along with
magic number and versioning.  Stores in "/data/system/netstats.bin"
for now.  Tests to verify that stats are persisted across a simulated
reboot, and to verify that TEMPLATE_WIFI is working.

Fixed bug where kernel counters rolling backwards would cause negative
stats to be recorded; now we clamp deltas at 0.

Change-Id: I53bce26fc8fd3f4ab1e34ce135d302edfa34db34
 2011-06-09 10:14:13 -07:00
Narayan Kamath
6362e96d32 Merge "Implement QUEUE_FLUSH and QUEUE_DESTROY addition modes." 2011-06-09 10:13:47 -07:00
Chet Haase
af741bf95b Merge "Change exception thrown when set() called on readonly Property." 2011-06-09 10:12:04 -07:00
Philip Milne
4233bc8968 Merge "Fix for baseline alignment in LinearLayout compatibiity mode." 2011-06-09 10:10:26 -07:00
Philip Milne
7fd9487569 Fix for baseline alignment in LinearLayout compatibiity mode. 
Change-Id: Iaa194537c1bc493172fab89624279fe5cbfa1f70
 2011-06-09 09:54:01 -07:00
Romain Guy
0fbf20703f am 34e9f249: am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called." 
* commit '34e9f249a9b36ebe64476b997bca0edf990fbc0d':
  Disable plugins if setPluginsEnabled(false) called.
 2011-06-09 09:03:55 -07:00
Narayan Kamath
4924fe3867 Implement QUEUE_FLUSH and QUEUE_DESTROY addition modes. 
Note that this change is slightly more flexible, it defines
a priority for each playback request. We needn't really throw
away synthesis requests from other apps. We could just play
them after higher priority ones (for e.g from talkback).

Change-Id: I6c7dd9abe4871e87da08d9aaa4c55225a69078e5
 2011-06-09 16:42:16 +01:00
Chet Haase
accb54c52f Change exception thrown when set() called on readonly Property. 
Change-Id: I2669e32691c93dfaf07c34ca4d9fe5c6d47d5480
 2011-06-09 08:38:12 -07:00
Martijn Coenen
604d7fe799 Merge "Added support for rediscovering a Tag (API)." 2011-06-09 08:01:25 -07:00
Andy McFadden
8fdb1e601e Merge "Add a URI for recurring event exceptions" 2011-06-09 07:37:07 -07:00
Narayan Kamath
6276814a67 Merge "Make changes to the TTS api suggested by the API review." 2011-06-09 04:09:22 -07:00
Steve Block
f95d490b78 Fixes WebView.loadData() to avoid constructing invalid URLs. 
Also updates the documentation to make clear how the encoding parameter should be used.

Bug:4541798
Change-Id: I9283513fbd8bcc3dc54056cfa2d0ab2425681824
 2011-06-09 12:03:36 +01:00
Steve Block
21ac7a84fc Merge "Fix some poorly worded API documentation for WebView.loadDataWithBaseURL()" 2011-06-09 03:48:41 -07:00
Steve Block
ae32857ebd Fix some poorly worded API documentation for WebView.loadDataWithBaseURL() 
See https://mondrian.corp.google.com/changelist/110819-p9

Change-Id: I35fc65752687322ddfec39f5e2d7e5e5b89951e7
 2011-06-09 11:27:48 +01:00
Jake Hamby
d4f1bacca5 resolved conflicts for merge of 7ca13deb to master 
Change-Id: If34814d6c70cf63eca9bd816845389f6785518ae
 2011-06-08 23:20:09 -07:00
Daisuke Miyakawa
9b3811b685 Merge "Introduces new Contacts API for ranking promotion." 2011-06-08 19:55:47 -07:00
Daisuke Miyakawa
b2b651f16d Introduces new Contacts API for ranking promotion. 
The usage feedback will be used for achieving per-method
(email address, phone number) ranking improvement.

Bug: 4371572
Change-Id: I602c0b83afca674904946f59bbdfc4dca07d46e4
 2011-06-08 19:53:55 -07:00
Svetoslav Ganov
34803caec8 Merge "AccessibilityNodeInfo and AccessibilityEvent to initialized properly." 2011-06-08 19:44:20 -07:00
Svetoslav Ganov
9210ccbdc3 AccessibilityNodeInfo and AccessibilityEvent to initialized properly. 
Change-Id: Id3a1b33a222790214820af4a8b49378f08e53558
 2011-06-08 19:42:59 -07:00
Adam Powell
be0a453505 Add SwitchPreference 
Change-Id: I073e9bfba8c4e1a625c27f976f71ea56a81ba20f
 2011-06-08 18:25:27 -07:00
John Reck
2db439bdd8 Merge "Fix initial zoom with loadViewState" 2011-06-08 18:19:12 -07:00
John Reck
60c84d67c5 Fix initial zoom with loadViewState 
Change-Id: I06ee6a44c6e102ed84b44c68a83ab7db29d9f160
 2011-06-08 18:00:02 -07:00
Martijn Coenen
e5141eef50 am 4c5f2a9d: am ed1c8d7d: am 0aa1017f: Prevent allocation overflows by corrupt NDEF records. 
* commit '4c5f2a9dd26674be797e1cb7c995247601096a04':
  Prevent allocation overflows by corrupt NDEF records.
 2011-06-08 17:03:05 -07:00
Romain Guy
66e9af6c54 Remove obsolete code. 
Change-Id: I2f990528bdc0dc6127f367e55c55287d43dd29f9
 2011-06-08 16:09:28 -07:00
Andy McFadden
4a8c478dfa Add a URI for recurring event exceptions 
Part of a larger Calendar provider change.

Bug 4473786

Change-Id: I0cb4260ea590da0c48b55d0ca3ee586e00d37b36
 2011-06-08 14:59:51 -07:00
John Wang
de13001f76 am 1f866589: am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE 
* commit '1f8665895f71904b9d757854277cb637841356c3':
  Add SIM PUK unlockscreen.
 2011-06-08 14:46:04 -07:00
Martijn Coenen
2dcae567ab Added support for rediscovering a Tag (API). 
Bug: 3378764
Change-Id: I4697b814337270c4458ca2b8ce358de315904777
 2011-06-08 23:26:42 +02:00
Chia-chi Yeh
ff3bdca31f The service part of the user space VPN support. 
The dialogs will be in another change.

Change-Id: I0cdfd2ef21ffd40ee955b3cbde5ada65dbfdb0bc
 2011-06-08 14:16:42 -07:00
Nick Pelly
9eb5847777 Merge "Move NDEF URI helper method into android.nfc.NfcRecord" 2011-06-08 13:44:28 -07:00
Chet Haase
b19fcf3e9c Merge "Add 'Property' object" 2011-06-08 12:51:06 -07:00
Nick Pelly
e0180d053e Move NDEF URI helper method into android.nfc.NfcRecord 
Change-Id: Ia044e45cbe2cd06c4844d15a57f1c1f392cf65cd
 2011-06-08 11:26:11 -07:00
Martijn Coenen
608a23a07e Merge "Implement Felica timeout handling (API)." 2011-06-08 11:04:36 -07:00
Martijn Coenen
a924973f22 Implement Felica timeout handling (API). 
Allows controlling the timeout for transceive on Felica.

Change-Id: I5c62b3ea0e8a16bc006feac6ec759cdb730bc938
 2011-06-08 20:00:02 +02:00
Robert Greenwalt
081977e493 Merge "resolved conflicts for merge of e139167c to master" 2011-06-08 10:29:13 -07:00
Robert Greenwalt
8a02401129 resolved conflicts for merge of e139167c to master 
Change-Id: Ic4d8aae7dd457457d9cc8ba081b273e425729f86
 2011-06-08 10:01:06 -07:00
Mike Lockwood
523510e9b7 Merge "UsbManager: Clean up extras for ACTION_USB_STATE broadcast" 2011-06-08 09:42:54 -07:00
Chet Haase
b39f051631 Add 'Property' object 
This change adds a generic Property facility to the SDK, which allows an
easy way to reference fields (private or otherwise) in a general way.
For example, animations can use this facility to animate 'properties'
on target objects in a way that is more code- and compiler-friendly than
the existing String-based approach (for objects which have implemented
Properties, of course). The animator classes have been updated to use
this new approach (in addition to Strings, which are still more generally
useful for objects which have get/set functions but not Property objects).

The change also includes new Property objects on View (which can now be
used in creating animations on Views).

There is an unrelated change on GLES20RecordingCanvas to change the way we
cache bitmaps, which avoids spurious garbage by using an ArrayList instead of
a HashSet.

Change-Id: I167b43a3fca20e7695b1a23ca81274367539acda
 2011-06-08 09:42:37 -07:00
Eino-Ville Talvala
c76c55af9b Merge "Updates to Camera API documentation." 2011-06-08 09:18:37 -07:00
Mike Lockwood
9eb014aeb0 UsbManager: Clean up extras for ACTION_USB_STATE broadcast 
Also added name for new PTP USB function

Change-Id: Ia2775ba2b23ef6a6108ca7e060239eb51c2eecc8
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-08 09:17:45 -07:00
Narayan Kamath
e22b69a7de Make changes to the TTS api suggested by the API review. 
This ended up making the implementation a lot cleaner
as well. See the bug listed below for some background.

bug:4553470
Change-Id: If16476a57e389c2f9b228f6548e426642d292b49
 2011-06-08 16:46:00 +01:00
Steve Block
3dd389cf46 Merge "Merge WebKit at r82507: Update useragent string" 2011-06-08 08:26:13 -07:00
Steve Block
6dd1f8b946 Merge WebKit at r82507: Update useragent string 
Change-Id: Ie24ef844bdaf07a6aee848a04a49d0845b52ee64
 2011-06-08 15:17:10 +01:00
satok
3932aa7ff8 Merge "Fix the display name of InputMethodSubtype" 2011-06-08 04:09:21 -07:00