99909 Commits

Author SHA1 Message Date
Jean-Michel Trivi
6313cbe1d0 Fix AudioFocus for back-to-back notifications
A single instance of NotificationPlayer will play notifications
 back-to-back, and was, for each requesting AudioFocus. But as
 a new notification was about to be played, its accompanying
 thread was terminated, and the completion listener was never
 called, and therefore AudioFocus was not released (e.g. two
 requests for one release).
 The fix consists in requesting AudioFocus only once and
 abandonning it when the only reported completion is received.
 Added a FIXME note about a better solution to be implemented.

Bug 7680947

Change-Id: Ica9d5c1eb5d57c89ceebe66282af69f0f7d43667
2013-02-13 09:41:10 -08:00
Jean-Michel Trivi
97ad2cd1a8 No AudioFocus for notifications when media played remotely
Don't use AudioFocus when playing a notification when media is
 playing remotely. This behavior may be accompanied by
 rules in the device's audio policy to not route the notifications
 to the remote display.

Bug 7485803

Change-Id: I8b96aa59cace75f6e9a0e73799ef8c75e9ee97aa
2013-02-12 15:30:39 -08:00
Jean-Michel Trivi
d21267a268 Merge "Add support for querying whether the music stream is active remotely" 2013-02-11 19:28:50 +00:00
Fabrice Di Meglio
de1fadfb7f Merge "Fix bug #8115437 Need to remove ArabicShaping from Framework" 2013-02-11 18:51:03 +00:00
Jean-Michel Trivi
679d5046f2 Add support for querying whether the music stream is active remotely
Bug 7485803

Change-Id: I554b44bd35b017fa4030a0d89779066c96594f2b
2013-02-11 10:15:47 -08:00
Craig Mautner
005f6f6077 Merge "Reset SensorEventListener when listener reenabled." 2013-02-11 17:47:14 +00:00
Craig Mautner
eee29c445c Reset SensorEventListener when listener reenabled.
- Following disable and reenable of the WindowOrientationListener
the state was the same as before. State should be reset to default.

- Provide a Handler to the sensor task to deliver events on the
same Thread that WindowManagerPolicy operates on.

- Expand lock protection to all of WindowOrientationListener.

- Move WindowOrientationListener to policy package.

- Make SensorEventListenerImpl non-static.

Fixes bug 7964531.

Change-Id: I17cecf3d0b6d125cb3e4d7350c3adb3f62b684bd
2013-02-11 09:46:08 -08:00
Baligh Uddin
ea2f802928 Import translations. DO NOT MERGE
Change-Id: I5d6b97a7078b930416335dcf016bc820e1f09845
Auto-generated-cl: translation import
2013-02-11 08:12:48 -08:00
Adam Powell
9d1d88acaa Merge "Fix setting action bar backgrounds after layout" 2013-02-09 02:38:01 +00:00
Adam Powell
e8c8ae401b Fix setting action bar backgrounds after layout
Fix a bug that would prevent the drawable bounds from being set
correctly for action bar containers.

