Commit Graph

10071 Commits

Author SHA1 Message Date
Daniel Sandler
84383376d8 Merge "More readable Configuration#toString() output." 2010-07-30 12:10:33 -07:00
Dmitri Plotnikov
025b6ec308 Merge "Adding a lookup URI to simplify loading of a contact" 2010-07-30 12:03:17 -07:00
Steve Howard
48c05739dd am 6a114b21: am 7c600369: Merge "Update Context.getSystemService() docs for download manager." into gingerbread
Merge commit '6a114b211a77bdd4f4c687f99f9e5f9273ec1a76'

* commit '6a114b211a77bdd4f4c687f99f9e5f9273ec1a76':
  Update Context.getSystemService() docs for download manager.
2010-07-30 11:15:44 -07:00
Steve Howard
6a114b211a am 7c600369: Merge "Update Context.getSystemService() docs for download manager." into gingerbread
Merge commit '7c600369c9695de73ca37db552eb81b8b89d5e76' into gingerbread-plus-aosp

* commit '7c600369c9695de73ca37db552eb81b8b89d5e76':
  Update Context.getSystemService() docs for download manager.
2010-07-30 11:12:28 -07:00
Steve Howard
7c600369c9 Merge "Update Context.getSystemService() docs for download manager." into gingerbread 2010-07-30 11:09:48 -07:00
Mathias Agopian
fdece4bbbf resolved conflicts for merge of dfce290b to master
Change-Id: I9caace962cb0a697dd99ed92c5f35e57690fdf91
2010-07-29 22:22:36 -07:00
Mathias Agopian
ce49d03aa4 resolved conflicts for merge of 02513855 to master
Change-Id: Ie33d57798d3d5b800edde753dac86de062bc270c
2010-07-29 22:06:44 -07:00
Dianne Hackborn
8952f695a3 Fix crash.
Change-Id: Ie8871376213930f1c57ea5f8e67142daf7fbe089
2010-07-29 19:07:23 -07:00
Dmitri Plotnikov
b2ce481c81 Adding a lookup URI to simplify loading of a contact
This will be initially used by the editor to load
the entire contacts in a consistent manner either
locally or from a Directory.

Change-Id: I0e02b1b35cbbb3c4443063684641c928e5ac5318
2010-07-29 18:28:50 -07:00
Mathias Agopian
dfce290b80 am 04d7e83e: Added SensorManager.getAltitude()
Merge commit '04d7e83e65e246e154b5b346e3eb0081b741ae88' into gingerbread-plus-aosp

* commit '04d7e83e65e246e154b5b346e3eb0081b741ae88':
  Added SensorManager.getAltitude()
2010-07-29 18:21:03 -07:00
Mathias Agopian
0251385553 am 050b5624: Added SensorManager.getMinDelay()
Merge commit '050b56244ff46d43e4886018d7cd20f0b1dc02b9' into gingerbread-plus-aosp

* commit '050b56244ff46d43e4886018d7cd20f0b1dc02b9':
  Added SensorManager.getMinDelay()
2010-07-29 18:20:51 -07:00
Mathias Agopian
04d7e83e65 Added SensorManager.getAltitude()
this is a helper function to calculate the altitude from the
pressure and pressure at sea level.

Change-Id: I3f6f14fee6190388f95afa36a66287e3d59eef9b
2010-07-29 18:18:01 -07:00
Mathias Agopian
050b56244f Added SensorManager.getMinDelay()
Exposed the new "min delay" sensor property through native and
java sensor apis. This allows the caller to know what is the
maximum rate at which a sensor can return events, or, if a sensor
works in "update" mode (events returned only when the value changes).

Also augmented SensorManager.regusterSensorEvent() so that it can
accept a value in microsecond in addition to the 4 constants already
defined.

Change-Id: If425e9979892666df8c989d7de3c362230fa19e0
2010-07-29 18:18:00 -07:00
Vasu Nori
dea9713387 expose more sqlite errors as exceptions
this should help developers figure out what various sqlite errors mean
and possibly programmatically handle them.

Change-Id: I5c313be1b17b6c5171929bf04e19a16ea92bb357
2010-07-29 14:57:08 -07:00
Romain Guy
15d6184be7 am ff74e22b: am ce3ac5f0: Merge "Corrected buffer overflow when parsing /proc/wakelocks"
Merge commit 'ff74e22b59f8157580953fcd69e3c32aa8f68eb2'

* commit 'ff74e22b59f8157580953fcd69e3c32aa8f68eb2':
  Corrected buffer overflow when parsing /proc/wakelocks
2010-07-29 14:36:29 -07:00
Romain Guy
ff74e22b59 am ce3ac5f0: Merge "Corrected buffer overflow when parsing /proc/wakelocks"
Merge commit 'ce3ac5f02970fcab91e16ecb573931d209b1985c' into gingerbread-plus-aosp

* commit 'ce3ac5f02970fcab91e16ecb573931d209b1985c':
  Corrected buffer overflow when parsing /proc/wakelocks
