94956 Commits

Author SHA1 Message Date
Marco Nelissen
da005f4600 am ff25dd33: am 6791ebde: am 7a4d856c: Merge "Removed offensive music genre"
* commit 'ff25dd337d1f7a079495c0c5f5bb69fd1f97548f':
  Removed offensive music genre
2012-11-05 15:47:32 -08:00
Marco Nelissen
ff25dd337d am 6791ebde: am 7a4d856c: Merge "Removed offensive music genre"
* commit '6791ebde5f951566058cb32d1adb03447876268c':
  Removed offensive music genre
2012-11-05 15:44:00 -08:00
Marco Nelissen
6791ebde5f am 7a4d856c: Merge "Removed offensive music genre"
* commit '7a4d856c881ef48ad590d9e5a0456c94d188898a':
  Removed offensive music genre
2012-11-05 15:41:31 -08:00
Marco Nelissen
7a4d856c88 Merge "Removed offensive music genre" 2012-11-05 14:50:09 -08:00
The Android Open Source Project
09af95d328 am a8d9db48: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'a8d9db48cac077478c715459ee097008b4152eda':
2012-11-05 14:23:43 -08:00
The Android Open Source Project
a8d9db48ca Reconcile with jb-mr1-release - do not merge
Change-Id: Ib9f5712e4d1a5e0f0b4807cffda4769196c64c21
2012-11-05 14:21:22 -08:00
Joe Malin
e0a1a309c9 am 8b1d3162: am 8116ab56: am db426cc0: am 046671af: am fbcfb5d0: am 50c2275c: Android Training: CursorLoader
* commit '8b1d3162d8e764e5dbe43e9012a70e7f713f44da':
  Android Training: CursorLoader
2012-11-05 14:20:16 -08:00
Scott Main
382e2648b4 am fccddd29: am 06b3b0bd: am 44c4bba2: Merge "docs: fix markup error bug: 7456071" into jb-mr1-dev
* commit 'fccddd2965309dcdf84d7d27a6cee40a202093e3':
  docs: fix markup error bug: 7456071
2012-11-05 14:20:12 -08:00
Scott Main
4c105e8558 am e7610cd3: am 0d1a575d: am 737a20fd: Merge "docs: explain implicit permissions applied by sdk versions bug: 7453055" into jb-mr1-dev
* commit 'e7610cd3d30df5b8469aae800f5e7007218f3bfe':
  docs: explain implicit permissions applied by sdk versions bug: 7453055
2012-11-05 14:20:08 -08:00
Amith Yamasani
9071b611d2 am 2aca7ec5: am b3e4c001: am fca8d258: Merge "Remove power menu user switcher" into jb-mr1-dev
* commit '2aca7ec5e1a9ee72e47ad8ab47055934b3dd94fa':
  Remove power menu user switcher
2012-11-05 14:20:04 -08:00
Baligh Uddin
6f9811d94b am a7668cf7: (-s ours) am 21645f82: am 8cf1ea90: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'a7668cf7a112181eec3f2e01881850947049ab3b':
  Import translations. DO NOT MERGE
2012-11-05 14:20:00 -08:00
Baligh Uddin
3698b11179 am 0bd868b8: (-s ours) am 7d38748d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '0bd868b8ef8484cb4cb03219fc5d5b0f788fa33c':
  Import translations. DO NOT MERGE
2012-11-05 14:19:56 -08:00
Joe Malin
8b1d3162d8 am 8116ab56: am db426cc0: am 046671af: am fbcfb5d0: am 50c2275c: Android Training: CursorLoader
* commit '8116ab5677a529a4e54d22f71aee9391aa7c8e2c':
  Android Training: CursorLoader
2012-11-05 14:15:37 -08:00
Scott Main
fccddd2965 am 06b3b0bd: am 44c4bba2: Merge "docs: fix markup error bug: 7456071" into jb-mr1-dev
* commit '06b3b0bd0c5220abd6563c276711e21e353c1320':
  docs: fix markup error bug: 7456071
