94909 Commits

Author SHA1 Message Date
Marco Nelissen
6b37dc9f66 Merge "Request non-notifying Cursor when querying provider" 2012-11-03 13:42:33 -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
Jeff Sharkey
35d0dea38b am 1c743650: Merge "Sanity check network stats coming from disk." into jb-mr1-dev
* commit '1c743650addb9f632dd3eb39d4b17109ee4171f5':
  Sanity check network stats coming from disk.
2012-11-02 15:52:44 -07:00
Jeff Sharkey
1c743650ad Merge "Sanity check network stats coming from disk." into jb-mr1-dev 2012-11-02 15:49:20 -07:00
Jeff Sharkey
b0a579f833 Sanity check network stats coming from disk.
Throw early when structure is unstable, which allows the normal
recoverFromWtf() path to recover automatically.

Bug: 7440485
Change-Id: Ic150d17daac4de7c9ff3489025403a9b485b4620
2012-11-02 15:38:15 -07:00
Amith Yamasani
22f053a729 am e3826fcc: am 617404a4: am e96e0a1a: Merge "Resolve USER_ALL when inflating notification views." into jb-mr1-dev
* commit 'e3826fccde78bf3e6953910fdf8d43926e40423f':
  Resolve USER_ALL when inflating notification views.
2012-11-02 15:35:31 -07:00
Amith Yamasani
e3826fccde am 617404a4: am e96e0a1a: Merge "Resolve USER_ALL when inflating notification views." into jb-mr1-dev
* commit '617404a4f62c0f56e50c495f118b21aa7d6a69b6':
  Resolve USER_ALL when inflating notification views.
2012-11-02 15:33:19 -07:00
Amith Yamasani
617404a4f6 am e96e0a1a: Merge "Resolve USER_ALL when inflating notification views." into jb-mr1-dev
* commit 'e96e0a1a759a524072cc3fb1dfd3ec01e18ef67f':
  Resolve USER_ALL when inflating notification views.
2012-11-02 15:30:19 -07:00
Amith Yamasani
e96e0a1a75 Merge "Resolve USER_ALL when inflating notification views." into jb-mr1-dev 2012-11-02 15:26:37 -07:00
Laurent Tu
63536333fd am cafeb3d4: am cc220364: am 685cc8c7: Merge "Decrement number of updates in LocationRequest" into jb-mr1-dev
* commit 'cafeb3d4949bd22787e0ff87e8551aca4cd561b7':
  Decrement number of updates in LocationRequest
2012-11-02 15:24:00 -07:00
Laurent Tu
cafeb3d494 am cc220364: am 685cc8c7: Merge "Decrement number of updates in LocationRequest" into jb-mr1-dev
* commit 'cc2203649457985cdcf9e4d3336ed2da5aa657d2':
  Decrement number of updates in LocationRequest
2012-11-02 15:21:51 -07:00
Laurent Tu
cc22036494 am 685cc8c7: Merge "Decrement number of updates in LocationRequest" into jb-mr1-dev
* commit '685cc8c7cba0bef5257bf00e9821e82a2dbbfc91':
  Decrement number of updates in LocationRequest
2012-11-02 15:18:44 -07:00
Dianne Hackborn
38e7f2e176 am 27b8cf60: am 43738e25: am 8ae0420e: Merge "Fix issue #7343200: Fails to show wallpaper in the background for..." into jb-mr1-dev
* commit '27b8cf6069a85f923e3d334c9388ba150f79da16':
  Fix issue #7343200: Fails to show wallpaper in the background for...
2012-11-02 15:18:43 -07:00
Dianne Hackborn
27b8cf6069 am 43738e25: am 8ae0420e: Merge "Fix issue #7343200: Fails to show wallpaper in the background for..." into jb-mr1-dev
* commit '43738e25d1d5b89dfca44f19bd3d5fa066628dae':
  Fix issue #7343200: Fails to show wallpaper in the background for...
