Merge commit 'acab17f02a0a94eb72a7a69456d9485ce2ff8dc3'
* commit 'acab17f02a0a94eb72a7a69456d9485ce2ff8dc3':
Promote MccTable to telephony and use it for both gsm/cdma
Merge commit '1c1ffa0cab8b56274970736d7f3b8c00c01c3d2b' into eclair-plus-aosp
* commit '1c1ffa0cab8b56274970736d7f3b8c00c01c3d2b':
Promote MccTable to telephony and use it for both gsm/cdma
Merge commit '5e5288410702ea426c401be19e9221f63532cfe8'
* commit '5e5288410702ea426c401be19e9221f63532cfe8':
When encountering a .nomedia file, notify the MediaScannerClient,
Merge commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9' into eclair-plus-aosp
* commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9':
When encountering a .nomedia file, notify the MediaScannerClient,
* changes:
When encountering a .nomedia file, notify the MediaScannerClient, so that it can erase the data column for entries that are in the folder containing the .nomedia file. This prevents us from deleting (via a delete trigger) files when somebody adds a .nomedia file after the fact.
Merge commit '7eb63ba5666ce470e4d99164965a28dc63e681f6'
* commit '7eb63ba5666ce470e4d99164965a28dc63e681f6':
Attach the title bar to the top of the page.
Merge commit '015897709182be40eb5e9aee19e9ef396738a33e'
* commit '015897709182be40eb5e9aee19e9ef396738a33e':
Add support for running apps with uid/gid AID_LOG by specifying android.uid.log in the manifest
Merge commit 'b00fc7357f50ba0ebc1a5e48be2a1ee096bf1b67' into eclair-plus-aosp
* commit 'b00fc7357f50ba0ebc1a5e48be2a1ee096bf1b67':
Attach the title bar to the top of the page.
Merge commit 'fbd9b87feab649dc7410711ceaa589e5f058c753' into eclair-plus-aosp
* commit 'fbd9b87feab649dc7410711ceaa589e5f058c753':
Add support for running apps with uid/gid AID_LOG by specifying android.uid.log in the manifest
Merge commit '704a488ef5f5b50ed82332cbff8d6d982ac09118' into eclair-plus-aosp
* commit '704a488ef5f5b50ed82332cbff8d6d982ac09118':
New, darker tab widgets for the platform.
so that it can erase the data column for entries that are in the
folder containing the .nomedia file. This prevents us from
deleting (via a delete trigger) files when somebody adds a
.nomedia file after the fact.
Remove the old notions of changing the viewing mode
resulting in changing the visibility of the title bar.
Instead, attach the title bar to the top of the page.
Change contentToView() to contentToViewY() (and an X
version; same change for viewToContent), to account
for the title bar's height. Adjust the parameters
for drawing the scroll bar to account for the title bar.
Requires a change to packages/apps/Browser.
Change-Id: Ic0f7d6e0a1cce58ba2bca87337cf72a8194e9aa4
Merge commit '1d56df6688e1f3cb6db9ad72694476b908e1c077'
* commit '1d56df6688e1f3cb6db9ad72694476b908e1c077':
allow subclassing for drawing vertical scrollbar, so that clients (e.g. webview) can resize/position
Merge commit '70fc625745b5c6303951113e6d17ea57870fe2f7' into eclair-plus-aosp
* commit '70fc625745b5c6303951113e6d17ea57870fe2f7':
allow subclassing for drawing vertical scrollbar, so that clients (e.g. webview) can resize/position
This is needed to allow the BugReportService to start the dumpstate service.
Change-Id: I12cab23767c919592da102c654b6b80416717661
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '461cb5613c692f734e2fe9b005d21c5a2f3e8203'
* commit '461cb5613c692f734e2fe9b005d21c5a2f3e8203':
Setting the component role appears to be mandatory now for all mime types.
Merge commit '8d4713e564260b4ebc58f4889def0c5fc19ae6f9'
* commit '8d4713e564260b4ebc58f4889def0c5fc19ae6f9':
Fix the registration of the package changes broadcast receiver.
Merge commit '478ac27782a4d68f8726a485781bfd18d1f622e1'
* commit '478ac27782a4d68f8726a485781bfd18d1f622e1':
Handle security exception when Geolocation registers with system location service in DumpRenderTree.
Merge commit '6e1e1c6b781969e2af287ee7dd5074e215dc0725'
* commit '6e1e1c6b781969e2af287ee7dd5074e215dc0725':
fix issue 2096657: Sholes: residue shutter sound heard ONCE while taking a picture AFTER the volume is turned off.
Merge commit '7838887af4e63a1d31d98a9c4d31e1c40dabe297'
* commit '7838887af4e63a1d31d98a9c4d31e1c40dabe297':
Fix issue 2097083: STREAM_SYSTEM should be at max volume.
Merge commit '3df6afc153d25c32b986b9935874e0dc9e90ec3d'
* commit '3df6afc153d25c32b986b9935874e0dc9e90ec3d':
Fix issue #2097313: Latin IME crashes first use
Merge commit '13cb90a745a91ae5be76420bb7374b44a9b2317e'
* commit '13cb90a745a91ae5be76420bb7374b44a9b2317e':
Fix the issue that dialing *86 during call, the dialing voicemail screen is not shown.
Merge commit 'f619028470b63ba1c8e9d86fd2faab7bbece873b' into eclair-plus-aosp
* commit 'f619028470b63ba1c8e9d86fd2faab7bbece873b':
Setting the component role appears to be mandatory now for all mime types.
Merge commit '8e65337d06a1cc4fe896d17a947d46ae5f7257a8' into eclair-plus-aosp
* commit '8e65337d06a1cc4fe896d17a947d46ae5f7257a8':
Some work to make audio encoding work.
Merge commit '505cbb446d46466230c23a09b2ceb201b8faae8f' into eclair-plus-aosp
* commit '505cbb446d46466230c23a09b2ceb201b8faae8f':
Fix the registration of the package changes broadcast receiver.