2012-11-05 14:15:33 -08:00
Scott Main
e7610cd3d3 am 0d1a575d: am 737a20fd: Merge "docs: explain implicit permissions applied by sdk versions bug: 7453055" into jb-mr1-dev
* commit '0d1a575d95041aa7304374c7bd49b01cd936fbd8':
  docs: explain implicit permissions applied by sdk versions bug: 7453055
2012-11-05 14:15:29 -08:00
Amith Yamasani
2aca7ec5e1 am b3e4c001: am fca8d258: Merge "Remove power menu user switcher" into jb-mr1-dev
* commit 'b3e4c0015d742a17e307964f0f370c72b6cabafa':
  Remove power menu user switcher
2012-11-05 14:15:25 -08:00
Baligh Uddin
a7668cf7a1 am 21645f82: am 8cf1ea90: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '21645f8252407dcc1b17d2f2f1e5858b8d55e77b':
  Import translations. DO NOT MERGE
2012-11-05 14:15:22 -08:00
Baligh Uddin
0bd868b8ef am 7d38748d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '7d38748dbe7c8f74411cc6b60ea5707e8de56b43':
  Import translations. DO NOT MERGE
2012-11-05 14:15:21 -08:00
Joe Malin
8116ab5677 am db426cc0: am 046671af: am fbcfb5d0: am 50c2275c: Android Training: CursorLoader
* commit 'db426cc0a695ab699969d0b7750dd79e5922321b':
  Android Training: CursorLoader
2012-11-05 14:12:24 -08:00
Scott Main
06b3b0bd0c am 44c4bba2: Merge "docs: fix markup error bug: 7456071" into jb-mr1-dev
* commit '44c4bba2530b430895ef1c72e8ce2712e8ca9f6e':
  docs: fix markup error bug: 7456071
2012-11-05 14:12:17 -08:00
Scott Main
0d1a575d95 am 737a20fd: Merge "docs: explain implicit permissions applied by sdk versions bug: 7453055" into jb-mr1-dev
* commit '737a20fda62fe9885f74e208ac21a1574c1593f7':
  docs: explain implicit permissions applied by sdk versions bug: 7453055
2012-11-05 14:12:13 -08:00
Amith Yamasani
b3e4c0015d am fca8d258: Merge "Remove power menu user switcher" into jb-mr1-dev
* commit 'fca8d258c5699ad2703d46181c492e78e1dc87a8':
  Remove power menu user switcher
2012-11-05 14:12:04 -08:00
Baligh Uddin
21645f8252 am 8cf1ea90: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '8cf1ea908dbb2c1a1252cecdc6d0f961373502aa':
  Import translations. DO NOT MERGE
2012-11-05 14:11:55 -08:00
Joe Malin
db426cc0a6 am 046671af: am fbcfb5d0: am 50c2275c: Android Training: CursorLoader
* commit '046671afbcbe043f0b2aa4edc42b21fd2abf7586':
  Android Training: CursorLoader
2012-11-05 14:04:09 -08:00
Joe Malin
046671afbc am fbcfb5d0: am 50c2275c: Android Training: CursorLoader
* commit 'fbcfb5d0f899e0b3c89334d43b45907337cf7f36':
  Android Training: CursorLoader
2012-11-05 14:01:46 -08:00
Joe Malin
fbcfb5d0f8 am 50c2275c: Android Training: CursorLoader
* commit '50c2275cff28c4a216f6924584e43cd64b90a3bf':
  Android Training: CursorLoader
2012-11-05 13:59:48 -08:00
Joe Malin
50c2275cff Android Training: CursorLoader
Change-Id: Ia8d723b5ce32002597b9444b8c7eff07b1ab29c8
2012-11-05 13:55:21 -08:00
Igor Murashkin
1a94c7db9f Merge "Updated android.graphics.SurfaceTexture to use wp for FrameAvailableListener" 2012-11-05 13:47:56 -08:00
Scott Main
44c4bba253 Merge "docs: fix markup error bug: 7456071" into jb-mr1-dev 2012-11-05 11:35:24 -08:00
Scott Main
9cc531cc26 docs: fix markup error
bug: 7456071

