Merge commit 'd8de2ba42679a10db2adc11995d6596a0045ab3a'
* commit 'd8de2ba42679a10db2adc11995d6596a0045ab3a':
Add a new checkin server flag for Vending Machine client server ping frequency for pending downloads.
Merge commit 'a1590586e4c02e50d14cc99018be2c419f5a07b9'
* commit 'a1590586e4c02e50d14cc99018be2c419f5a07b9':
Add new EXTRA_POST_DATA extra key for use in VIEW intents to Browser.
These changes are the frameworks/base portion of CDMA UI changes.
Five settings are added:
- In-call DTMF type (burst or long)
- Emergency tone type
- CDMA auto-retry
- Hearing Aid Compatibility (on/off)
- TTY mode
Instead of having unique owner packages and restriction
flags being enforced on each Data item, I moved these
columns up to the Contact level. This approach greatly
simplifies the provider logic.
(get|set)SyncAutomatically
(get|set)MasterSyncAutomatically
- change SYNC_EXTRAS_FORCE to SYNC_EXTRAS_MANUAL to mace clear that
this overrides the .*SyncAutomatically settings
- make ContentResolver methods that call the sync controls methods
in IContentService so that SDK users can use them
- rename startSync to requestSync to reinforce the fact that a sync
is not immediately or always started when this method is called
- add an Account parameter to all the sync settings and control methods
- change the sync control methods to take a String authority rather than a Uri uri
Merge commit '2830b9226bc737da970f8d20601ccde19008415c'
* commit '2830b9226bc737da970f8d20601ccde19008415c':
Update the gservices gtalk setting for the terms and services url.
Merge commit '5254657540b0a6ad54be6229b68fa5626e4ef9e5'
* commit '5254657540b0a6ad54be6229b68fa5626e4ef9e5':
Added in Settings.Secure default country and variant for the default TTS language.
ContactsContract now contains all the useful constants that are
contained in Contacts.Intents. Because we have to continue to
support the Contacts interface, the constants are kept there,
but now simply reference the real versions in Contacts.Intents.
Contacts.Intents will be deprecated and developers are encouraged
to move to Contacts.Intents.
Merge commit 'ba6409f1f69db7dfa16d5b914d2bc41a3aa43caf'
* commit 'ba6409f1f69db7dfa16d5b914d2bc41a3aa43caf':
Add a new checkin server flag for Vending Machine heartbeats.
A change to BrowserProvider has added an extra
column. Edit HISTORY_PROJECTION to include it,
add a constant index to access it, and add a
constant to BookmarkColumns to refer to it. Requires
the change to the browser's application package.
Merge commit 'a03f046522f568a79b75556aa54c0407b1151511'
* commit 'a03f046522f568a79b75556aa54c0407b1151511':
hide the new constant as it is pending api approval
Merge commit '7d143b89b714e077f8fd7dbac80945c76bfd9814'
* commit '7d143b89b714e077f8fd7dbac80945c76bfd9814':
Add the extra data definition for append location in the VIEW request to the Browser.
Merge commit '77b7d7859ab8a4ab66a31375826ddfe17dc69c07'
* commit '77b7d7859ab8a4ab66a31375826ddfe17dc69c07':
Add a Gservices setting to have a "use location for better search".
