52430 Commits

Author SHA1 Message Date
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
Yu Shan Emily Lau
d1d17b1651 Cleaned up the old test cases and test media files.
Change-Id: Icc3c04c69b11b2bb91588a8bb916baf69594e8d3
2011-06-07 12:08:13 -07:00
Robert Greenwalt
8de47a2f25 Merge "Reveal some network constants." into honeycomb-mr2 2011-06-07 12:00:37 -07:00
Iliyan Malchev
5c54f4b3cb frameworks/base: updates for camera HAL memory management
-- when the camera HAL allocates memory
	-- it requests is as N buffers by S bytes each
	-- it may specify a file descriptor to get mmapped; if -1, then we use ashmem
-- when issuing data and data-timestamp callbacks, the camera HAL specifies a
   buffer index
-- range checking is performed on the buffer indices
-- memory requested by a camera HAL is not incStrong'ed, and needs to be
   expliciftly released by the camera HAL (by calling the release method on the
   camera_memory_t handle)

Change-Id: I0f09603aa786c238590e7288388ab673787e6032
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-06-07 11:43:20 -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
Mathias Agopian
16affed50e am cf3036eb: (-s ours) am c1cbf452: am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
* commit 'cf3036ebef2929f84bc4e34ed1e9d96eefd6a5e7':
  merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
2011-06-07 11:15:01 -07:00
Wink Saville
7f13d0ed40 am c368831d: Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE
* commit 'c368831d62ce68d6c9c83d7e49e5db11c47ebd85':
  Preferred network discrepancy after rild is restarted.
2011-06-07 11:03:25 -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
Robert Greenwalt
31ced5c140 am 350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTE
* commit '350b78291de725a1607395055b6d28655d9e1080':
  Fix NPE in the statusbar.
2011-06-07 11:01:23 -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
Wink Saville
c368831d62 Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE 2011-06-07 10:58:09 -07:00
Robert Greenwalt
350b78291d Merge "Fix NPE in the statusbar." into honeycomb-LTE 2011-06-07 10:57:20 -07:00
Wink Saville
05d69edc0b Preferred network discrepancy after rild is restarted.
If the preferred network had updated before rild restarts,
the new setting value is ignored on RIL_CONNECT event.

bug: IKXEVERESTLTE-1494
Change-Id: Iec6395187c0d749208904db857b80e28f7d92c21
2011-06-07 10:44:43 -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
Jaikumar Ganesh
6aa152a1df am c8410017: (-s ours) am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread
* commit 'c8410017502dacff43ecd3e0926049b99fc186a8':
  Remove discoverable timeout handler. DO NOT MERGE
2011-06-07 10:01:28 -07:00
Narayan Kamath
8d1fc2403b Fix the threading behaviour of TTS audio requests.
All audio is played back on a separate thread.

Change-Id: I2bbb7b3140f6a04ef705cadb2bd1ae88951e3c48
2011-06-07 16:27:18 +01:00
Wu-cheng Li
a4a48a484f Merge "Improve android.hardware.Camera.Area javadoc." 2011-06-07 04:05:35 -07:00
Wu-cheng Li
bde61a5731 Improve android.hardware.Camera.Area javadoc.
bug:4553469
Change-Id: Iae88af354fee4925cb7978572c27f6dd5595ca59
2011-06-07 19:00:03 +08:00
Xia Wang
4da7b10c45 Merge "Add OpenGl benchmark tests: display images with different texture in each mesh." 2011-06-06 22:00:31 -07:00
Jeff Brown
e046555b4d am fd324486: am 5cb05eea: Merge "Fix build." into honeycomb-mr2
* commit 'fd3244868dec40707039cd616dd37ada41774547':
  Fix build.
2011-06-06 21:11:44 -07:00
Jeff Brown
fd3244868d am 5cb05eea: Merge "Fix build." into honeycomb-mr2
* commit '5cb05eea289559b30cf4f84130cb6afba0921638':
  Fix build.
2011-06-06 21:08:25 -07:00
Jeff Brown
5cb05eea28 Merge "Fix build." into honeycomb-mr2 2011-06-06 21:06:30 -07:00
Jeff Brown
9181a5f40c Fix build.
Change-Id: I9ea07637058e2aa74d20d881bc21fea305cc869e
2011-06-06 21:04:14 -07:00
Jeff Brown
61220e880a am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2
* commit 'bbbab26ebe9bc789ba9abac757895a6c31de7cc5':
  Revert velocity damping. Bug: 4364920
