Merge commit '1076ea0abe3cace6629063d63ee1242a5a7588a2'
* commit '1076ea0abe3cace6629063d63ee1242a5a7588a2':
docs: update web page debugging with info about page and line
Merge commit 'aa86da9d14d08ee39ca3e3fcabba01560c64f37d'
* commit 'aa86da9d14d08ee39ca3e3fcabba01560c64f37d':
SDK doc change: Increment the platform version var used in doc footer and elsewhere.
Merge commit '9800adf2a4d78d1e3e44dbef6aecf2b2b738c9c8' into eclair-plus-aosp
* commit '9800adf2a4d78d1e3e44dbef6aecf2b2b738c9c8':
docs: update web page debugging with info about page and line
Merge commit '196ec566b39340942f146ce4a9af775f4c648d2d' into eclair-plus-aosp
* commit '196ec566b39340942f146ce4a9af775f4c648d2d':
SDK doc change: Increment the platform version var used in doc footer and elsewhere.
Most of these are file moves; a couple notable exceptions are the changes due to the move, and fixing up test code:
- database/DatabaseCursorTest.java
- database/DatabaseStatementTest.java
- net/UriTest.java
The LoggingEvents move will allow Gmail, Voice Search and other apps to
access the LoggingEvents needed. This file will replace
packages/inputmethods/LatinIMEsrc/com/android/inputmethod/voice/LoggingEvents.java
vendor/google/apps/VoiceSearch/apps/VoiceSearch/src/com/google/android/voicesearch/logging/LoggingEvents.java
In addition to moving the file, I have added 3 new fields:
TIMESTAMP, IME_TEXT_ACCEPTED, CALLING_APP_NAME. I needed to
create CALLING_APP_NAME b/c I can't re-use EXTRA_APP_NAME
because that is reserved for one of two values: voice
search or voice IME.
I added another file to android-common: UserHappinessSignals
This can be imported by different applications to broadcast
various user happiness metrics. It is currently used by Gmail's
CompseActivity.java to indicate that a user "accepted" the IME
text when they pressed the send button.
Change-Id: Ia859140facb7fb66a12706735d5132ba9eaa5ea0
The MMS code has been moved into the mms-common library.
Move SqliteWrapper (and make it hidden) into the database
directory because Telephony.java depends on it. Create a mmscommon
library similar to androidcommon for a number of files used both
by the telephony layer, by mms, and by myfaves.
Change-Id: I2e23e87c4961b87c42a4c8a63f812fa9e0e44dec
Merge commit '67a658567a6bad898c097e615f8efcb3c91fa50d'
* commit '67a658567a6bad898c097e615f8efcb3c91fa50d':
doc change only: Update announcement and mwc redirect to point to microsite.
Merge commit 'fbf977be5471a81b664bfc0a048497f268688a17'
* commit 'fbf977be5471a81b664bfc0a048497f268688a17':
Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
Merge commit '6d626d41e9db62a0eadb61ccb2aa4081a8b9f6d0'
* commit '6d626d41e9db62a0eadb61ccb2aa4081a8b9f6d0':
Refine fix I53e91db7 to apply only to wifi network
Merge commit '9985fecaa0bf32e94695f49bb495c9d0cd41e174'
* commit '9985fecaa0bf32e94695f49bb495c9d0cd41e174':
docs: reference the history JS file with docRoot in order to
Merge commit 'b22446901c477f40863132a9617368852d358f64'
* commit 'b22446901c477f40863132a9617368852d358f64':
disable high-quality filtering during scrolling, until I can cached the scaled images.
Merge commit '64c92f75df7415084aa9f0b304f2a99089b6be9f'
* commit '64c92f75df7415084aa9f0b304f2a99089b6be9f':
Handle emergency calls only status in ServiceStateTracker.
