Commit Graph

188 Commits

Author SHA1 Message Date
Dmitri Plotnikov
693d50e7ae Moving send-to-voicemail and ringtone-uri up to the aggregate level. 2009-06-25 16:38:06 -07:00
Android (Google) Code Review
8df2770995 Merge change 5234
* changes:
  Adds precedence information to the CommonDataKinds.Im class.
2009-06-25 16:22:08 -07:00
Evan Millar
c043752ca3 Adds precedence information to the CommonDataKinds.Im class.
There is now a method getPresencePrecedence() that returns an integer
representing the precedence of a presence status, 1 being the highest
prcedence.
2009-06-25 14:38:32 -07:00
Mike Lockwood
bcab8df83e Settings: Add preference to enable/disable assisted GPS.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-06-25 17:15:32 -04:00
Wei Huang
8ad2246edd add Gservices setting for data messaging app token url. 2009-06-25 10:00:15 -07:00
Android (Google) Code Review
b322287594 am 60a0ad65: Merge change 5329 into donut
Merge commit '60a0ad65f4cd7dedbbd06993d107fb1b72d072c6'

* commit '60a0ad65f4cd7dedbbd06993d107fb1b72d072c6':
  frameworks/base - CDMA settings additions
2009-06-24 23:41:00 -07:00
David Krause
d0f6715dcb frameworks/base - CDMA settings additions
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
2009-06-24 20:07:28 -07:00
Jeff Sharkey
57ac3d59c1 Moved owning package and restricted flag to Contact.
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.
2009-06-24 17:35:20 -07:00
Fred Quintana
ac9385ef31 - clean up the sync settings names to:
(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
2009-06-23 15:53:16 -07:00
Android (Google) Code Review
fc542816ba Merge change 4939
* changes:
  mods so that we can search mms messages
2009-06-23 10:04:38 -07:00
Android (Google) Code Review
61f24e58d6 am 2830b922: Merge change 4977 into donut
Merge commit '2830b9226bc737da970f8d20601ccde19008415c'

* commit '2830b9226bc737da970f8d20601ccde19008415c':
  Update the gservices gtalk setting for the terms and services url.
2009-06-22 15:47:26 -07:00
Tom Taylor
2c0a01a6e7 Update the gservices gtalk setting for the terms and services url. 2009-06-22 15:17:59 -07:00
Mark Wagner
f4f8a7fe46 mods so that we can search mms messages 2009-06-22 14:55:17 -07:00
Android (Google) Code Review
90c8f83538 am d6dd686b: Merge change 4805 into donut
Merge commit 'd6dd686bc7adba448af1bc36a022cddba9f9561f'

* commit 'd6dd686bc7adba448af1bc36a022cddba9f9561f':
  add GServices settings for Google Talk privacy and legal urls.
2009-06-22 10:45:28 -07:00
Wei Huang
ceca25fdb0 add GServices settings for Google Talk privacy and legal urls. 2009-06-22 10:08:22 -07:00
Leon Scroggins
d6377fbe7e resolved conflicts for merge of 9336f5d9 to master 2009-06-22 12:44:31 -04:00
Leon Scroggins
9ce4c6c5cf Make browser bookmarks permissions part of the public API. 2009-06-22 09:14:02 -04:00
Android (Google) Code Review
f1891f4b79 am 52546575: Merge change 4818 into donut
Merge commit '5254657540b0a6ad54be6229b68fa5626e4ef9e5'

* commit '5254657540b0a6ad54be6229b68fa5626e4ef9e5':
  Added in Settings.Secure default country and variant for the default TTS language.
2009-06-19 16:43:46 -07:00
Evan Millar
dc2da5fd92 Copies the Contacts.Intents class to ContactsContract.
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.
2009-06-19 14:51:04 -07:00
Jean-Michel Trivi
a6fcc95411 Added in Settings.Secure default country and variant for the default TTS language. 2009-06-19 14:18:41 -07:00
Ye Wen
44c6e3e785 Fix bug1435331: add a gservices setting for the retry threshold of auth expired failure. 2009-06-19 13:45:47 -07:00
Android (Google) Code Review
350feeb836 am b00518d8: Merge change 4796 into donut
Merge commit 'b00518d81550c638728b53346a2a25f0a80a1049'

* commit 'b00518d81550c638728b53346a2a25f0a80a1049':
  Move USE_LOCATION_FOR_SERVICES to Secure.
2009-06-19 12:57:22 -07:00
Android (Google) Code Review
d0b47a1740 am ba6409f1: Merge change 4706 into donut
Merge commit 'ba6409f1f69db7dfa16d5b914d2bc41a3aa43caf'

* commit 'ba6409f1f69db7dfa16d5b914d2bc41a3aa43caf':
  Add a new checkin server flag for Vending Machine heartbeats.
2009-06-19 12:12:15 -07:00
Amith Yamasani
630cd06414 Move USE_LOCATION_FOR_SERVICES to Secure.
Since SetupWizard needs to be able to write the setting, it
couldn't live in Gservices. Moved it to Secure.
2009-06-19 12:08:20 -07:00
Android (Google) Code Review
36adccf74f Merge change 4550
* changes:
  add a checkin eventlog tag for reporting GTalk heartbeat timeout; remove unused adaptive heartbeat settings.
2009-06-19 11:40:46 -07:00
Linda Nguyen
abd7eba70b Add a new checkin server flag for Vending Machine heartbeats. 2009-06-18 18:52:59 -07:00
Leon Scroggins
9f53fcaacf Another javadoc attempted fix. 2009-06-18 18:12:10 -04:00
Leon Scroggins
7e2ff1a600 Truly fix the build (I hope).
I also changed the API.  Hide the new fields.
2009-06-18 17:45:14 -04:00
Wei Huang
50c786d19c add a checkin eventlog tag for reporting GTalk heartbeat timeout; remove unused adaptive heartbeat settings. 2009-06-18 13:28:07 -07:00
Leon Scroggins
908baedfcf Alter the HISTORY_PROJECTION and BookmarkColumns.
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.
2009-06-18 13:39:38 -04:00
Dmitri Plotnikov
9d044514f7 Changing aggregation exception API.
Switching from contact-contact pairs to aggregate-contact pairs
2009-06-16 13:22:21 -07:00
Grace Kloba
e5856bca98 am a03f0465: hide the new constant as it is pending api approval
Merge commit 'a03f046522f568a79b75556aa54c0407b1151511'

* commit 'a03f046522f568a79b75556aa54c0407b1151511':
  hide the new constant as it is pending api approval
2009-06-16 08:36:26 -07:00
Android (Google) Code Review
01e28a15b4 am 5570f2f2: Merge change 4252 into donut
Merge commit '5570f2f24a74a1f16c781722731ba39f2907cbb3'

* commit '5570f2f24a74a1f16c781722731ba39f2907cbb3':
  Add more comment for EXTRA_APPEND_LOCATION
2009-06-16 08:36:22 -07:00
Android (Google) Code Review
d007d9b898 am 7d143b89: Merge change 4245 into donut
Merge commit '7d143b89b714e077f8fd7dbac80945c76bfd9814'

* commit '7d143b89b714e077f8fd7dbac80945c76bfd9814':
  Add the extra data definition for append location in the VIEW request to the Browser.
2009-06-16 08:36:04 -07:00
Android (Google) Code Review
0e81310677 Merge change 4181
* changes:
  Add new URIs to the Phone and Postal classes.
2009-06-15 18:49:19 -07:00
Android (Google) Code Review
2cc50b12d1 am 77b7d785: Merge change 4117 into donut
Merge commit '77b7d7859ab8a4ab66a31375826ddfe17dc69c07'

* commit '77b7d7859ab8a4ab66a31375826ddfe17dc69c07':
  Add a Gservices setting to have a "use location for better search".
2009-06-15 17:57:03 -07:00
Grace Kloba
a03f046522 hide the new constant as it is pending api approval 2009-06-15 16:29:21 -07:00
Android (Google) Code Review
5570f2f24a Merge change 4252 into donut
* changes:
  Add more comment for EXTRA_APPEND_LOCATION
2009-06-15 16:06:11 -07:00
Grace Kloba
72afed86d3 Add more comment for EXTRA_APPEND_LOCATION 2009-06-15 16:00:12 -07:00
Android (Google) Code Review
7d143b89b7 Merge change 4245 into donut
* changes:
  Add the extra data definition for append location in the VIEW request to the Browser.
2009-06-15 15:34:30 -07:00
Grace Kloba
ab36bcccbb Add the extra data definition for append location in the VIEW request to the Browser. 2009-06-15 15:27:17 -07:00
Evan Millar
161dd86394 Add new URIs to the Phone and Postal classes.
The Postal class now contains:
        CONTENT_URI
             * The content:// style URI for all data records of the
             * Postal.CONTENT_ITEM_TYPE mimetype, combined with the associated contact
             * and aggregate data.
        CONTENT_TYPE
             * The MIME type of CONTENT_URI providing a directory of
             * postal addresses.

The Phone class now contains:
        CONTENT_URI
             * The content:// style URI for all data records of the
             * Phone.CONTENT_ITEM_TYPE mimetype, combined with the associated contact
             * and aggregate data.
        CONTENT_FILTER_URI
             * The content:// style URI for filtering data records of the
             * Phone.CONTENT_ITEM_TYPE mimetype, combined with the associated contact
             * and aggregate data. The filter argument should be passed
             * as an additional path segment after this URI.
        CONTENT_TYPE
             * The MIME type of #CONTENT_URI providing a directory of
             * phones.
2009-06-15 11:13:45 -07:00
Ken Shirriff
7014a96145 Move meta feed handling to CalendarSyncAdapter
Removes obsolete LIVE_CONTENT_URI.  Now calendar list updates are obtained
through a sync.
bug=1886271
2009-06-12 15:43:00 -07:00
Amith Yamasani
430555acae Add a Gservices setting to have a "use location for better search". 2009-06-12 14:19:00 -07:00
Android (Google) Code Review
451a37ed2d Merge change 3618
* changes:
  Fix bug 1875344 cut 2: adding option to show/noshow away presence when device is idle.
2009-06-12 10:03:18 -07:00
Fred Quintana
c933fb663e add a data_version column to the data table 2009-06-11 14:59:43 -07:00
Android (Google) Code Review
c581e27c13 Merge change 3809
* changes:
  Add a search uri constant for mms/sms.
2009-06-11 09:46:54 -07:00
Mark Wagner
0ff9833c98 Add a search uri constant for mms/sms. 2009-06-10 17:07:31 -07:00
The Android Open Source Project
ca83b1b176 Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-06-10 16:43:38 -07:00
Dmitri Plotnikov
0918bf0688 Adding new query: aggregation suggestions 2009-06-10 16:40:37 -07:00