2012-11-02 15:16:38 -07:00
Laurent Tu
685cc8c7cb Merge "Decrement number of updates in LocationRequest" into jb-mr1-dev 2012-11-02 15:15:28 -07:00
Raph Levien
5fc949d0ae am e5a4e92f: am fd06d34c: am d9134e7a: Merge "Revert partial RTL\'ization of Editor.setError()" into jb-mr1-dev
* commit 'e5a4e92f175e7a776ba4703a09b68de562060e1f':
  Revert partial RTL'ization of Editor.setError()
2012-11-02 15:13:43 -07:00
Dianne Hackborn
43738e25d1 am 8ae0420e: Merge "Fix issue #7343200: Fails to show wallpaper in the background for..." into jb-mr1-dev
* commit '8ae0420e4b4169855608d404e389a66ce7253a36':
  Fix issue #7343200: Fails to show wallpaper in the background for...
2012-11-02 15:13:22 -07:00
Raph Levien
e5a4e92f17 am fd06d34c: am d9134e7a: Merge "Revert partial RTL\'ization of Editor.setError()" into jb-mr1-dev
* commit 'fd06d34c199903c6aa514ba5a633d6af1d972c54':
  Revert partial RTL'ization of Editor.setError()
2012-11-02 15:10:47 -07:00
Dianne Hackborn
8ae0420e4b Merge "Fix issue #7343200: Fails to show wallpaper in the background for..." into jb-mr1-dev 2012-11-02 15:10:16 -07:00
Raph Levien
fd06d34c19 am d9134e7a: Merge "Revert partial RTL\'ization of Editor.setError()" into jb-mr1-dev
* commit 'd9134e7aa1679878245b67ed1a318acb19d0c717':
  Revert partial RTL'ization of Editor.setError()
2012-11-02 15:08:32 -07:00
Raph Levien
d9134e7aa1 Merge "Revert partial RTL'ization of Editor.setError()" into jb-mr1-dev 2012-11-02 15:05:08 -07:00
Geremy Condra
49549f5bff am d61f6e96: am d91e759f: am 0600ab78: am b14c9900: am a295ba44: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev
* commit 'd61f6e96dbf062d9010c301d42b04c0d08343556':
  Change android.permission.SERIAL_PORT to signature|system.
2012-11-02 14:34:16 -07:00
Geremy Condra
d61f6e96db am d91e759f: am 0600ab78: am b14c9900: am a295ba44: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev
* commit 'd91e759f709014d6d7ba11f194115465f4e9a88d':
  Change android.permission.SERIAL_PORT to signature|system.
2012-11-02 14:31:43 -07:00
Geremy Condra
d91e759f70 am 0600ab78: am b14c9900: am a295ba44: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev
* commit '0600ab78354894e0a8559dc8eacefbef02d1249b':
  Change android.permission.SERIAL_PORT to signature|system.
2012-11-02 14:29:19 -07:00
Geremy Condra
0600ab7835 am b14c9900: am a295ba44: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev
* commit 'b14c9900cbbaca6361030d8fc8d6515cc9e06e10':
  Change android.permission.SERIAL_PORT to signature|system.
2012-11-02 14:26:34 -07:00
Geremy Condra
b14c9900cb am a295ba44: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev
* commit 'a295ba44793e5601c8574bdcb07313420aa6500c':
  Change android.permission.SERIAL_PORT to signature|system.
2012-11-02 14:22:31 -07:00
Dianne Hackborn
98129739af Fix issue #7343200: Fails to show wallpaper in the background for...
...lockscreen sometimes and remains black / blank

The problem was that we were using the animation-side wallpaper state
in cases where it was not updated yet.

The mWallpaperTarget variable is propagated over to the animation
side when the main window manager state updates.  On the animation
side, this is used by hideWallpapersLocked() to determine if the
current wallpaper should be hidden.

The problem is that various paths to hideWallpapersLocked() can
come from the layout side of the window manager instead of the
animation side.  This causes the problem here because in this case
the wallpaper state may not have yet been propagated to the
animation side, so it could incorrectly decide to hide the wallpaper
because it thinks there is not a target when in fact a target is
set in the layout side.  This won't get fixed until some time way
later that the layout side decides that a new window is being shown
that may need to have the wallpaper shown.

The fix here is pretty gross, but as safe as possible -- the
hideWallpapersLocked() function now uses either the animation or
layout wallpaper state depending on where the call to it is coming
from.

