Merge commit '62c6c357060dca8597986783b67ec9ae06ccef66'
* commit '62c6c357060dca8597986783b67ec9ae06ccef66':
Make the date formats as close as possible to what the translators wanted.
Merge commit '0e6386300c958c5566d09b6a18b4338a6db3e965'
* commit '0e6386300c958c5566d09b6a18b4338a6db3e965':
Add gservices flag for configuring the URL vending redirects to when TOS is inaccessible due to no/bad network.
Merge commit 'ea9f9637e459c10024d09b53a803dfc91dd3eeb5'
* commit 'ea9f9637e459c10024d09b53a803dfc91dd3eeb5':
Have the notification service only have notifications diabled until setup wizard has been run.
* changes:
Unbreak build by making the build of renderscript again conditional on BUILD_RENDERSCRIPT until we can figure out why the build servers see an error that does not reproduce locally.
* changes:
* a best effort fix for apps that uses get/set Matrix API on canvas. - scale the matrix - but don't scale if the matrix *looks* like obtained from the canvas itself. (typically to set it back to original matrix)
* changes:
Remove the silent ringtone. I didn't realize that the ringtone picker already has an option to show a "Silent" item at the top, and having a separate silent ringtone conflicts with that in apps that choose to show it.
Initial commit for review.
Integrated comments after patch set 1 review.
Fixed lockup in AudioFlinger::ThreadBase::exit()
Fixed lockup when playing tone with AudioPlocyService startTone()
* changes:
Add a flag to set whether the overlay has been initialized. Commit needs to be called at least once on each overlay, and it appears that sometimes this doesn't happen because the visibility never changes. With this change the overlay parameter and position will be committed when either the visibility of the window changes, or on the first call to visibility resolved, if it hasn't already been done.
* changes:
Make intent broadcasts in "am" synchronous (they wait until exit). Clean up error handling and reporting in "am". Make the usage message for "am" more informative.
doesn't happen because the visibility never changes. With this change
the overlay parameter and position will be committed when either the visibility
of the window changes, or on the first call to visibility resolved, if it
hasn't already been done.
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* changes:
Add new hidden API setForceIgnoreOutsideTouch to AutoCompleteTextView for use by SearchDialog. SearchDialog wants to be able to say a dropdown should not always be visible but still let it ignore outside touch when it does show.
Merge commit '98a44df4b4cc8cd28276ad888a7e17f81353ae44'
* commit '98a44df4b4cc8cd28276ad888a7e17f81353ae44':
* Revert the change that I introduced while refactroing in SurfaceView#dispatchTouchEvent
* changes:
* Revert the change that I introduced while refactroing in SurfaceView#dispatchTouchEvent * Don't scale back the event if the canvas is used in SurfaceView.
