Merge commit '4af1de39ab36cbff08075e654db516526ff9038d'
* commit '4af1de39ab36cbff08075e654db516526ff9038d':
Fix bug 3064135 - do not allow text handles on TextViews in sub windows.
Merge commit '9a12a3c8d4bb20042cf69e07d268e3a04ac71f96'
* commit '9a12a3c8d4bb20042cf69e07d268e3a04ac71f96':
Remove dead code, and make the animation a setting.
turn off the electron beam
Merge commit 'bdf8034c657147226b2390eef113ff841e0d6065' into gingerbread-plus-aosp
* commit 'bdf8034c657147226b2390eef113ff841e0d6065':
OBB: use PBKDF2 for key generation.
Currently, when A2DP is connected and the user changes volume
keys on the device, we just change the volume on the device.
We are not supposed to do that. The white paper recommendation
is to keep the volume stream at max and just send the volume
keys over. But then not all A2DP headsets act as AVRCP targets,
hence check for that.
So now the media code should use the API and not change the volume
at the device but just send the keys.
Bug: 3071356
Change-Id: I03a8b6f7619cf860c4e63979bf4903ded9ecd314
Switch to using PBKDF2 for the key generation for OBBs. Any previously
generated OBBs will stop being read correctly. A small pbkdf2gen program
is available to allow generation of appropriate keys with the salts.
Bug: 3059950
Change-Id: If4305c989fd692fd1150eb270dbf751e09c37295
Merge commit 'c911097095d0dd909abf4f77628f2154be6dbf9a' into gingerbread-plus-aosp
* commit 'c911097095d0dd909abf4f77628f2154be6dbf9a':
Updated media transport controls
Merge commit '4711d21a55d9ff6f234d3b06ff2d07dca19238fc'
* commit '4711d21a55d9ff6f234d3b06ff2d07dca19238fc':
StrictMode: link to designing for responsiveness ANR docs
Merge commit 'b99db0c70e0ee18e0a691126134b9394f30f7f03'
* commit 'b99db0c70e0ee18e0a691126134b9394f30f7f03':
Set the wifi-only for SIP service as the default config.
Merge commit 'c008ca96bb32289958010dcf8f247c35ab9b1f18' into gingerbread-plus-aosp
* commit 'c008ca96bb32289958010dcf8f247c35ab9b1f18':
Work around for errant headsets.
1. Some headsets send an AVCTP connection before an AVDTP connection
When that AVCTP connection fails, we get stuck in IncomingA2DP state
because we don't handle AVCTP signals for now.
We need to handle the signals and fix it better.
2. Also when ACL gets disconnected, reset state i.e
when the low level connection disconnected reset our state.
This is like a fail safe in case we get stuck.
Bug: 3051490
Change-Id: Ibcf188103999ffb1e08c36c2554504c639fb7f50
Merge commit '998c67774aa2260ed05a39df45d983feb72e683c' into gingerbread-plus-aosp
* commit '998c67774aa2260ed05a39df45d983feb72e683c':
Never show overscroll if the page scrolls at all.
Merge commit '868322ced806ec58750edd8ce964f4e17507ddad' into gingerbread-plus-aosp
* commit '868322ced806ec58750edd8ce964f4e17507ddad':
Reduce the time it takes to decay the glow after a pull.
gingerbread.
(for more detailed comments, please see the dependent CL
Change-Id: Ib90eb9e647f543312c865d3bbf9a06fb867a648b )
2 changes in this CL.
1. add 2 new columns to downloads table in downloads.db:
mediaprovider_uri = downloaded file's content_uri in mediaprovider db
deleted = flag is set to true if a file is to be deleted
2. download UI app shows only those files whose 'deleted' flag is not set
Change-Id: I47c5f72b0a0b354fac3abe3a97752130b8189794
The decay is now in line for the decay for absorb glows.
Fixes b/3094064 Overscroll fade timeout is too long
Change-Id: Ida987c8f6193fcb15f743d72c590a5c1daef056d
Adds a method to AbsListView to allow for a smooth scroll to an
offset position with an app defined duration.
Change-Id: I8cd690597cda078b25bce9aeba683be030d6b155
Windows with FLAG_NEEDS_MENU_KEY (or windowNeedsMenuKey=true
in their theme) will cause the system bar to show a menu
icon. (Note that the phone's status bar currently ignores
this, but phones tend to have hardware menu keys anyway.)
Additionally, all windows whose package's SDK version is
pre-Honeycomb will have FLAG_NEEDS_MENU_KEY set by default.
Bug: 3003728
Change-Id: I2d983763a726ea4f32cd1af9b0390e30478b11d1
We can't reliably detect when the key for an OBB is incorrect, so just
remove the mention in the documentation. It still returns an error, but
just not the most specific error.
Bug: 3091064
Change-Id: I70e506822f2178a0ac5e4617fe545b23ce0026f4