Change-Id: I9250bfeae6e11c1761760bcc696fdb33fb5c8a5f
2012-11-02 14:19:59 -07:00
Geremy Condra
a295ba4479 Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev 2012-11-02 14:19:46 -07:00
Chris Wren
81af21e67c Merge "hide the correct text, and more text, on bounce" into jb-mr1-lockscreen-dev 2012-11-02 13:28:57 -07:00
Chris Wren
052999f3c9 hide the correct text, and more text, on bounce
Bug: 7464865
Change-Id: I39dc6f06ce0403a29e4802fcc5288788cffb6070
2012-11-02 16:28:18 -04:00
Daniel Sandler
a96cd636ec Merge "Improve PIN key layouts." into jb-mr1-lockscreen-dev 2012-11-02 12:34:16 -07:00
Daniel Sandler
80bc85a791 Improve PIN key layouts.
- space between digit and mnemonics
 - better center the (left-aligned) text in its container
 - nudge the enter arrow a little to the left in its
   container
 - add missing contentDescriptions for SIMPIN/PUK

Bug: 7427380
Change-Id: I0f5d9d1554a476c00591981028733ee6924bb729
2012-11-02 15:31:48 -04:00
Amith Yamasani
ecbd68b0de Resolve USER_ALL when inflating notification views.
Fixes the OTA icon display when the OTA is to be shown to all users.

Bug: 7462511
Change-Id: I185d9d5340d866d0a4b0ae273a361e8db160e33b
2012-11-02 12:17:19 -07:00
Svetoslav Ganov
807c1a99bf Merge "Obscure speech for PIN password keys when no headset plugged in." into jb-mr1-lockscreen-dev 2012-11-02 12:03:23 -07:00
Svetoslav Ganov
b104b202bd am cb5c66b9: am 5e27e55a: am 28e8f76c: Merge "Cannot click on partially visible views in touch exploration." into jb-mr1-dev
* commit 'cb5c66b9c1602b750bb481641253604ba3d59ac6':
  Cannot click on partially visible views in touch exploration.
2012-11-02 11:59:29 -07:00
alanv
0cbbc5766f Obscure speech for PIN password keys when no headset plugged in.
If applicable, also announces that the user needs a headset when
displaying the PIN pad layout. Also fixes accessibility focus "falling
through" to the next Z-ordered view.

Bug: 7436382
Change-Id: Ic1db5320b2e47ff181c5902e9f7980fe3fe6756b
2012-11-02 11:56:27 -07:00
Svetoslav Ganov
cb5c66b9c1 am 5e27e55a: am 28e8f76c: Merge "Cannot click on partially visible views in touch exploration." into jb-mr1-dev
* commit '5e27e55aecea63c6cf0477ab75f4c39b7b68c9cd':
  Cannot click on partially visible views in touch exploration.
2012-11-02 11:56:12 -07:00
Svetoslav Ganov
5e27e55aec am 28e8f76c: Merge "Cannot click on partially visible views in touch exploration." into jb-mr1-dev
* commit '28e8f76c50b26efd657bc0740fee25ac18520f9e':
  Cannot click on partially visible views in touch exploration.
2012-11-02 11:54:36 -07:00
Svetoslav Ganov
b8e58bb6ed am 28e8f76c: Merge "Cannot click on partially visible views in touch exploration." into jb-mr1-dev
* commit '28e8f76c50b26efd657bc0740fee25ac18520f9e':
  Cannot click on partially visible views in touch exploration.
2012-11-02 11:54:36 -07:00
Svetoslav Ganov
28e8f76c50 Merge "Cannot click on partially visible views in touch exploration." into jb-mr1-dev 2012-11-02 11:51:36 -07:00
Winson Chung
f3b9ec8230 Initial changes to allow dropping on delete target to remove widget.
- Fixing deletion animation

Change-Id: Ie93991c0e9af0c6b64c6b3808e38f349f6845965
2012-11-02 10:41:41 -07:00
Chris Wren
febea58c92 Merge "hide multiuser selector when IME is up." into jb-mr1-lockscreen-dev 2012-11-02 10:06:00 -07:00