2011-06-06 20:36:49 -07:00
Jeff Brown
55cc25c12c am 797dc698: am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2
* commit '797dc698e9ff85c1a09874cc3f7bfe825b2ff0e1':
  Simplify spot tracking logic. Bug: 4124987
2011-06-06 20:36:41 -07:00
Jeff Brown
8b2c00144a am b3536145: am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2
* commit 'b3536145725250401d25ffa00cda85d222dfc21e':
  Touch pad improvements. Bug: 4124987
2011-06-06 20:34:38 -07:00
Irfan Sheriff
5e4d020648 am b400184a: Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE
* commit 'b400184ad6277676048a30b042ed0667de662ad8':
  Handle AsyncChannel disconnect in WifiService
2011-06-06 20:34:35 -07:00
Jeff Brown
bbbab26ebe am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2
* commit '2c1804998b6a3f1f9f5f301ccf813363825ab4cf':
  Revert velocity damping. Bug: 4364920
2011-06-06 20:34:35 -07:00
Jeff Brown
797dc698e9 am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2
* commit 'b92dcf9c062064dcca9298b089d95a3ce1ba2e75':
  Simplify spot tracking logic. Bug: 4124987
2011-06-06 20:34:33 -07:00
Jeff Brown
b353614572 am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2
* commit 'ed48fa89a8e31b04681347a9235c2a566e7dbb8e':
  Touch pad improvements. Bug: 4124987
2011-06-06 20:32:25 -07:00
Jeff Brown
2c1804998b Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2 2011-06-06 20:32:18 -07:00
Jeff Brown
c3709f2509 am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
* commit '277bfd7cdd889e4f59e57925b90d1899f7312c4e':
  Improve browser scrolling when using the mouse wheel.
2011-06-06 20:32:02 -07:00
Irfan Sheriff
b400184ad6 Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE 2011-06-06 20:31:55 -07:00
Jeff Brown
b92dcf9c06 Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2 2011-06-06 20:31:55 -07:00
Jeff Brown
ed48fa89a8 Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2 2011-06-06 20:30:47 -07:00
Jeff Brown
277bfd7cdd am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
* commit 'c1830a77a7fe0f1ccd52f405cb076d40fe085e2f':
  Improve browser scrolling when using the mouse wheel.
2011-06-06 20:29:08 -07:00
Jeff Brown
c1830a77a7 Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2 2011-06-06 20:27:28 -07:00
Jeff Brown
ac55c2b1ea Revert velocity damping.
Bug: 4364920

Velocity damping proved to be a bad idea because it would
cause a significant ramp in velocity at the beginning of
a gesture, instead of the desired smooth behavior.  Oh well.

Change-Id: Ie631946f47ef2492bd71fbed1ab44bbb39a875a8
2011-06-06 20:23:54 -07:00
Jeff Brown
cb5ffcf0e4 Simplify spot tracking logic.
Bug: 4124987

Since spots are now one-to-one with the touch gesture points,
we can eliminate a lot of redundant logic that assumed they weren't.

Change-Id: Ic60d8d0898c285317f480bc8fb17fb9797770e69
2011-06-06 20:06:19 -07:00
Jeff Brown
bb3fcba0ca Touch pad improvements.
Bug: 4124987

Only show one spot per touch point instead of one spot per
finger for multitouch gestures.

Tweaked the pointer acceleration curves.

Dissociated the hover/tap timeouts from the "tap" timeout
since they mean very different things.

Change-Id: I7c2cbd30feeb65ebc12f6c7e33a67dc9a9f59d4c
2011-06-06 19:23:05 -07:00
Dianne Hackborn
b5c462f801 Merge "Add force-stop subcommand for 'am'." 2011-06-06 19:01:48 -07:00
Jeff Brown
7f5b99676f Improve browser scrolling when using the mouse wheel.
The way that smooth scrolling is implemented in the Browser,
repeated requests to scroll by a certain amount do not add up
to one large scroll by the cumulative amount.  This makes
the mouse wheel unusable on large pages because the Browser
will scroll at a more or less constant rate no matter how often
the wheel is turned.

The fix is to not animate scrolls when using the mouse wheel.

Change-Id: I23c05cdd2383944b8730deb225b7f3f57f1729df
2011-06-06 18:59:41 -07:00
Jake Hamby
66040bbb08 Fixes for SMS Cell Broadcast support.
Add support for ETWS primary notification messages.
Add method for easy concatenation of GSM multi-part broadcasts.
Add test cases for SmsCbHeader, SmsCbMessage and IntRangeManager.

Change-Id: Ifc646a011e79ad6c7eace9afcf84b1216eb42b7a
2011-06-06 18:56:20 -07:00