67 Commits

Author SHA1 Message Date
Android (Google) Code Review
07bca34551 am 9db0d36c: Merge change 7600 into donut
Merge commit '9db0d36c6141d8e0ccf6ca6c450872f03b55c15f'

* commit '9db0d36c6141d8e0ccf6ca6c450872f03b55c15f':
  Update youtube bookmark
2009-07-17 02:08:53 -07:00
Jim Miller
82887f079f Update youtube bookmark 2009-07-16 15:33:10 -07:00
Android (Google) Code Review
1dcdce6db7 am c353268c: Merge change 6968 into donut
Merge commit 'c353268c20a8ea425ac9f1e328684855cfc805e0'

* commit 'c353268c20a8ea425ac9f1e328684855cfc805e0':
  Import new translations
2009-07-13 16:32:17 -07:00
Eric Fischer
0560209bcd Import new translations 2009-07-13 15:42:14 -07:00
Android (Google) Code Review
c6f81c6716 am d1e5e3ff: Merge change 6639 into donut
Merge commit 'd1e5e3ffc22478bad8525dec4f1c6d57fe0ad368'

* commit 'd1e5e3ffc22478bad8525dec4f1c6d57fe0ad368':
  Restore audio settings and wifi.
2009-07-09 12:53:41 -07:00
Amith Yamasani
d158214511 Restore audio settings and wifi.
Optimize backups by writing an entity only if the checksum of the data has changed.
Call into the hidden AudioService API to apply changed audio settings.
After restoring wifi data, make sure that the permissions and ownership are set
properly for the supplicant process to access it.
Locale isn't restoring properly - TODO added.
2009-07-09 12:01:25 -07:00
-b master
2eac99ccbc resolved conflicts for merge of d6fe243c to master 2009-07-07 22:55:28 -07:00
Amith Yamasani
8823c0a8c6 Backup / Restore locale preference.
Also backup development settings MOCK_LOCATION and USB_DEBUGGING.
Backup and restore more of the Audio settings. Won't work yet without a reboot.
Disable Wifi supplicant restore temporarily. It seems to be disabling Wifi due to
permissions problems.
Don't restore Ringtones.
2009-07-07 18:42:46 -07:00
-b master
f6a34dd6ab resolved conflicts for merge of b7195159 to master 2009-07-06 17:44:41 -07:00
Amith Yamasani
70c874ba20 Restore GPS state and ringer/vibrate toggles.
Inform backup manager when sync flags change. Set ringer/vibrate mode.
2009-07-06 17:18:46 -07:00
Android (Google) Code Review
d719890cab Merge change 6285
* changes:
  Make backup agent run in the system process as well.
2009-07-06 14:48:43 -07:00
Amith Yamasani
344bf682c9 Make backup agent run in the system process as well. 2009-07-06 14:47:30 -07:00
Amith Yamasani
47873e5526 Backup Wifi supplicant data.
WifiService requests a backup when it writes wifi configuration to disk.
Backup the wifi supplicant file when settings provider runs backup.
2009-07-06 14:28:06 -07:00
-b master
501eec92f9 Revert "hand rolled out 220f4d633be1098e7887dbd06f179138bf19f1ad due to interface changes on master, the change will need to be made again"
This reverts commit f8e3ba5bfad14f3037d72eb6243258c13169cbd8.
2009-07-06 14:05:11 -07:00
The Android Open Source Project
f8e3ba5bfa hand rolled out 220f4d633be1098e7887dbd06f179138bf19f1ad due to interface changes on master, the change will need to be made again 2009-07-03 10:51:26 -07:00
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
426cc62598 Make backup agent run in the system process as well. 2009-07-02 14:25:21 -07:00
Amith Yamasani
16d79e56ca Backup Wifi supplicant data.
WifiService requests a backup when it writes wifi configuration to disk.
Backup the wifi supplicant file when settings provider runs backup.
2009-07-02 12:05:32 -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
Android (Google) Code Review
6afe81339e Merge change 4720 into donut
* changes:
  Fix string formatters in SettingsProvider SecurityException message.
2009-06-19 10:29:59 -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
Android (Google) Code Review
2810f68199 Merge change 4694 into donut
* changes:
  Make SettingsProviders SecurityException messages more verbose.
2009-06-18 17:24:47 -07:00
Brett Chabot
16dd82cfdc Make SettingsProviders SecurityException messages more verbose. 2009-06-18 17:05:03 -07:00
Android (Google) Code Review
130a8f8cbf am 3f4263fa: Merge change 4411 into donut
Merge commit '3f4263fac6bcc68b3c7fff8e6ac9ad2d97b2ad4c'

* commit '3f4263fac6bcc68b3c7fff8e6ac9ad2d97b2ad4c':
  Squashed commit of the following:
2009-06-17 18:46:21 -07:00
Eric Fischer
f204ab3ebc Squashed commit of the following:
commit 8e1a200225b7e4756b83d17d679a71a06a38b696
Author: Eric Fischer <enf@google.com>
Date:   Tue Jun 16 16:32:56 2009 -0700

    Make names of Settings, VPN, Subscribed Feeds providers localizable.
2009-06-17 15:17:29 -07:00
Android (Google) Code Review
3c3d3081aa am 727f36c6: Merge change 4265 into donut
Merge commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef'

* commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef':
  process: Fix bug where if a thread exited while we were changing its control
  Fix the build: Remove ADD_SYSTEM_SERVICE, which I had accidentally
2009-06-16 08:36:48 -07:00
Android (Google) Code Review
29930a1cb8 am 3dcea047: Merge change 4237 into donut
Merge commit '3dcea047c5c7a61a56f618815e298d7bd38e2678'

* commit '3dcea047c5c7a61a56f618815e298d7bd38e2678':
  Remove obsolete FOTA_UPDATE permission (which should never have been
2009-06-16 08:36:35 -07:00
Dan Egnor
cb05cc4acb Fix the build: Remove ADD_SYSTEM_SERVICE, which I had accidentally
reintroduced in an errant and clumsy git merge operation.

Also remove permission label and description strings for now-deleted
permissions FOTA_UPDATE and (within the SettingsProvider package)
WRITE_GSERVICES.
2009-06-15 16:50:51 -07:00
Dan Egnor
2d4b6ad9d4 Remove obsolete FOTA_UPDATE permission (which should never have been
made public, and wouldn't be used by any third party applications,
and no longer does anything regardless).

Also remove the WRITE_GSERVICES permission from the SettingsProvider
package's manifest (the declaration there was redundant with the one
in the core manifest, where all the other settings-related permissions
live -- no other core package includes its own permission definitions).
2009-06-15 16:29:20 -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
Android (Google) Code Review
fd38b81dca am f313b59b: Merge change 1957 into donut
Merge commit 'f313b59b4fd6711c734288badd75c6aa0b57ee6e'

* commit 'f313b59b4fd6711c734288badd75c6aa0b57ee6e':
  Settings: Disable network location service by default, enable GPS instead.
2009-05-19 11:16:24 -07:00
Mike Lockwood
79a6b3b449 Settings: Disable network location service by default, enable GPS instead.
Network Location Provider requires user opt-in, so it should be disabled by default
and only enabled if the user agrees to the terms of service and privacy policy.
Use GPS as default location provider instead.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-19 07:57:58 -04: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
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