8862 Commits

Author SHA1 Message Date
Daniel Sandler
c82b4e80b8 am 69a4817e: Immersive activity API.
Merge commit '69a4817e3e1e368e758ff8c238deb5ee26963c04' into gingerbread-plus-aosp

* commit '69a4817e3e1e368e758ff8c238deb5ee26963c04':
  Immersive activity API.
2010-06-23 13:36:25 -07:00
Daniel Sandler
69a4817e3e Immersive activity API.
An Activity can declare itself to be "immersive" either by
setting android:immersive="true" in AndroidManifest or by
calling setImmersive(true).

Immersive activities "should" not be interrupted, for
example by Notifications with an associated
fullScreenIntent. (In the future we may even prevent any
non-system application from successfully calling
startActivity() if the foreground activity is immersive.)
Notifications with FLAG_HIGH_PRIORITY set will be shown to
the user in some less-obtrusive way if the frontmost
activity is immersive.

Change-Id: I8d0c25cc4e22371c27cbf2bb6372d2c95d57b2d7
2010-06-23 16:29:36 -04:00
Adam Powell
bc337d2f67 am 73ccafb5: Merge "Fix a bug where requestDisallowInterceptTouchEvent does not get called when scrolling is resumed after stopping a fling." into gingerbread
Merge commit '73ccafb5b843cdcf9c8f761fc72a69b4b7942aaf' into gingerbread-plus-aosp

* commit '73ccafb5b843cdcf9c8f761fc72a69b4b7942aaf':
  Fix a bug where requestDisallowInterceptTouchEvent does not get called
2010-06-23 10:28:00 -07:00
Adam Powell
110486f932 Fix a bug where requestDisallowInterceptTouchEvent does not get called
when scrolling is resumed after stopping a fling.

Change-Id: I6796c5082cb81b3116de5baf1f27fe3addb40d00
2010-06-22 17:14:44 -07:00
Dianne Hackborn
e3e2883f22 am e24a60aa: Merge "First stab at attaching native event dispatching." into gingerbread
Merge commit 'e24a60aa4670fb835772b23ff665bb368fa65e30' into gingerbread-plus-aosp

* commit 'e24a60aa4670fb835772b23ff665bb368fa65e30':
  First stab at attaching native event dispatching.
2010-06-22 11:26:02 -07:00
Dianne Hackborn
a95e4cb62f First stab at attaching native event dispatching.
Provides the basic infrastructure for a
NativeActivity's native code to get an object representing
its event stream that can be used to read input events.

Still work to do, probably some API changes, and reasonable
default key handling (so that for example back will still
work).

Change-Id: I6db891bc35dc9683181d7708eaed552b955a077e
2010-06-22 11:21:50 -07:00
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
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
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
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
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
Christian Mehlmauer
e6af73e18e Replaced deprecated Inten.toURI method
Change-Id: Iff3200294edbc1cac188502219bfe481133a5d8e
2010-06-14 15:47:15 -07:00
Brad Fitzpatrick
92dd85d02a am 742b282e: Merge "StrictMode: implement the log-to-DropBox option" into gingerbread
Merge commit '742b282e1168ed3820cb549a89753f39f4de0fa6' into gingerbread-plus-aosp

* commit '742b282e1168ed3820cb549a89753f39f4de0fa6':
  StrictMode: implement the log-to-DropBox option
2010-06-14 15:21:21 -07:00
Brad Fitzpatrick
742b282e11 Merge "StrictMode: implement the log-to-DropBox option" into gingerbread 2010-06-14 15:19:51 -07:00
Dianne Hackborn
13792057e4 am 7e900cbf: Merge "Update build version information." into gingerbread
Merge commit '7e900cbf1d600a8895e63a0247f45c116ff05172' into gingerbread-plus-aosp

* commit '7e900cbf1d600a8895e63a0247f45c116ff05172':
  Update build version information.
2010-06-14 14:13:07 -07:00
Dianne Hackborn
7e900cbf1d Merge "Update build version information." into gingerbread 2010-06-14 14:10:43 -07:00
Dianne Hackborn
3e03cfa3af Update build version information.
Change-Id: If53f16d494255230859a30f561e9a78ec49c6c10
2010-06-14 14:08:20 -07:00
Brad Fitzpatrick
143666f0ca StrictMode: implement the log-to-DropBox option
Change-Id: I51d12e264155078f953028241f8c5cbdc47262e8
2010-06-14 13:38:01 -07:00
The Android Open Source Project
864c68ea45 merge from froyo-plus-aosp
Change-Id: I9cede57e10df9d6ba411b2960a77d7b9b60a1489
2010-06-14 11:35:51 -07:00
The Android Open Source Project
d7b814188d merge from open-source master
Change-Id: Ica77cebdbb8880345faeb1ee819f51b0b7ff7a0c
2010-06-14 11:07:32 -07:00
The Android Open Source Project
51a9839ec6 merge from open-source master
Change-Id: I7a9f23192372fc6973d9f3eb399f895f4765f6b2
2010-06-14 11:06:33 -07:00
The Android Open Source Project
ea1647aff1 merge from open-source master
Change-Id: I5d19eb677dcfc7b73919d659fafb29fb85dc7f47
2010-06-14 10:57:53 -07:00
Jean-Baptiste Queru
4bd0073299 Merge "replaced deprecated getIntent with parseURI" 2010-06-14 10:28:23 -07:00
Brad Fitzpatrick
6b9b8806af am 60e8c33d: Merge "Dropbox: remove redundant Entry construction." into gingerbread
Merge commit '60e8c33d6f6caad2e963e91abca16a85cd3be82a' into gingerbread-plus-aosp

* commit '60e8c33d6f6caad2e963e91abca16a85cd3be82a':
  Dropbox: remove redundant Entry construction.
2010-06-14 09:34:22 -07:00
Jean-Baptiste Queru
5978bcc32b Merge "Added an addAll to the ArrayAdapter" 2010-06-14 09:27:14 -07:00
Brad Fitzpatrick
14418945bd Dropbox: remove redundant Entry construction.
Change-Id: I55d8da82acea7f1cf0a69912fe5d4d46d704b570
2010-06-14 08:58:26 -07:00
Jean-Baptiste Queru
a2e2d20256 Merge "Should accept "application/vnd.wap.multipart.alternative" message." 2010-06-14 08:56:49 -07:00