Commit Graph

79 Commits

Author SHA1 Message Date
The Android Open Source Project
8585e19ed4 Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-04-29 15:16:52 -07:00
Android (Google) Code Review
b7a64360fa Merge change 711
* changes:
  store contact id in messages table instead of contact name string; merge messages and group messages tables.
2009-04-29 14:32:10 -07:00
The Android Open Source Project
8f080ec429 am f3ccf8a: Merge branch \'readonly-p4-donut\' into donut 2009-04-29 13:34:51 -07:00
Wei Huang
b3624b9680 store contact id in messages table instead of contact name string; merge messages and group messages tables.
- removed GroupMessages API, groupchat messages are merged with messages. So where we used to have
  GroupMessages.CONTENT_URI, now we have Messages.GROUP_MESSAGES_CONTENT_URI. Messages api now has a flag
  IS_GROUP_CHAT to indicate that a message is a groupchat message.
- instead of storing 'provider', 'account', 'contact' in the messages table, store a 'thread_id' column instead.
  thread_id is really just the contact_id for both messages and groupchat messages.
- add getContentUriByThreadId() api, for now, retained the old getContentUriByContact(), but it's deprecated.
2009-04-29 11:46:21 -07:00
Android (Google) Code Review
42fba356cf Merge change 331
* changes:
  Add option for gtalk stream compression
2009-04-28 15:36:33 -07:00
Karl Rosaen
f3ccf8a5a5 Merge branch 'readonly-p4-donut' into donut 2009-04-23 19:01:36 -07:00
Karl Rosaen
875d50a4b9 AI 147564: Merge back from search branch to donut. Notes:
- all public apis and framework changes have been reviewed by relevant folks in our branch (e.g romainguy)
  - all new public apis are @hidden; they will still get reviewed by api council once we're in git
  - other than that, it's mostly GlobalSearch and search dialog stuff, a new apps provider, and some tweaks
  to the contacts provider that was reviewed by jham

Automated import of CL 147564
2009-04-23 19:00:21 -07:00
Fred Quintana
d9d2f1140b change the sync framework and users to understand Account 2009-04-23 15:37:45 -07:00
Jean-Baptiste Queru
74008f608a Merge donut into master 2009-04-22 17:12:34 -07:00
Costin Manolache
f967afde2e Add option for gtalk stream compression 2009-04-17 17:37:29 -07:00
Dianne Hackborn
75534fbe24 Merge branch 'readonly-p4-master' 2009-04-13 16:13:37 -07:00
Dianne Hackborn
935ae463d4 AI 145994: Integrate #145778 from Donut.
Automated import of CL 145994
2009-04-13 16:11:55 -07:00
Android (Google) Code Review
61805637e5 Merge change 65 into donut
* changes:
  Remove references to android.util.Config
2009-04-13 14:13:14 -07:00
Patrick Scott
9536d0b413 Merge branch 'readonly-p4-master' 2009-04-13 09:59:09 -07:00
Patrick Scott
3156bb00dd AI 145870: Add a build property for the default alarm alert. Update the various
framework classes to deal with the new property. Also update various
  documentation that mentions the default ringtones.
  Use the build property as the default alert when the user has not chosen
  an alert for an alarm. This is also used if the alarm alert is null when
  the alarm fires.
  BUG=1723684

Automated import of CL 145870
2009-04-13 09:57:38 -07:00
Andy Stadler
f8a7ceaef2 AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
2009-04-10 16:24:47 -07:00
Dave Bort
2faf6081f2 Remove references to android.util.Config
The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.

BUG=1780938
2009-04-09 15:30:38 -07:00
Cynthia Wong
5167f9e28b Merge branch 'readonly-p4-master' 2009-04-08 13:33:32 -07:00
Cynthia Wong
44e4aaf133 AI 145124: am: CL 144928 Make the uphill discarding ops functionality controllable via a Gservices flag
Original author: cynthiaw

Automated import of CL 145124
2009-04-08 13:32:09 -07:00
Cynthia Wong
f62b80fa1b AI 144928: Make the uphill discarding ops functionality controllable via a Gservices flag
BUG=1725022

Automated import of CL 144928
2009-04-07 17:24:14 -07:00
Mike Lockwood
48554fc78e Merge branch 'readonly-p4-master' 2009-04-02 23:42:42 -07:00
Mike Lockwood
bd2a7126e5 AI 144415: am: CL 144372 Cleanup Settings support for enabling and disabling location providers:
LocationManagerService now listens for changes to settings,
  making LocationManager.updateProviders() unnecessary.
  Removed LocationManager.updateProviders()
  Added Settings.Secure.setLocationProviderEnabled(), which is a thread-safe way
  of enabling or disabling a single location provider.
  This is safer than reading, modifying and writing the LOCATION_PROVIDERS_ALLOWED directly.
  BUG=1729031
  Original author: lockwood

Automated import of CL 144415
2009-04-02 23:41:33 -07:00
Mike Lockwood
b77f2b51d7 Merge branch 'readonly-p4-master' 2009-04-02 22:34:31 -07:00
Mike Lockwood
460ae0c910 AI 144389: am: CL 144221 Fix typo in Javadoc
Original author: lockwood

Automated import of CL 144389
2009-04-02 22:33:27 -07:00
Mike Lockwood
9637d47489 AI 144372: Cleanup Settings support for enabling and disabling location providers:
LocationManagerService now listens for changes to settings,
  making LocationManager.updateProviders() unnecessary.
  Removed LocationManager.updateProviders()
  Added Settings.Secure.setLocationProviderEnabled(), which is a thread-safe way
  of enabling or disabling a single location provider.
  This is safer than reading, modifying and writing the LOCATION_PROVIDERS_ALLOWED directly.
  BUG=1729031

