Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
467 Commits 3 Branches 0 Tags
3b9ff27e730280d032fe69042dfd5e0fca27c6c5
Commit Graph

51 Commits

Author SHA1 Message Date
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
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
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
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
5104518fd7 Automated import from //branches/cupcake/...@142855,142855 2009-03-25 21:37:10 -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
Ficus Kirkpatrick
b3f4db8e2b Automated import from //branches/master/...@141998,141998 2009-03-24 21:21:18 -07:00
Ficus Kirkpatrick
10270f2b77 Automated import from //branches/master/...@141740,141740 2009-03-24 20:51:15 -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
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
The Android Open Source Project
105925376f auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:46 -07:00
Jean-Baptiste Queru
2a73de7b21 Merge commit 'remotes/korg/cupcake' into merge 
Conflicts:
	core/java/android/view/animation/TranslateAnimation.java
	core/jni/Android.mk
	core/res/res/values-en-rGB/strings.xml
	libs/audioflinger/AudioFlinger.cpp
	libs/surfaceflinger/LayerScreenshot.cpp
	packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
 2009-03-18 11:33:14 -07:00
The Android Open Source Project
ba87e3e6c9 auto import from //branches/cupcake_rel/...@138607 2009-03-13 13:04:22 -07:00
The Android Open Source Project
c39a6e0c51 auto import from //branches/cupcake/...@137873 2009-03-11 12:11:56 -07:00
The Android Open Source Project
b2a3dd88a5 auto import from //branches/cupcake/...@137197 2009-03-09 11:52:12 -07:00
The Android Open Source Project
4df2423a94 auto import from //depot/cupcake/@136594 2009-03-05 14:34:35 -08:00
The Android Open Source Project
9066cfe988 auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
The Android Open Source Project
d83a98f4ce auto import from //depot/cupcake/@135843 2009-03-03 18:28:45 -08:00
The Android Open Source Project
076357b856 auto import from //depot/cupcake/@132589 2009-03-03 14:04:24 -08:00
The Android Open Source Project
3dec7d563a auto import from //depot/cupcake/@137055 2009-03-02 22:54:33 -08:00
The Android Open Source Project
15ab3eae2e auto import from //branches/cupcake/...@132569 2009-02-20 07:38:31 -08:00
The Android Open Source Project
3001a03543 auto import from //branches/cupcake/...@132276 2009-02-19 10:57:31 -08:00
The Android Open Source Project
da996f390e auto import from //branches/cupcake/...@131421 2009-02-13 12:57:50 -08:00
The Android Open Source Project
d24b8183b9 auto import from //branches/cupcake/...@130745 2009-02-10 15:44:00 -08:00
Jean-Baptiste Queru
eef3c54deb Fix 1855: Restore constants to pre-cupcake values. 
Since some of those constants are used in the persistent database,
modifying them for cupcake meant that the new code was getting
confused by the old persistified data after an upgrade to cupcake,
teh most visible symptom being that downloads that had been initiated
from the browser would re-appear in the notifications.
 2009-02-06 13:05:07 -08:00
Jean-Baptiste Queru
d816d082e1 Remove old (unused) download manager APIs 2009-02-02 15:59:47 -08:00
The Android Open Source Project
94cbba0933 Merge branch 'cupcake' 2009-01-22 00:16:08 -08:00
The Android Open Source Project
f1e484acb5 auto import from //branches/cupcake/...@127436 2009-01-22 00:13:42 -08:00
Jean-Baptiste Queru
06323a692e Introduce new names for the download manager API fields. 
The new names will allow for better consistency and better API
documentation if/when they're made public in the SDK.

This will be followed by a later change that removes the old names
 2009-01-21 08:02:32 -08:00
The Android Open Source Project
7547115694 Merge branch 'cupcake' 2009-01-20 14:05:35 -08:00
The Android Open Source Project
22f7dfd234 auto import from //branches/cupcake/...@127101 2009-01-20 14:03:58 -08:00
android-build SharedAccount
0fda766e53 Merge branch 'cupcake' 2009-01-15 16:16:01 -08:00
The Android Open Source Project
9266c558bf auto import from //branches/cupcake/...@126645 2009-01-15 16:12:10 -08:00
The Android Open Source Project
e570a0fa86 auto import from //branches/cupcake/...@125939 2009-01-09 18:24:37 -08:00
The Android Open Source Project
b798689749 auto import from //branches/cupcake/...@125939 2009-01-09 17:51:23 -08:00
Jean-Baptiste Queru
e1dc1d6dc8 Merge commit 'remotes/korg/cupcake' 
Conflicts:
	core/java/com/android/internal/app/AlertController.java
	core/res/res/values/strings.xml
	media/java/android/media/AudioSystem.java
	services/java/com/android/server/LocationManagerService.java
 2008-12-19 08:31:54 -08:00
The Android Open Source Project
f013e1afd1 Code drop from //branches/cupcake/...@124589 2008-12-17 18:05:43 -08:00
Evan JIANG
ae499953ce Fix issue 1164: Incorrect organization type label in contacts 
http://code.google.com/p/android/issues/detail?id=1164
The organization definition in string-array resource is different from
android.provider.Contacts.OrganizationColumns
 2008-11-02 09:47:52 +08:00