52568 Commits

Author SHA1 Message Date
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
Mike Lockwood
aa48835ce9 MTP: Remove obsolete setPtpMode support
PTP mode will be implemented as a separate USB function instead.

Change-Id: I9304c1936c70604ab2ed9704c6b95e11b61f5ba2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-08 09:19:23 -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
Debashish Chatterjee
5ae3c009ed Voicemail provider contract definition.
Defines the URLs and columns of the new voicemail provider.
Also defines the broadcast intents sent by the provider.

Change-Id: I8e9b8744a8ea6e378ca98712f3d136a99302cc2d
2011-06-08 15:42:05 +01: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
satok
a9778d4d44 Fix the display name of InputMethodSubtype
- Also fixed hashCode

Change-Id: I4ef4bf42e4b73d11e23a89c5df3947411e654c04
2011-06-08 19:40:34 +09:00
Narayan Kamath
233c56a350 Merge "Fix the threading behaviour of TTS audio requests." 2011-06-08 02:11:26 -07:00
Jeff Sharkey
7f86827af4 Intent to manage application network data usage.
Will be launched by Settings when presenting detailed network data
usage for a specific application.  Offers easy access into application
settings to change behavior.

Change-Id: I4ee0fdbc69f6a800ad59aca8db6b21f15ca71a66
2011-06-08 00:20:45 -07:00
Jeff Sharkey
19862bf5d0 Compute range-based usage in NetworkStatsHistory.
When given a start/end range, interpolate between buckets to return
the total network usage.  Used to summarize detailed UID stats.  Method
to combine NetworkStatsHistory regardless of bucket size.  Used to
combine all histories matching a template.

Added tests for both methods.

Change-Id: Ia463910c0ecf7cf08dcf97c658ad99742bd6b882
2011-06-07 23:54:28 -07:00
Jeff Sharkey
61ee0bbb5b UID network stats, secure settings, and random.
Collect UID-granularity network stats during regular poll event.  Add
dumpsys argument to generate fake historical data for debugging, and
move stats parameters to Settings.Secure.

Change-Id: I09b36a2955dc10c697d4b9c3ff23dcb3ac37bd70
2011-06-07 23:43:46 -07:00
Jeff Sharkey
d2a458750e Map network identity using ConnectivityService.
Instead of deriving network identity based on raw subsystem broadcasts,
listen for updates from ConnectivityService.  Added atomic view of all
active NetworkState, and build map from "iface" to NetworkIdentity set
for stats tracking.

To avoid exposing internal complexity, INetworkStatsService calls use
general templates.  Added TelephonyManager mapping to classify network
types using broad labels like "3G" or "4G", used to drive templates.

Cleaned up Objects and Preconditions.

Change-Id: I1d4c1403f0503bc3635a59bb378841ba42239a91
2011-06-07 23:09:25 -07:00
Svetoslav Ganov
dd82b85677 Merge "Crash in the TouchExplorer" 2011-06-07 19:29:20 -07:00
Svetoslav Ganov
00f7b3f765 Crash in the TouchExplorer
1. No clearing the last touch explore event in all cases
   when transitioning to another mode.

2. Incorrectly assuming the the action index of an up/down
   events is 0.

bug:4551506

Change-Id: I43f8e800b54a340968489dc924a539795a9195cb
2011-06-07 19:27:56 -07:00
Jesse Wilson
061136c8d8 Merge "Use external/mockwebserver in frameworks/base" 2011-06-07 18:49:32 -07:00
Chia-chi Yeh
5bc7c93ca7 Merge "Do not register the callbacks in the constructor." 2011-06-07 18:18:56 -07:00
Adam Powell
0e9e03f554 resolved conflicts for merge of a7d01a75 to master
Change-Id: Ib6a7bbca7711cb5e35085868c4b9b5cbb9b526a4
2011-06-07 18:16:00 -07:00
Wink Saville
2b2c31f603 am 7f13d0ed: am c368831d: Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE
* commit '7f13d0ed408c3ddce5b061c4370d99ba15d027b7':
  Preferred network discrepancy after rild is restarted.
2011-06-07 17:54:25 -07:00
Robert Greenwalt
7579081297 am 31ced5c1: am 350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTE
* commit '31ced5c140cae9b3ad90066a540346acd821a3c9':
  Fix NPE in the statusbar.
2011-06-07 17:54:17 -07:00
Jaikumar Ganesh
376d9b87af am 6aa152a1: (-s ours) am c8410017: (-s ours) am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread
* commit '6aa152a1df3f77b5838a62194fc196e04d8a5c6a':
  Remove discoverable timeout handler. DO NOT MERGE
2011-06-07 17:53:41 -07:00
Jeff Brown
cb0c55ed37 am e046555b: am fd324486: am 5cb05eea: Merge "Fix build." into honeycomb-mr2
* commit 'e046555b4d92179327d12d888be967fff5c027ca':
  Fix build.
2011-06-07 17:52:53 -07:00
Jeff Brown
72c7362080 am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2
* commit '61220e880ac4d9d76b7fd50744439e68e929c697':
  Revert velocity damping. Bug: 4364920