Automated import of CL 144372
2009-04-02 21:41:57 -07:00
The Android Open Source Project
d3af727927 Merge branch 'readonly-p4-master'
Conflicts:

	telephony/java/com/android/internal/telephony/gsm/RIL.java
  resolved by removing gsm/RIL.java
2009-04-02 12:18:20 -07:00
Wink Saville
04e71b3db8 AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
Automated import of CL 144245
2009-04-02 11:00:54 -07:00
Mike Lockwood
570d05f776 AI 144221: Fix typo in Javadoc
Automated import of CL 144221
2009-04-02 05:27:16 -07:00
Wink Saville
767a662ecd AI 144185: Integrate cdma into the main code base.
Automated import of CL 144185
2009-04-02 01:37:02 -07:00
Jeffrey Sharkey
f5f8d247d1 AI 143308: am: CL 143159 am: CL 142855 Fix SHOW_OR_CREATE intent to correctly handle duplicate E-mail or IM entries for a person.
Added a new WITH_EMAIL_OR_IM_FILTER_URI to find people with a given string as either an E-mail or IM address.  This cleans up the original code, and lets us handle duplicates when there are multiple ContactMethod matches for a single person.  (We don't get GROUP BY through the ContentProvider interface.)
  In ContactsListActivity we don't show possibly-incorrect labels when in MODE_QUERY_PICK_TO_VIEW, as any labels and values would be identical.  (The people appearing in that list are there because their ContactMethod matches the query.)
  Original author: jsharkey
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143308
2009-03-27 17:57:15 -07:00
The Android Open Source Project
e1861133d5 Merge commit 'korg/cupcake'
Conflicts:
	core/java/android/webkit/WebView.java
	core/java/android/widget/TwoLineListItem.java
	preloaded-classes
2009-03-27 15:38:40 -07:00
Jeffrey Sharkey
cd1a9ea238 AI 143159: am: CL 142855 Fix SHOW_OR_CREATE intent to correctly handle duplicate E-mail or IM entries for a person.
Added a new WITH_EMAIL_OR_IM_FILTER_URI to find people with a given string as either an E-mail or IM address.  This cleans up the original code, and lets us handle duplicates when there are multiple ContactMethod matches for a single person.  (We don't get GROUP BY through the ContentProvider interface.)
  In ContactsListActivity we don't show possibly-incorrect labels when in MODE_QUERY_PICK_TO_VIEW, as any labels and values would be identical.  (The people appearing in that list are there because their ContactMethod matches the query.)
  Original author: jsharkey
  Merged from: //branches/cupcake/...

Automated import of CL 143159
2009-03-27 15:32:56 -07:00
Jeffrey Sharkey
5104518fd7 Automated import from //branches/cupcake/...@142855,142855 2009-03-25 21:37:10 -07:00
Mark Womack
63f49f1c3a Automated import from //branches/donutburger/...@142717,142717 2009-03-25 16:54:49 -07:00
Mark Womack
78ef45602a Automated import from //branches/master/...@142755,142755 2009-03-25 16:10:13 -07:00
Mark Womack
ecacd2f6a3 Automated import from //branches/cupcake/...@142633,142633 2009-03-25 15:18:27 -07:00
Cedric Beust
afb6c8eafc Automated import from //branches/master/...@142319,142319 2009-03-24 22:35:42 -07:00
Cedric Beust
079c6f64f9 Automated import from //branches/donutburger/...@142318,142318 2009-03-24 22:28:03 -07:00
Ficus Kirkpatrick
b3f4db8e2b Automated import from //branches/master/...@141998,141998 2009-03-24 21:21:18 -07:00
Ficus Kirkpatrick
59e5ba47dd Automated import from //branches/donutburger/...@141997,141997 2009-03-24 21:16:34 -07:00
Ficus Kirkpatrick
10270f2b77 Automated import from //branches/master/...@141740,141740 2009-03-24 20:51:15 -07:00
Ficus Kirkpatrick
9b16598f70 Automated import from //branches/donutburger/...@141738,141738 2009-03-24 20:49:28 -07:00
Mark Womack
c2d251a117 Automated import from //branches/donutburger/...@141325,141325 2009-03-24 20:03:11 -07:00
Mark Womack
8c20bc8fb7 Automated import from //branches/master/...@141328,141328 2009-03-24 20:02:43 -07:00
Cedric Beust
49fc71f3f9 Automated import from //branches/cupcake/...@142317,142317 2009-03-24 19:22:00 -07:00
Jack Veenstra
3c4fbdf38f Automated import from //branches/donutburger/...@140958,140958 2009-03-24 19:03:36 -07:00
Jack Veenstra
359404dc6b Automated import from //branches/master/...@140959,140959 2009-03-24 19:03:26 -07:00
Ficus Kirkpatrick
df5f5ec07f Automated import from //branches/cupcake/...@141995,141995 2009-03-24 18:48:25 -07:00
Ficus Kirkpatrick
4ad62a4538 Automated import from //branches/cupcake/...@141736,141736 2009-03-24 18:17:51 -07:00
The Android Open Source Project
c2ad241504 auto import from //branches/cupcake_rel/...@141571 2009-03-19 23:08:54 -07:00