Commit Graph

35 Commits

Author SHA1 Message Date
Android (Google) Code Review
133ec72f24 am 288fe16c: Merge change 6043 into donut
Merge commit '288fe16c20e2c20556839046d38c487b0b18735c'

* commit '288fe16c20e2c20556839046d38c487b0b18735c':
  System and Secure settings backup.
2009-07-03 08:58:49 -07:00
The Android Open Source Project
575d1af980 resolved conflicts for merge of cf098294 to master 2009-07-03 08:55:59 -07:00
Amith Yamasani
220f4d633b System and Secure settings backup.
This backs up the basic system and secure settings. THe restoration doesn't
take effect immediately. You many need to restart the runtime to see all
restored values take effect.
2009-07-02 04:58:09 -07:00
Dianne Hackborn
cf098294da Move backup state to settings, change permission checks to use symbol.
This changes the backup service to use the settings provider instead
of system properties, correspondingly making it off by default and
allowing specific devices to define the transport.  Also tweaks
the permission checks to use the permission symbol instead of raw
strings.

This requires some corresponding changes in the vendor projects.
2009-07-01 20:12:36 -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
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
Android (Google) Code Review
6976dca6c8 am 6afe8133: Merge change 4720 into donut
Merge commit '6afe81339ed973f1ef4a6c30110d5ce3b001ea4c'

* commit '6afe81339ed973f1ef4a6c30110d5ce3b001ea4c':
  Fix string formatters in SettingsProvider SecurityException message.
2009-06-19 10:38:47 -07:00
Brett Chabot
31a88fac91 Fix string formatters in SettingsProvider SecurityException message. 2009-06-19 09:45:48 -07:00
Android (Google) Code Review
6be4025b12 am 2810f681: Merge change 4694 into donut
Merge commit '2810f681991d1beb5ceb3515159f9fad3cc341d5'

* commit '2810f681991d1beb5ceb3515159f9fad3cc341d5':
  Make SettingsProviders SecurityException messages more verbose.
2009-06-18 17:26:48 -07:00
Brett Chabot
16dd82cfdc Make SettingsProviders SecurityException messages more verbose. 2009-06-18 17:05:03 -07:00
Android (Google) Code Review
aa73f17201 am 6599426f: Merge change 4017 into donut
Merge commit '6599426f74371c823fcfe570f61577262eb0df44'

* commit '6599426f74371c823fcfe570f61577262eb0df44':
  Make the date format preference work again.
2009-06-14 21:12:17 -07:00
Eric Fischer
3287695823 Make the date format preference work again.
It is only used for numeric dates -- spelled-out dates have such a complex
variety of formats that they can only be meaningfully formatted from
locale strings.

In addition, the preference is left null when initializing, on the assumption
that the locale will still specify a more useful numeric format than we can
guess as part of a build-wide configuration.

But if the user has specified a format, the date will be formatted in the
order they asked for, with locale-appropriate punctuation substituted in.
2009-06-12 10:06:24 -07:00
Jaikumar Ganesh
544fff54a9 am ee748d37: Fix network preference getting incorrectly set.
Merge commit 'ee748d37b01b3affb72b701d95ba20c189887b5f'

* commit 'ee748d37b01b3affb72b701d95ba20c189887b5f':
  Fix network preference getting incorrectly set.
2009-05-19 17:36:59 -07:00
Jaikumar Ganesh
ee748d37b0 Fix network preference getting incorrectly set.
When the phone process crashes, we set the network preference
incorrectly. Also read the default value from a system property.
2009-05-19 17:29:42 -07:00
Android (Google) Code Review
60e6e19907 am 83a6ec60: Merge change 1791 into donut
Merge commit '83a6ec600259d245b799a99a8e963704db031a63'

* commit '83a6ec600259d245b799a99a8e963704db031a63':
  Add a method to get the PhoneType in CellLocation.
2009-05-19 17:20:07 -07:00
Jaikumar Ganesh
9bfbfbd40d Add a method to get the PhoneType in CellLocation.
CellLocation uses TelephonyManager to get the PhoneType.
TelephonyManager uses the system property to get the phoneType,
if the ITelephony interface is not up.
2009-05-19 17:15:22 -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
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
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
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
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