Commit Graph

10705 Commits

Author SHA1 Message Date
Daniel Sandler
57b5326561 am ef730e6e: Merge "Fix javadocs." into gingerbread
Merge commit 'ef730e6ececa96a3e0576140eea707f7c48cd66c' into gingerbread-plus-aosp

* commit 'ef730e6ececa96a3e0576140eea707f7c48cd66c':
  Fix javadocs.
2010-06-22 11:10:18 -07:00
Daniel Sandler
8091ca5015 Fix javadocs.
Change-Id: Ic37c16625ddd0175cc048dd2b22bc75c6962d43d
2010-06-22 13:58:46 -04:00
Daniel Sandler
71764c4ce5 am 613dde4a: Revised "immersive mode" API.
Merge commit '613dde4aa651e11dac3db859723cc6faf8fc0a82' into gingerbread-plus-aosp

* commit '613dde4aa651e11dac3db859723cc6faf8fc0a82':
  Revised "immersive mode" API.
2010-06-22 09:36:07 -07:00
Daniel Sandler
613dde4aa6 Revised "immersive mode" API.
No longer a window bit, FLAG_IMMERSIVE is now set on
ActivityInfo.flags and in the Activity's manifest as
android:immersive="true" (ActivityInfo).

[An "immersive" activity is one that wishes to avoid being
paused by full-screen notifications (like an incoming call).
An activity that sets FLAG_IMMERSIVE/android:immersive is
sending a signal to the notification manager, status bar,
etc. that they should try to find some other way to get the
user's attention in high-priority situations.]

[Originally: change Ie290c2e.]

Change-Id: I967bb10b930b8f0772b10f81f2957a03fa3f1736
2010-06-22 12:30:12 -04:00
Mike Lockwood
dae19d7c00 am aaf39f84: Merge "GPS: remove GpsEventThread from GpsLocationProvider" into gingerbread
Merge commit 'aaf39f84063b8fee51bcdb0731d68c328b6a3c3d' into gingerbread-plus-aosp

* commit 'aaf39f84063b8fee51bcdb0731d68c328b6a3c3d':
  GPS: remove GpsEventThread from GpsLocationProvider
2010-06-22 06:45:03 -07:00
Mike Lockwood
aaf39f8406 Merge "GPS: remove GpsEventThread from GpsLocationProvider" into gingerbread 2010-06-22 06:44:03 -07:00
Mike Lockwood
f602d362ba GPS: remove GpsEventThread from GpsLocationProvider
Rather than polling for events from the native code in an event thread,
we now require the GPS HAL libraries to call our callbacks from a thread
that is registered with the JVM to call directly into Java.
This eliminates a thread from our code and removes one step in the chain
of message passing from the GPS to the Location Manager client.

Change-Id: I2745a157690310ba9a699a8369f54a7366c6b1ba
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-22 09:26:41 -04:00
Jack Palevich
1e08cc1dfd am 224107a4: Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
Merge commit '224107a421e2611b15d1ec736df54bca9ee3e78d' into gingerbread-plus-aosp

* commit '224107a421e2611b15d1ec736df54bca9ee3e78d':
  Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
2010-06-22 05:16:24 -07:00
Jack Palevich
224107a421 Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
Change-Id: Id0069535e97fe96eef74e4d0c1d19b010061fe3b
2010-06-22 20:08:40 +08:00
Mathias Agopian
bf9009396b am 7e73a2ce: Merge "Improve SensorManager documentation" into gingerbread
Merge commit '7e73a2ce17740abd028d9944c423e191e5b4854c' into gingerbread-plus-aosp

* commit '7e73a2ce17740abd028d9944c423e191e5b4854c':
  Improve SensorManager documentation
2010-06-21 15:12:14 -07:00
Mathias Agopian
7e73a2ce17 Merge "Improve SensorManager documentation" into gingerbread 2010-06-21 15:10:13 -07:00
Jeff Brown
b1efc3f682 am 7fbdc84e: More native input event dispatching.
Merge commit '7fbdc84e87dd3a0e196b9803bb04495d11e9cb8a' into gingerbread-plus-aosp

* commit '7fbdc84e87dd3a0e196b9803bb04495d11e9cb8a':
  More native input event dispatching.
2010-06-21 14:06:31 -07:00
Jeff Brown
7fbdc84e87 More native input event dispatching.
Added ANRs handling.
Added event injection.
Fixed a NPE ActivityManagerServer writing ANRs to the drop box.
Fixed HOME key interception.
Fixed trackball reporting.
Fixed pointer rotation in landscape mode.

Change-Id: I50340f559f22899ab924e220a78119ffc79469b7
2010-06-21 13:59:34 -07:00
The Android Open Source Project
6c9a30045b merge from froyo-plus-aosp
Change-Id: I36dd4460cae6e3212d724e70ff1091cb791670cd
2010-06-21 11:23:45 -07:00
Kenny Root
0fcfa0a53f am f25c560d: am 30cf330f: Import revised translations
Merge commit 'f25c560dcdc0c04e11152fff11f521dae03522cd' into gingerbread-plus-aosp

* commit 'f25c560dcdc0c04e11152fff11f521dae03522cd':
  Import revised translations
2010-06-21 11:20:28 -07:00
Kenny Root
f25c560dcd am 30cf330f: Import revised translations
Merge commit '30cf330fae137587d51aa4c026459db146705ba9' into gingerbread

* commit '30cf330fae137587d51aa4c026459db146705ba9':
  Import revised translations
2010-06-21 11:17:07 -07:00
Kenny Root
30cf330fae Import revised translations
Change-Id: I4b91aea9c53332569a7123fdb32141530ede6d3d
2010-06-21 11:03:50 -07:00
Kenny Root
b2ce04c2ea am cfe3d205: am c4e38577: Import revised translations
Merge commit 'cfe3d205b065502eecc460f7713de90e19d4ab4b' into gingerbread-plus-aosp

* commit 'cfe3d205b065502eecc460f7713de90e19d4ab4b':
  Import revised translations
2010-06-21 09:08:51 -07:00
Kenny Root
cfe3d205b0 am c4e38577: Import revised translations
Merge commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17' into gingerbread

* commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17':
  Import revised translations
2010-06-21 09:02:13 -07:00
Kenny Root
c4e38577f4 Import revised translations
Change-Id: Ife82312cc21acc144a70718f79afcafbdd7eda7a
2010-06-20 18:54:45 -07:00
Daniel Sandler
fddf19f671 am a2650db7: Merge "Fix SDK docs build." into gingerbread
Merge commit 'a2650db770e93a9424d6d6948fd31f943f6dac49' into gingerbread-plus-aosp

* commit 'a2650db770e93a9424d6d6948fd31f943f6dac49':
  Fix SDK docs build.
2010-06-17 19:16:28 -07:00
Daniel Sandler
a2650db770 Merge "Fix SDK docs build." into gingerbread 2010-06-17 19:14:44 -07:00
Daniel Sandler
ae069f76ee Fix SDK docs build.
Change-Id: I2d11682cdf2cdcd48f0299f8c168fddd5994dc65
2010-06-17 21:56:26 -04:00
Jeff Brown
42bb545a54 am 5c225b16: Even more native input dispatch work in progress.
Merge commit '5c225b1680e696ae8bbf505a1997d6f720672f74' into gingerbread-plus-aosp

* commit '5c225b1680e696ae8bbf505a1997d6f720672f74':
  Even more native input dispatch work in progress.
2010-06-17 13:31:07 -07:00
Jeff Brown
5c225b1680 Even more native input dispatch work in progress.
Added more tests.
Fixed a regression in Vector.
Fixed bugs in pointer tracking.
Fixed a starvation issue in PollLoop when setting or removing callbacks.
Fixed a couple of policy nits.

Modified the internal representation of MotionEvent to be more
efficient and more consistent.

Added code to skip/cancel virtual key processing when there are multiple
pointers down.  This helps to better disambiguate virtual key presses
from stray touches (such as cheek presses).

Change-Id: I2a7d2cce0195afb9125b23378baa94fd2fc6671c
2010-06-17 13:27:16 -07:00
Daniel Sandler
747f75dc08 am 3a0146cd: Merge "New API for "immersive" activity windows." into gingerbread
Merge commit '3a0146cd29fae3c5bc29d8d535d67826284f8cc9' into gingerbread-plus-aosp

* commit '3a0146cd29fae3c5bc29d8d535d67826284f8cc9':
  New API for "immersive" activity windows.
2010-06-17 13:26:03 -07:00
Daniel Sandler
04b4f781b1 am cc86c933: Merge "New API for high-priority Notifications and full-screen alerts." into gingerbread
Merge commit 'cc86c933f69e4c1d55e0f4f49936d04fb60d6bcf' into gingerbread-plus-aosp

* commit 'cc86c933f69e4c1d55e0f4f49936d04fb60d6bcf':
  New API for high-priority Notifications and full-screen alerts.
2010-06-17 13:25:56 -07:00
Daniel Sandler
611fae4c39 New API for "immersive" activity windows.
An "immersive" activity (as indicated by the new
FLAG_IMMERSIVE) is one that wishes to avoid being paused by
full-screen notifications (like an incoming call).
An activity that sets FLAG_IMMERSIVE on its window is
sending a signal to the notification manager, status bar,
etc. that they should try to find some other way to get the
user's attention in high-priority situations.

FLAG_IMMERSIVE should be used exclusively in conjunction
with FLAG_FULL_SCREEN (that is, only activities that hide
the status bar should consider themselves immersive).

Change-Id: Ie290c2e92fc391bcf55edfdb1fbd626cd284e3e2
2010-06-17 11:43:35 -04:00
Daniel Sandler
e46cbd379a New API for high-priority Notifications and full-screen alerts.
* fullScreenIntent: a PendingIntent pointing to a
  full-screen activity or other modal alert experience to be
  shown to the user instead of (or in addition to) a
  traditional status bar notification icon. Example: An
  incoming call should pop up a full-screen activity
  allowing the user to accept or decline the call.

  The old way to accomplish this is to simply fire off the
  full-screen intent directly from the Phone app. By routing
  through the Notification system, we make way for the
  FLAG_IMMERSIVE bit (forthcoming API) which would allow the
  frontmost opaque window to suppress full-screen alerts.

* FLAG_HIGH_PRIORITY: This bit allows a notification to be
  shown in windows that have the FLAG_IMMERSIVE bit set. For
  example, a Notification corresponding to an incoming call
  would be marked HIGH_PRIORITY so that even in an immersive
  activity (i.e. a networked game) the Notification could be
  shown to the user.

Change-Id: I4943e53f425800a6e152bc4992dd41586b43aff8
2010-06-17 11:34:13 -04:00
Mathias Agopian
74cde2cee9 Improve SensorManager documentation
this pass is mostly just formating.

Change-Id: Ica7dd014c301817c93e915c08b16da99769eaabb
2010-06-16 18:55:46 -07:00
Dianne Hackborn
9a1034aa97 am 6b7b4845: Various improvements to battery stats collection
Merge commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb' into gingerbread-plus-aosp

* commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb':
  Various improvements to battery stats collection
2010-06-16 18:49:28 -07:00
Dianne Hackborn
6b7b484521 Various improvements to battery stats collection
We now clear the battery stats when unplugging after the
battery is full.  This allows us to use the "total" stats as
a new "since last charged" stat.  Total is gone.  I never used
it, it was worthless.  Since last charged is a lot more
interesting.

The battery history now collects a lot more stats, and keeps
control over how much it can collect.  Printing is now more
descriptive.

The kinds of stats have been renamed to SINCE_UNPLUGGED and
SINCE_DISCHARGED.  The other two stats are still there, but
no longer printed; a future change will eliminate them
completely along with all of their state.

Change-Id: I4e9fcfcf8c30510092c76a8594f6021e9502fbc1
2010-06-16 18:31:42 -07:00
Brett Chabot
685fcf364b am c95812e6: Merge "Move out all framework-tests classes." into gingerbread
Merge commit 'c95812e6cacaa14748c81323bac6561453991a24' into gingerbread-plus-aosp

* commit 'c95812e6cacaa14748c81323bac6561453991a24':
  Move out all framework-tests classes.
2010-06-16 14:41:00 -07:00
Brett Chabot
c95812e6ca Merge "Move out all framework-tests classes." into gingerbread 2010-06-16 14:39:41 -07:00
Jeff Brown
2dfd2aa413 am 92266a78: Merge "More work in progress on native events." into gingerbread
Merge commit '92266a7894becc1cdf2298fd02380749ab036131' into gingerbread-plus-aosp

* commit '92266a7894becc1cdf2298fd02380749ab036131':
  More work in progress on native events.
2010-06-15 16:48:23 -07:00
Jeff Brown
92266a7894 Merge "More work in progress on native events." into gingerbread 2010-06-15 16:44:23 -07:00
Jeff Brown
9c3cda04d9 More work in progress on native events.
Refactored the code to eliminate potential deadlocks due to re-entrant
calls from the policy into the dispatcher.  Also added some plumbing
that will be used to notify the framework about ANRs.

Change-Id: Iba7a10de0cb3c56cd7520d6ce716db52fdcc94ff
2010-06-15 16:43:18 -07:00
Wei Huang
5907ffa453 am a6c52938: Merge "add new video/audio presence icons in the framework resource dirs, and make them public." into gingerbread
Merge commit 'a6c52938b144c2bbd8c1e22d24629b12e35c99a3' into gingerbread-plus-aosp

* commit 'a6c52938b144c2bbd8c1e22d24629b12e35c99a3':
  add new video/audio presence icons in the framework resource dirs, and make them public.
2010-06-15 15:36:41 -07:00
Wei Huang
a6c52938b1 Merge "add new video/audio presence icons in the framework resource dirs, and make them public." into gingerbread 2010-06-15 15:34:06 -07:00
Wei Huang
2b24ecfbb2 add new video/audio presence icons in the framework resource dirs, and make them public.
- add definitions for

presence_video_away
presence_video_busy
presence_video_online
presence_audio_away
presence_audio_busy
presence_audio_online

in the public.xml, and update current.xml

- the actual icons for the audio versions are not yet done, so I used the video versions as placeholders.

Change-Id: I9e2be5dd05619cbdbbb61dc231e9da1984ddbb36
2010-06-15 15:19:40 -07:00
The Android Open Source Project
7d10df4e24 merge from open-source master
Change-Id: I0684cac9eb230d864614aef0634c072f4e3ef6a3
2010-06-15 11:37:17 -07:00
Scott Main
fb48f3a25d am e4bca7ee: am 322e7e47: Merge "docs: fix markup error" into froyo
Merge commit 'e4bca7ee60c6d361ef9f1f025881a6f80a9efdab' into gingerbread-plus-aosp

* commit 'e4bca7ee60c6d361ef9f1f025881a6f80a9efdab':
  docs: fix markup error
2010-06-15 10:47:21 -07:00
Scott Main
b860fd11e9 am 322e7e47: Merge "docs: fix markup error" into froyo
Merge commit '322e7e477d89aca18d65cbd289343e716c45a699' into froyo-plus-aosp

* commit '322e7e477d89aca18d65cbd289343e716c45a699':
  docs: fix markup error
2010-06-15 10:45:50 -07:00
Scott Main
e4bca7ee60 am 322e7e47: Merge "docs: fix markup error" into froyo
Merge commit '322e7e477d89aca18d65cbd289343e716c45a699' into gingerbread

* commit '322e7e477d89aca18d65cbd289343e716c45a699':
  docs: fix markup error
2010-06-15 10:42:52 -07:00
Szymon Jakubczak
9bf3bb21c0 - updates NetUtils to use new libnetutils headers
- updates WifiStateTracker to track net.XXX.dnsX properties for name servers
- removes dhcp from WifiNative (use NetworkUtils instead)

Change-Id: Ic69ff253e8784cad34e9291e7970ee38bfa235b9
2010-06-15 10:22:25 -07:00
The Android Open Source Project
a191eb013a Fix build
This file was brought back to life by mistaken when merging from
a branch where it was modified into a branch where it had been
deleted

Change-Id: I406c6ced978abfdd59684f14bc9dd53ee7968aae
2010-06-15 09:59:15 -07:00
The Android Open Source Project
4138677a72 merge from open-source master
Change-Id: I405069e9495e43fdcdedc41efce77d43a291272c
2010-06-15 09:30:31 -07:00
Mathias Agopian
5126633a3e am 2d468c5d: Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.
Merge commit '2d468c5d73cc1cefbcfa8d98e30622c54756918c' into gingerbread-plus-aosp

* commit '2d468c5d73cc1cefbcfa8d98e30622c54756918c':
  Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.
2010-06-14 22:00:40 -07:00
Mathias Agopian
2d468c5d73 Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.
this is needed for backward compatibility with somewhat buggy applications.
not a big deal, since the app can request another format explicitely.

Change-Id: Ic73f8acedf94ffc0115637efac28fa8ffaa7e5a4
2010-06-14 21:56:34 -07:00
Brett Chabot
be81f4f15d Move out all framework-tests classes.
Previously tests/framework-tests contained a quarantined set of test classes
that needed access to package-private framework api. Running these tests
normally would cause the dalvik verifier to throw errors.

runtest now has support for turning off the dalvik verifier for frameworks
tests, so move this tests into their recommended location, close to the source
being tested.

Also move policy source into a 'src' folder to accommodate the tests move.

Change-Id: I62f839da185a55bc553b653bf583fd99da438512
2010-06-14 17:23:08 -07:00