2010-07-29 14:32:34 -07:00
Romain Guy
ce3ac5f029 Merge "Corrected buffer overflow when parsing /proc/wakelocks" 2010-07-29 14:00:48 -07:00
Jeff Brown
b0a57502c6 am 6ec402b5: DO NOT MERGE: Fix input event injection ANRs on UI thread.
Merge commit '6ec402b5ae33c8927694d8522b4cc6a5c8ba974e' into gingerbread-plus-aosp

* commit '6ec402b5ae33c8927694d8522b4cc6a5c8ba974e':
  DO NOT MERGE: Fix input event injection ANRs on UI thread.
2010-07-29 13:09:07 -07:00
Jeff Brown
6ec402b5ae DO NOT MERGE: Fix input event injection ANRs on UI thread.
Added a new asynchronous injection mode and made the existing
synchronization mechanism more robust.

Change-Id: Ia4aa04fd9b75ea2461a844c5b7933c831c1027e6
2010-07-29 12:54:27 -07:00
Jeff Brown
bbda99d208 Fixed StatusBar ANRs due to input event injection on UI thread.
Added a new asynchronous injection mode and made the existing
synchronization mechanism more robust.

Change-Id: I0464f70ff5cbd519dbb02686b2cb5d810fe7dbb2
2010-07-29 12:19:08 -07:00
Chet Haase
8cde663511 Merge "Make the new android.animation package public" 2010-07-29 10:33:47 -07:00
Chet Haase
3b69b6f0be Make the new android.animation package public
Change-Id: Iff31676f25fc989707a1e17fb172296014a22c27
2010-07-29 09:09:05 -07:00
Brian Carlstrom
5e8a587d49 Tracking merge of dalvik-dev to master
Change-Id: Id4c19401ad0aa238219aaf5d9a20d2889d0a4b18
2010-07-28 23:49:30 -07:00
Adam Powell
a66c7b0456 Add support for setting action bar title/subtitle by resource ID
Change-Id: I91b6f56bd3736fd7cc8b82cbbf0b7be2e1c718e5
2010-07-28 18:02:48 -07:00
Chet Haase
f54a8d7c47 Adding xml declarations for new animation framework
Change-Id: Ic789e47790cf24d1c4b3bcbe9048b992ab93517b
2010-07-28 17:22:14 -07:00
Adam Powell
4767928c3e Merge "Add support for setting action mode titles/subtitles by resource ID" 2010-07-28 17:04:56 -07:00
Adam Powell
589f15556b am c6d83caf: am a0ae8bc5: Merge "Fix a bug that could cause flings to last too long using a Scroller" into gingerbread
Merge commit 'c6d83cafed6e60223c28da328f845998e27bfae0'

* commit 'c6d83cafed6e60223c28da328f845998e27bfae0':
  Fix a bug that could cause flings to last too long using a Scroller
2010-07-28 17:01:35 -07:00
Adam Powell
c9ae2a24dc Add support for setting action mode titles/subtitles by resource ID
Change-Id: Ia0d5234cc16f325eeb29127fb87e2616d67379ec
2010-07-28 17:00:02 -07:00
Adam Powell
c6d83cafed am a0ae8bc5: Merge "Fix a bug that could cause flings to last too long using a Scroller" into gingerbread
Merge commit 'a0ae8bc5c62b12269f20cbebdb0d8614e4e8eb1a' into gingerbread-plus-aosp

* commit 'a0ae8bc5c62b12269f20cbebdb0d8614e4e8eb1a':
  Fix a bug that could cause flings to last too long using a Scroller
2010-07-28 16:58:45 -07:00
Adam Powell
1b088be8bb Fix a bug that could cause flings to last too long using a Scroller
Bug 2866552

Change-Id: I6979b3da54ca2aeaf4583629e28ee81fa5bd70da
2010-07-28 16:43:45 -07:00
Gilles Debunne
fc8ae40da0 Merge "Fixed doc typos in HeterogeneousExpandableList.java." 2010-07-28 16:43:07 -07:00
Gilles Debunne
8e364ed01a Fixed doc typos in HeterogeneousExpandableList.java.
Bad links.

Change-Id: I9a596a05494c4d8621e2914357e4052a5cec889a
2010-07-28 16:11:36 -07:00
Dianne Hackborn
42c2936f3c Add PreferenceFragment.
Change-Id: I9b87ec2c15822cca5b460a9a2d589fc24e21a789
2010-07-28 16:06:58 -07:00
Steve Howard
7083c42fff Update Context.getSystemService() docs for download manager.
Change-Id: Ic514b3289b38d6da7d5fe4ffc87c6865280d66d8
2010-07-28 16:01:23 -07:00
Gilles Debunne
db4c6ccf22 Merge "TextView with Selection Contextual Mode" 2010-07-28 15:49:40 -07:00
Gilles Debunne
f788a9fccd TextView with Selection Contextual Mode
Context menu entries have been moved to a contextual mode in the action bar.