Change-Id: I3d34a2d6741784d9b33af54afd6d97803720264d
2012-11-05 11:25:17 -08:00
Scott Main
737a20fda6 Merge "docs: explain implicit permissions applied by sdk versions bug: 7453055" into jb-mr1-dev 2012-11-05 11:12:12 -08:00
Amith Yamasani
fca8d258c5 Merge "Remove power menu user switcher" into jb-mr1-dev 2012-11-05 09:31:48 -08:00
Baligh Uddin
0ecc81cfd7 Merge "Import translations. DO NOT MERGE" 2012-11-04 17:48:28 -08:00
Baligh Uddin
7d38748dbe Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-04 17:46:24 -08:00
Baligh Uddin
8cf1ea908d Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-04 17:43:31 -08:00
Dianne Hackborn
8c92c5d6ad am 861a1b80: am 911d47ec: am 2ea9bae7: Fix issue #7457380: IME leaves a mark after user switching
* commit '861a1b8079ed38dda1357b34dffffa549d10871f':
  Fix issue #7457380: IME leaves a mark after user switching
2012-11-03 23:41:58 -07:00
Dianne Hackborn
861a1b8079 am 911d47ec: am 2ea9bae7: Fix issue #7457380: IME leaves a mark after user switching
* commit '911d47ec20e8af8b3139c9e8c5bd0afeea7a226b':
  Fix issue #7457380: IME leaves a mark after user switching
2012-11-03 23:39:33 -07:00
Dianne Hackborn
911d47ec20 am 2ea9bae7: Fix issue #7457380: IME leaves a mark after user switching
* commit '2ea9bae7121f1df5461437d7d08fa550cdf6e0b0':
  Fix issue #7457380: IME leaves a mark after user switching
2012-11-03 23:37:45 -07:00
Marco Nelissen
6b37dc9f66 Merge "Request non-notifying Cursor when querying provider" 2012-11-03 13:42:33 -07:00
Dianne Hackborn
2ea9bae712 Fix issue #7457380: IME leaves a mark after user switching
The gnarly stuff where we keep track of the old input method
window as if it was still there was sitting around leaving things
in a stuck state.  Now we clear this out at key points in the
window manager (freezing screen, user change), and the input
method manager service is less aggressive about asking the window
manager to do it.

Also fixed a problem that was causing flickers during some
wallpaper transitions -- when we are animating two things on
top of the wallpaper and one of them disappears, we need to
make sure the wallpaper target points to whatever the current
target should be (if any), not left pointing to the old target
that has gone away.

Change-Id: I2fb9600f569a5bd5e3528aaf24cde9340af56cb0
2012-11-02 18:56:01 -07:00
The Android Automerger
90264e1bec merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-02 17:34:34 -07:00
Eric Laurent
849a94bf27 Merge "audio service: set dock use on mediaserver restart" 2012-11-02 17:22:07 -07:00
Baligh Uddin
d681e5787e am 6490f42b: am 940e92e1: am 841ce670: Merge commit \'81af21e67cd842d16d4b45e8a2d1ec56ff8d764f\' into jb-mr1-dev
* commit '6490f42be703e17a1d3c49b4fccb49957c6511f2': (26 commits)
  hide the correct text, and more text, on bounce
  Improve PIN key layouts.
  Obscure speech for PIN password keys when no headset plugged in.
  Initial changes to allow dropping on delete target to remove widget.
  hide multiuser selector when IME is up.
  Block swipe up gesture if challenge non-interactive.
  Properly disable challenge handle.
  Disable disable back if using an alternate back icon.
  Disable security handle when swiping into camera widget.
  Import translations. DO NOT MERGE
  Fix small issue with previous CL
  Widget size policy, size callbacks
  Don't show security method until we actually return from the camera
  Fix whitespace problem and sync with prototype.
  PUK support.
  Fix build.
  SIM PIN support.
  Use clock's widget as the default keyguard widget
  Add configurable em-dash separator for all concatenated keyguard strings
  Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)
  ...
