Fred Quintana
d9d2f1140b
change the sync framework and users to understand Account
2009-04-23 15:37:45 -07:00
Fred Quintana
ae267f9d45
Merge branch 'readonly-p4-master'
2009-04-08 00:39:52 -07:00
Fred Quintana
89ce244770
AI 144949: remove Maps
...
Automated import of CL 144949
2009-04-08 00:38:40 -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
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
The Android Open Source Project
762d30a313
Merge branch 'open_source' into google_internal
...
Conflicts:
core/java/android/widget/TwoLineListItem.java
core/res/res/values/public.xml
preloaded-classes
2009-03-29 08:55:27 -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
Fred Quintana
22f711423e
Automated import from //branches/master/...@141380,141380
2009-03-24 20:10:17 -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
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
James Wylder
074da8f9aa
Change scope on SettingsProvider.mDatabaseHelper and DatabaseHelper
...
This change will allow the DatabaseHelper to be inheritted and extended
without the need to make futher changes to the existing implementation.
2009-02-25 08:38:31 -06:00
The Android Open Source Project
d24b8183b9
auto import from //branches/cupcake/...@130745
2009-02-10 15:44:00 -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
f013e1afd1
Code drop from //branches/cupcake/...@124589
2008-12-17 18:05:43 -08:00
The Android Open Source Project
54b6cfa9a9
Initial Contribution
2008-10-21 07:00:00 -07:00