Change Input Method has been removed and *should be added to the system bar instead*.

Add word to dictionnary has also been removed and should now be done using the suggestioni
bar "tap on word to add" feature.

Change-Id: I767373f53515b2d6a06500321b4b12ed0b05a9b6
2010-07-28 15:46:35 -07:00
Mike Lockwood
03a545e5ed Merge changes I00d6980a,I814221b4,Id88603a5
* changes:
  CameraBrowser: Launch itself when a camera is attached to USB.
  Send Intents when PTP compatible devices are connected/disconnected to USB
  Give system server permission to access USB.
2010-07-28 14:59:45 -07:00
Jeff Brown
2279971b6f am 9795a25d: am 6d0fec2d: Refactor input reader to support new device types more easily.
Merge commit '9795a25da060f9a7df87da8ab43fb1086d4322a5'

* commit '9795a25da060f9a7df87da8ab43fb1086d4322a5':
  Refactor input reader to support new device types more easily.
2010-07-28 14:27:55 -07:00
Jeff Brown
9795a25da0 am 6d0fec2d: Refactor input reader to support new device types more easily.
Merge commit '6d0fec2de3601821f4f44eeb7d7deedebb2b7117' into gingerbread-plus-aosp

* commit '6d0fec2de3601821f4f44eeb7d7deedebb2b7117':
  Refactor input reader to support new device types more easily.
2010-07-28 14:25:05 -07:00
Jeff Brown
6d0fec2de3 Refactor input reader to support new device types more easily.
Refactored the input reader so that each raw input protocol is handled
by a separate subclass of the new InputMapper type.  This way, behaviors
pertaining to keyboard, trackballs, touchscreens, switches and other
devices are clearly distinguished for improved maintainability.

Added partial support for describing capabilities of input devices
(incomplete and untested for now, will be fleshed out in later commits).

Simplified EventHub interface somewhat since InputReader is taking over
more of the work.

Cleaned up some of the interactions between InputManager and
WindowManagerService related to reading input state.

Fixed swiping finger from screen edge into display area.

Added logging of device information to 'dumpsys window'.

Change-Id: I17faffc33e3aec3a0f33f0b37e81a70609378612
2010-07-28 14:16:15 -07:00
Dan Egnor
127fe81448 am 8190f485: am b350bec5: am 17876aa5: Minor changes to ContentProvider javadoc to improve consistency.
Merge commit '8190f485539c36803489dcf5f198d03ed87ae8f9'

* commit '8190f485539c36803489dcf5f198d03ed87ae8f9':
  Minor changes to ContentProvider javadoc to improve consistency.
2010-07-28 12:44:22 -07:00
Dan Egnor
8190f48553 am b350bec5: am 17876aa5: Minor changes to ContentProvider javadoc to improve consistency.
Merge commit 'b350bec514eb9fee473e4ef62680c53e992dc49b' into gingerbread-plus-aosp

* commit 'b350bec514eb9fee473e4ef62680c53e992dc49b':
  Minor changes to ContentProvider javadoc to improve consistency.
2010-07-28 12:42:16 -07:00
Dan Egnor
b350bec514 am 17876aa5: Minor changes to ContentProvider javadoc to improve consistency.
Merge commit '17876aa586cc9acfb3e5b909c14b9e73537a1a8d' into gingerbread

* commit '17876aa586cc9acfb3e5b909c14b9e73537a1a8d':
  Minor changes to ContentProvider javadoc to improve consistency.
2010-07-28 12:40:16 -07:00
Dan Egnor
17876aa586 Minor changes to ContentProvider javadoc to improve consistency.
Change-Id: I710f618c94ffd5d6368ef04a39ac08f675bec11b
2010-07-28 12:28:04 -07:00
Michael Kolb
48a16ce36e Merge "moved target_content user agent parameter to strings added target content parameter for xlarge screen configuration" 2010-07-28 11:06:50 -07:00
Mike Lockwood
ff0aff1914 Merge "Add new system service CountryDetector" 2010-07-28 11:04:18 -07:00
Chet Haase
0809854580 Merge "Add ability to instantiate PropertyAnimator objects with single "to" value." 2010-07-28 09:06:01 -07:00
Adam Powell
5d27977f9d Action modes without action bar
Change-Id: I0367ab35e598a17980bd373b30828175f6283acc
2010-07-27 21:04:52 -07:00
Romain Guy
85d8daa889 Merge "Generate shaders to cover all possible cases." 2010-07-27 19:53:33 -07:00
Romain Guy
ac670c0433 Generate shaders to cover all possible cases.
With this change, all the vertex and fragment shaders used by the GL
renderer are now generated based on a program description supplied
by the caller. This allows the renderer to generate a large number
of shaders without having to write all the possible combinations by
hand. The generated shaders are stored in a program cache.

Change-Id: If54d286e77ae021c724d42090da476df12a18ebb
2010-07-27 19:52:29 -07:00