Change-Id: I396aa40e3d8f6e3b47bcd438e1f26bbfc7b20a7f
2013-02-08 18:07:19 -08:00
Dianne Hackborn
e2dce85c63 Merge "Fix issue #8133857: Tracking ANR in Gallery" 2013-02-09 01:18:37 +00:00
Dianne Hackborn
50707cc820 Fix issue #8133857: Tracking ANR in Gallery
Reworking the locking in resources so that we never hold the
state lock while calling in to potential long running operations.
This means the mTmpValue can no longer be final (since we need
to use it while the lock isn't held), so a new field needs to
be added as the lock and everything that touches mTmpValue must
deal with it being null, restoring the value in there when
possible, etc.

Change-Id: Ie5ffd0f66e5f2d0e869a62d72e7a55b1c74fe872
2013-02-08 17:18:03 -08:00
Jeff Brown
39938752b3 Fix build break due to merge.
Change-Id: I08c39690ee9de825ff51afc7d102ee622af6ba13
2013-02-08 17:16:31 -08:00
Jeff Brown
eaf2ec0c6a am 4fd60792: am 5262a108: Merge "Complete documentation of whereArgs (Issue #43061)"
# By Tim Roes
# Via Android Git Automerger (1) and others
* commit '4fd60792473711a10dc9b27faa1a35efe9e4d6a0':
  Complete documentation of whereArgs (Issue #43061)
2013-02-08 17:03:42 -08:00
Jeff Brown
d5c921f2cf am 64f4de03: am fa49a6b1: Merge "frameworks/base: Added English UK keyboard layout for physical keyboards"
# By HeyRatFans
# Via Android Git Automerger (1) and others
* commit '64f4de03037b279e389ca20297e9d5086f49564c':
  frameworks/base: Added English UK keyboard layout for physical keyboards
2013-02-08 17:03:38 -08:00
Jeff Brown
4fd6079247 am 5262a108: Merge "Complete documentation of whereArgs (Issue #43061)"
# By Tim Roes
# Via Gerrit Code Review (1) and Tim Roes (1)
* commit '5262a1082663610a888d1145fd9676f7db41d397':
  Complete documentation of whereArgs (Issue #43061)
2013-02-08 16:58:14 -08:00
Jeff Brown
64f4de0303 am fa49a6b1: Merge "frameworks/base: Added English UK keyboard layout for physical keyboards"
# By HeyRatFans
# Via Gerrit Code Review (1) and Matt Beale (1)
* commit 'fa49a6b13ebf496ea01d5981f69084596d06d464':
  frameworks/base: Added English UK keyboard layout for physical keyboards
2013-02-08 16:58:09 -08:00
Jeff Brown
e624e0c704 am 110fe9b3: am fe1f3a1b: Merge "Fix ViewRootImpl to find missing focus using D-pad."
# By Ki-Hwan Lee
# Via Android Git Automerger (1) and others
* commit '110fe9b303be527c30a8af95b6fb7afac12968b5':
  Fix ViewRootImpl to find missing focus using D-pad.
2013-02-08 15:56:04 -08:00
Jeff Brown
5262a10826 Merge "Complete documentation of whereArgs (Issue #43061)" 2013-02-08 23:49:51 +00:00
Jeff Brown
110fe9b303 am fe1f3a1b: Merge "Fix ViewRootImpl to find missing focus using D-pad."
# By Ki-Hwan Lee
# Via Gerrit Code Review (1) and Ki-Hwan Lee (1)
* commit 'fe1f3a1beff9f73f6a04bcc35239038a21bc38ff':
  Fix ViewRootImpl to find missing focus using D-pad.
2013-02-08 15:49:46 -08:00
Jeff Brown
fa49a6b13e Merge "frameworks/base: Added English UK keyboard layout for physical keyboards" 2013-02-08 23:49:11 +00:00
The Android Open Source Project
970b8b3fa9 am 4b71a472: (-s ours) Reconcile with jb-mr1.1-release - do not merge
# Via The Android Automerger (2) and The Android Open Source Project (1)
* commit '4b71a472c0f254606e93b8f9f86f7df0e6dba522':
2013-02-08 15:45:50 -08:00
The Android Open Source Project
4b71a472c0 Reconcile with jb-mr1.1-release - do not merge
Change-Id: I728b304c185d7f0406b6d45334c10263bd38d769
2013-02-08 15:40:41 -08:00
Jeff Brown
fe1f3a1bef Merge "Fix ViewRootImpl to find missing focus using D-pad." 2013-02-08 23:29:11 +00:00
Romain Guy
97dcc20e6d Merge "Deprecate useless BitmapDrawable constructor Bug #2590549" 2013-02-08 22:01:05 +00:00
Romain Guy
7ac40e3869 Deprecate useless BitmapDrawable constructor
Bug #2590549

Change-Id: Icb45bf2d9836c43ed0825105f64d7b98afcdcdac
2013-02-08 14:00:15 -08:00
Romain Guy
dad85fb747 Merge "Apply the clip rect/region to drawLines()" 2013-02-08 21:57:39 +00:00
The Android Automerger
763ef60466 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-02-08 13:51:07 -08:00
Romain Guy
d71ff91dcd Apply the clip rect/region to drawLines()
Without the check to quickReject, drawConvexPath would never
setup the clip properly.

Change-Id: I23e5b25de3383c9e9b86eea4ee7a9552f8d9efb4
2013-02-08 13:46:40 -08:00
Dirk Dougherty
6c971bfac3 am b555029e: am 2e65e20c: am 9b8b4ae5: am f2d89ef9: am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit 'b555029e411498b86efad38a1948e4cfb4f43dd1':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
2013-02-08 11:43:07 -08:00
Marco Nelissen
70a0327abd am 85a1ee30: am b683f354: am 69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
# By Jan Bjernler
# Via Android Git Automerger (2) and Gerrit Code Review (2)
* commit '85a1ee30215190b1782127a6afe323f4df4ef131':
  MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
2013-02-08 11:42:43 -08:00
Tim Murray
21c144480a Merge "Add API entry points for clipped kernels." 2013-02-08 19:28:59 +00:00
Dirk Dougherty
b555029e41 am 2e65e20c: am 9b8b4ae5: am f2d89ef9: am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '2e65e20c761f0fdee98eeefe9a8ee13c95a8b1ff':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
2013-02-08 11:21:03 -08:00
Dirk Dougherty
2e65e20c76 am 9b8b4ae5: am f2d89ef9: am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '9b8b4ae5d7a4f5fbe242f5a2da145fd0fa88ce87':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
2013-02-08 11:17:50 -08:00
Dirk Dougherty
9b8b4ae5d7 am f2d89ef9: am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit 'f2d89ef9d57b096962b802608a88d3483a51d08a':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
2013-02-08 11:16:11 -08:00
Dirk Dougherty
f2d89ef9d5 am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '64ab8fdcb0a3015d3e6c4db0a1d66443085fd673':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
2013-02-08 11:14:23 -08:00
Dirk Dougherty
64ab8fdcb0 Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 2013-02-08 19:10:07 +00:00
Baligh Uddin
63eb2d1089 Import translations. DO NOT MERGE
Change-Id: Ia60bfa7a614e309583df7273a64fdcb1f4d60633
Auto-generated-cl: translation import
2013-02-08 09:54:56 -08:00
Marco Nelissen
85a1ee3021 am b683f354: am 69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
# By Jan Bjernler
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'b683f3542a123a07823b51643b1973507bfb57e2':
  MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
2013-02-08 08:44:36 -08:00
Marco Nelissen
b683f3542a am 69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
# By Jan Bjernler
# Via Gerrit Code Review
* commit '69abccc3cdacee354dec8867865a0577a4e14e63':
  MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
2013-02-08 08:41:20 -08:00
Marco Nelissen
69abccc3cd Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content" 2013-02-08 16:22:09 +00:00
Jan Bjernler
66eb589957 MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
MediaStore.Audio.getContentUriForPath() returns an uri to
internal storage if anything but /mnt/sdcard/ is sent in.
This fix checks if there is an additional sdcard
(normally called ext_card) or usb mass storage attached to
the device and then returns an uri to the external db.
The extra sdcard name and the usb mass storage name info is read from
the system environment variable SECONDARY_STORAGE so if a customer
chooses to change the name this will work as expected.

Change-Id: Ib78bca929fe382d4770df895149a0132f0e56994
2013-02-08 16:17:23 +00:00
Jesse Hall
cd3b804e11 am 93194ffb: am c2edfa2b: am 7c292062: Merge "Process all display events in order"
# Via Android Git Automerger (2) and Gerrit Code Review (2)
* commit '93194ffbf16e051b7bcb696417d3869eee05b7e4':
  Process all display events in order
2013-02-07 20:29:33 -08:00
Jesse Hall
8f87aa0b08 am 5a5cc3dc: am bc18fe85: am fd1c028e: Merge "Handle hotplug events as described instead of rescanning"
# Via Android Git Automerger (2) and Gerrit Code Review (2)
* commit '5a5cc3dcb054716803401149aa1eee0d3cd4a19c':
  Handle hotplug events as described instead of rescanning
2013-02-07 20:29:29 -08:00
Jesse Hall
93194ffbf1 am c2edfa2b: am 7c292062: Merge "Process all display events in order"
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'c2edfa2b9649f67c142b181c54580c015badfca3':
  Process all display events in order
2013-02-07 20:26:27 -08:00
Jesse Hall
5a5cc3dcb0 am bc18fe85: am fd1c028e: Merge "Handle hotplug events as described instead of rescanning"
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'bc18fe851c98dbe6be4eb2655efb1ef95902d961':
  Handle hotplug events as described instead of rescanning
2013-02-07 20:26:23 -08:00
Svetoslav Ganov
5f07028499 Merge "Delay accessibility announcements in the keyguard." 2013-02-08 03:39:23 +00:00
Robert Ly
48e9219e6b am 74e8693d: am ddc0a7bd: am 11fa4460: am 9da9a7cd: am e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '74e8693d310d75e98c5cf62340612d474f6f197b':
  makefile changes for gcm javadocs
2013-02-07 18:03:20 -08:00
Robert Ly
74e8693d31 am ddc0a7bd: am 11fa4460: am 9da9a7cd: am e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit 'ddc0a7bdf94f4ba84dd4b89b693eb148ff32b5d3':
  makefile changes for gcm javadocs
2013-02-07 18:01:17 -08:00
Robert Ly
ddc0a7bdf9 am 11fa4460: am 9da9a7cd: am e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '11fa446033a8600b681efeb857507388e8113d72':
  makefile changes for gcm javadocs
2013-02-07 17:57:57 -08:00