22641 Commits

Author SHA1 Message Date
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
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
Jesse Wilson
061136c8d8 Merge "Use external/mockwebserver in frameworks/base" 2011-06-07 18:49:32 -07:00
Adam Powell
0e9e03f554 resolved conflicts for merge of a7d01a75 to master
Change-Id: Ib6a7bbca7711cb5e35085868c4b9b5cbb9b526a4
2011-06-07 18:16:00 -07:00
Jeff Brown
774ed9d953 resolved conflicts for merge of 8b2c0014 to master
Change-Id: I33a5a2949dc6c2d09e8196ba8c7128caa7ac2361
2011-06-07 17:48:39 -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
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
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
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
Jesse Wilson
7ad00e6f5c Use external/mockwebserver in frameworks/base
Change-Id: Ifb45671e3e7256692c74587984ee5fe1d0eca181
2011-06-07 15:57:10 -07:00
Irfan Sheriff
2391a98314 Merge "Update walled garden detection logic" 2011-06-07 15:16:00 -07:00
Irfan Sheriff
5ea65d609f Update walled garden detection logic
DNS based techniques dont always work. Some hotspots
redirect on data fetch on IP. Use a known pattern match
on URL to detect a walled garden instead.

Also, added gservices capability to turn off the feature
or change the URL & the pattern to match

Bug: 4378442
Change-Id: I78b4208d3ea3ace20069169e7c01ed769892d94d
2011-06-07 15:10:58 -07:00
Romain Guy
34e9f249a9 am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."
* commit 'fbef58faad5a31faf36294e4d160cbd148ed5458':
  Disable plugins if setPluginsEnabled(false) called.
2011-06-07 15:09:02 -07:00
Jake Hamby
7d259626d0 resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp
Change-Id: I784e6d1946fa708f63becece070c7090cec6f1e2
2011-06-07 15:01:50 -07:00
Amith Yamasani
0df77e6d42 Merge "Volume Panel sizing for phones." 2011-06-07 14:48:50 -07:00
Fabrice Di Meglio
c46f7ffa90 Rename atribute View horizontalDirection to layoutDirection and update unit tests
- update before/after to start/end in unit test app

Change-Id: Id7286ef5d9390540faf8ecd5f0b1c140d04bb364
2011-06-07 14:21:31 -07:00
Martijn Coenen
4c5f2a9dd2 am ed1c8d7d: am 0aa1017f: Prevent allocation overflows by corrupt NDEF records.
* commit 'ed1c8d7dc09996351db711be7d2acf0ff4715c2d':
  Prevent allocation overflows by corrupt NDEF records.
2011-06-07 13:23:11 -07:00
John Wang
1f8665895f am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE
* commit '71030e536522449f34dc584fda94f34e7be6ee19':
  Add SIM PUK unlockscreen.
2011-06-07 13:16:09 -07:00
Robert Greenwalt
e139167c91 am 5df69fad: resolved conflicts for merge of 8de47a2f to honeycomb-LTE
* commit '5df69fad6e5021d2862bff0553a510f8d6729fbd':
  Reveal some network constants.
2011-06-07 13:12:29 -07:00
John Wang
71030e5365 Merge "Add SIM PUK unlockscreen." into honeycomb-LTE 2011-06-07 12:56:49 -07:00
Robert Greenwalt
5df69fad6e resolved conflicts for merge of 8de47a2f to honeycomb-LTE
Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
2011-06-07 12:45:41 -07:00
Mike Lockwood
65abc4531f Merge "StorageVolume: Add allowMassStorage flag" 2011-06-07 12:44:52 -07:00
Mike Lockwood
8e8b280bd1 StorageVolume: Add allowMassStorage flag
Change-Id: I9d19e635bb06e50068d7e4e6919322bd5bb2e00f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-07 12:43:49 -07:00
Christopher Tate
ffccff0864 Merge "Implement shared-storage full backup/restore" 2011-06-07 12:25:06 -07:00
Alon Albert
55f18e1832 Merge "Add columns: Events.lastSynced: flag marking this as a duplicate of the lastSynced sate of the event Events.sync_data7: General purpose sync column (will be used for editUrl in Google Sync Adapter) Calendars.canPartiallyUpdate: Flag indicating sync adapter can perform partial updates." 2011-06-07 12:16:28 -07:00
Christopher Tate
b0628bfd5a Implement shared-storage full backup/restore
Every available shared-storage volume is backed up, tagged with its
ordinal in the set of mounted shared volumes.  This is an approximation
of "internal + the external card".  This lets us restore things to the
same volume [or "equivalent" volume, in the case of a cross-model
restore] as they originated on.

Also fixed a bug in the handling of files/dirs with spaces in
their names.

Change-Id: I380019da8d0bb5b3699bd7c11eeff621a88e78c3
2011-06-07 12:16:27 -07:00
Robert Greenwalt
8de47a2f25 Merge "Reveal some network constants." into honeycomb-mr2 2011-06-07 12:00:37 -07:00
Adam Powell
a7d01a7519 am 212d15c7: am a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
* commit '212d15c746f2611339026c16e5fa1aeb7f9090b7':
  Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
2011-06-07 11:36:32 -07:00
Adam Powell
212d15c746 am a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
* commit 'a476813dccec241632810c1cbb11bcfbf17841b0':
  Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
2011-06-07 11:32:23 -07:00
Mike Lockwood
a8be99f8ae Merge "Add comment for deprecation of Intent.ACTION_UMS_CONNECTED and ACTION_UMS_DISCONNECTED" 2011-06-07 11:25:27 -07:00
Mike Lockwood
7e4db3767b Add comment for deprecation of Intent.ACTION_UMS_CONNECTED and ACTION_UMS_DISCONNECTED
Change-Id: I3c42393c79424217d6b44cccef9de9e06da58193
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-07 11:24:29 -07:00
Mike Lockwood
98c185e694 Merge "Deprecate Intent.ACTION_UMS_CONNECTED and Intent.ACTION_UMS_DISCONNECTED" 2011-06-07 11:02:58 -07:00
Alon Albert
866f40aeda Add columns:
Events.lastSynced: flag marking this as a duplicate of the lastSynced sate of the event
  Events.sync_data7: General purpose sync column (will be used for editUrl in Google Sync Adapter)
  Calendars.canPartiallyUpdate: Flag indicating sync adapter can perform partial updates.

Change-Id: I5c153fb9cbf43dd1def0267c2f912a59038b28c1
2011-06-07 11:01:49 -07:00
Mike Lockwood
da85e524c7 Deprecate Intent.ACTION_UMS_CONNECTED and Intent.ACTION_UMS_DISCONNECTED
Change-Id: I7261959462422cf241a46a5ada6fbd98d655db3d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-07 10:59:04 -07:00
Eino-Ville Talvala
32a972c693 Updates to Camera API documentation.
Change-Id: I716a36becce436f57ea62fcfecd9021eb29b76ea
2011-06-07 10:34:56 -07:00
John Wang
0f7b3f8ba5 Add SIM PUK unlockscreen.
Puk unlockscreen is implemented as SimPukUnlockScreen.

Added config_enable_puk_unlock_screen to control the display of puk unlock screen.

Using config_voice_capable to control the display of emergency call button.

bug:4384956

Change-Id: I2b8256b4ecdf3d4f1e85c4e868fac1810cfd29be
2011-06-07 10:12:38 -07:00
Adam Powell
a476813dcc Make Theme.Holo.Light.NoActionBar and
Theme.Holo.Light.NoActionBar.Fullscreen public.

Change-Id: I623b5908b080e8703b825707a024fa922cd954ab
2011-06-07 10:11:59 -07:00