2012-11-02 16:56:47 -07:00
Baligh Uddin
6490f42be7 am 940e92e1: am 841ce670: Merge commit \'81af21e67cd842d16d4b45e8a2d1ec56ff8d764f\' into jb-mr1-dev
* commit '940e92e124db5e97427d4c4942ce68d953879060': (26 commits)
  hide the correct text, and more text, on bounce
  Improve PIN key layouts.
  Obscure speech for PIN password keys when no headset plugged in.
  Initial changes to allow dropping on delete target to remove widget.
  hide multiuser selector when IME is up.
  Block swipe up gesture if challenge non-interactive.
  Properly disable challenge handle.
  Disable disable back if using an alternate back icon.
  Disable security handle when swiping into camera widget.
  Import translations. DO NOT MERGE
  Fix small issue with previous CL
  Widget size policy, size callbacks
  Don't show security method until we actually return from the camera
  Fix whitespace problem and sync with prototype.
  PUK support.
  Fix build.
  SIM PIN support.
  Use clock's widget as the default keyguard widget
  Add configurable em-dash separator for all concatenated keyguard strings
  Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)
  ...
2012-11-02 16:53:04 -07:00
Baligh Uddin
940e92e124 am 841ce670: Merge commit \'81af21e67cd842d16d4b45e8a2d1ec56ff8d764f\' into jb-mr1-dev
* commit '841ce670b29180a157a084a9c0e803b13e92020c': (26 commits)
  hide the correct text, and more text, on bounce
  Improve PIN key layouts.
  Obscure speech for PIN password keys when no headset plugged in.
  Initial changes to allow dropping on delete target to remove widget.
  hide multiuser selector when IME is up.
  Block swipe up gesture if challenge non-interactive.
  Properly disable challenge handle.
  Disable disable back if using an alternate back icon.
  Disable security handle when swiping into camera widget.
  Import translations. DO NOT MERGE
  Fix small issue with previous CL
  Widget size policy, size callbacks
  Don't show security method until we actually return from the camera
  Fix whitespace problem and sync with prototype.
  PUK support.
  Fix build.
  SIM PIN support.
  Use clock's widget as the default keyguard widget
  Add configurable em-dash separator for all concatenated keyguard strings
  Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)
  ...
2012-11-02 16:50:29 -07:00
Eric Laurent
bff5ca576e audio service: set dock use on mediaserver restart
Restore forced usage of dock audio for media according to
current setting when media server restarts.

Change-Id: Ie67b80ede1ed92d223dd96de83c1beb985dfba06
2012-11-02 16:48:26 -07:00
Baligh Uddin
841ce670b2 Merge commit '81af21e67cd842d16d4b45e8a2d1ec56ff8d764f' into jb-mr1-dev 2012-11-02 16:46:18 -07:00
Marco Nelissen
8ad76fa7a6 Request non-notifying Cursor when querying provider
This makes a media-rescan about twice as fast.
b/6751354

Change-Id: Iac3b0238f5731a20ecb5d4b34aa1666f7c610268
2012-11-02 16:40:37 -07:00
Jeff Sharkey
728633e2ac am 9b26f158: am 35d0dea3: am 1c743650: Merge "Sanity check network stats coming from disk." into jb-mr1-dev
* commit '9b26f158d55125770bfe8c4534722f2a6a5aeb9a':
  Sanity check network stats coming from disk.
2012-11-02 15:57:53 -07:00
Jeff Sharkey
9b26f158d5 am 35d0dea3: am 1c743650: Merge "Sanity check network stats coming from disk." into jb-mr1-dev
* commit '35d0dea38bad69082f4153d9c335061a70fac4fc':
  Sanity check network stats coming from disk.
2012-11-02 15:54:50 -07:00