2011-06-07 17:52:30 -07:00
Jeff Brown
051e8f2bfa am 55cc25c1: am 797dc698: am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2
* commit '55cc25c12c45e8ffb65d2275cc0b6941b68db9df':
  Simplify spot tracking logic. Bug: 4124987
2011-06-07 17:52:22 -07:00
Jeff Brown
774ed9d953 resolved conflicts for merge of 8b2c0014 to master
Change-Id: I33a5a2949dc6c2d09e8196ba8c7128caa7ac2361
2011-06-07 17:48:39 -07:00
Irfan Sheriff
f596955372 am 5e4d0206: am b400184a: Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE
* commit '5e4d0206486378ffc7d2992750e439d54df15147':
  Handle AsyncChannel disconnect in WifiService
2011-06-07 17:19:02 -07:00
Jeff Brown
48076da85c am c3709f25: am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
* commit 'c3709f2509bfc15d13a590b8342503f858ee67e2':
  Improve browser scrolling when using the mouse wheel.
2011-06-07 17:18:48 -07:00
Dianne Hackborn
aefc94f19a am 4bd50588: am fc3fa5dc: am 1b405592: Merge "Fix issue #4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2
* commit '4bd505883df3d8ca7583d854f1c71302c615519d':
  Fix issue #4539687: At least one compatibility-mode app (Androminion)...
2011-06-07 17:18:16 -07:00
Xavier Ducrohet
f18e311ee5 am abc83871: am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2
* commit 'abc838716816107754ab0479242d03807ce79fc2':
  Import the Layoutlib from hc-mr1.
2011-06-07 17:17:11 -07:00
Jeff Brown
25bd8abce9 Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2 2011-06-07 16:58:06 -07:00
Jeff Brown
6674d9bf0a Fix swipe gesture cosine calculation.
Bug: 4124987

Recent changes introduced a multiplication factor into the
distance calculation which ended up being absent from the
dot product calculation.

Change-Id: Ia367912b9ac09b6285d5a498a0c271563c9e9e39
2011-06-07 16:50:14 -07:00
Adam Powell
4e1504a66b am 7ed8ff18: am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2
* commit '7ed8ff18ce16312b86bd7da855e185b9ecc934a8':
  Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector
2011-06-07 16:37:35 -07:00
Jake Hamby
22165bb54a am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp
* commit 'ae62b7b0bca9c46dea30ee81a7aada3e7576638b':
  Fixes for SMS Cell Broadcast support.
2011-06-07 16:32:10 -07:00
Jake Hamby
ae62b7b0bc resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp
Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a
2011-06-07 16:24:15 -07:00
Adam Powell
7ed8ff18ce am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2
* commit '68b81434963db90e0d5b14710e4edd86084ede3c':
  Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector
2011-06-07 16:22:32 -07:00
Adam Powell
68b8143496 Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2 2011-06-07 16:19:26 -07:00
Adam Powell
982cb98393 Fix bug 4533120 - rough handling of invalid event streams in
ScaleGestureDetector

Make ScaleGestureDetector a bit more tolerant of bogus event streams.

Change-Id: I28a8b1ea494b7f1ca9d4c4623b95aee38f213369
2011-06-07 16:13:51 -07:00
Brian Carlstrom
c8307c885f Merge "Change KeyChain to assume PEM encoded keystore entries" 2011-06-07 15:57:29 -07:00
Frank Sposaro
34687664be Merge "Fixed typo. "a a" -> "a"" 2011-06-07 15:57:11 -07:00
Jesse Wilson
7ad00e6f5c Use external/mockwebserver in frameworks/base
Change-Id: Ifb45671e3e7256692c74587984ee5fe1d0eca181
2011-06-07 15:57:10 -07:00
John Wang
229d3a0cbc am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE
* commit 'fc94d45fc209dbcfdf7f57e0c04c581e1e51988b':
  Make getDeviceId return null for Non-phone device.
2011-06-07 15:56:19 -07:00
Dianne Hackborn
816e5b7219 am ee3de4a9: am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2
* commit 'ee3de4a950a188c6a4d5fb732242249af4807837':
  Remove compat mode dialog.
2011-06-07 15:56:05 -07:00
Dianne Hackborn
891266e36e am b5b98f87: am dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2
* commit 'b5b98f877a09907a9a3b0c7e590e6e0ddd575158':
  DO NOT MERGE. Experimental compatibility mode UI.
2011-06-07 15:52:38 -07:00
John Wang
fc94d45fc2 Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE 2011-06-07 15:49:34 -07:00
Dianne Hackborn
ee3de4a950 am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2
* commit 'a3ce0f1e6f92e9580b0b0cbdc6cc124d2163f6c5':
  Remove compat mode dialog.
2011-06-07 15:47:14 -07:00
Dianne Hackborn
a3ce0f1e6f Merge "Remove compat mode dialog." into honeycomb-mr2 2011-06-07 15:45:14 -07:00
Dianne Hackborn
2947826931 Remove compat mode dialog.
Change-Id: I37bccdf9d3e7c56048633da5731ad111910e530f
2011-06-07 15:44:22 -07:00
Dianne Hackborn
b5b98f877a am dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2
* commit 'dfe824ef3e5d8b2adac97c667cd51c7dfdb3c7af':
  DO NOT MERGE. Experimental compatibility mode UI.
2011-06-07 15:39:43 -07:00