264 Commits

Author SHA1 Message Date
Mike Lockwood
11046a2a4b WifiStateTracker: add support for overriding DCHP max retry count in an overlay
Bug: 5551068

Change-Id: I7817eeb1409af2056a63548104c3c64f93ee7def
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-02-13 14:08:50 -08:00
Mike Lockwood
dd991fc787 Allow disabling network stats support in a resource overlay
Bug: 5771240

Change-Id: Ic516f05fcc94b568ebc66837886dd7ec3cb211f4
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-01-06 14:07:57 -05:00
Mike Cleron
cbc736756e am 840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1
* commit '840201d6e2d7d53e42a31ffeb2ef454982882d12':
  Update VIBRATE_ON to a supported value when upgrading from GB.
2011-12-13 10:52:23 -08:00
Amith Yamasani
3066afdc6f Update VIBRATE_ON to a supported value when upgrading from GB.
Bug: 5738552

If value has ringer set to VIBRATE_OFF, we need to update it to the
now default, as VIBRATE_OFF is inconsistent with the new UI controls.

Make sure notification vibrate setting follows ringer vibrate setting.
Change-Id: I6638c8a8729d850e71db10d27a0b50d24dc11f19
2011-12-12 16:24:13 -08:00
Amith Yamasani
52cb1da2c6 am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1
* commit 'f336408000c4be36045401fb4df89528249e7383':
  New and improved silent mode on lockscreen.
2011-12-07 11:02:51 -08:00
Jason Simmons
a188e4dc0e resolved conflicts for merge of ea25ea7e to ics-aah
Change-Id: I9d387ad2107486406f364f1cebc709126e2d27a5
2011-12-07 10:47:48 -08:00
Amith Yamasani
6243edd818 New and improved silent mode on lockscreen.
3-state item to toggle between Silent/Vibrate/Ringer in long-press power menu.
No volume dialog on lockscreen, unless Power menu is up.

Set VIBRATE_IN_SILENT=1 when upgrading device.

Change-Id: I097d216f96c4abdbd83420e0c477106951b3607d
2011-12-06 14:48:38 -08:00
Jason Simmons
3b282fae37 resolved conflicts for merge of 0c0120ef to ics-aah
Change-Id: If1f39ff160b4305ef057d50bb1f01d2c45f1579d
2011-12-06 11:11:13 -08:00
Svetoslav Ganov
ea25ea7ef3 Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1 2011-12-06 10:27:04 -08:00
Dianne Hackborn
f5b8671c34 Fix issue #5714517: App shortcuts can result in bad task intents
New API to let you build an Intent whose base configuration is correct,
but has an additional "selector" to pick out the specific app that you
would like launched.

Change-Id: Ide9db6dc60e2844b7696cfe09b28337fe7dd63db
2011-12-05 17:42:41 -08:00
Svetoslav Ganov
55f937abe1 Adding a system preference whether to speak passwords in accessibility mode.
By default we do not speak passwords if the user has no headset. However,
many users find this too restrictive and would like a way to enable
password announcement. While we cannot speak the passwords all the time
,to avoid leaking them, we expose a preference so each user can choose
the option that best works for him/her.

bug:5712607

Change-Id: I6eb0c40834abe5297f7dc74be02d180a5bef0174
2011-12-05 14:54:59 -08:00
Jeff Brown
d4b1c4424d resolved conflicts for merge of be6ab576 to ics-aah
Change-Id: I87c5679c46a58e233da30e73f068bed2af627ab3
2011-11-29 14:10:46 -08:00
Jeff Brown
be6ab576ff Merge "Fix application launch shortcuts." into ics-mr1 2011-11-29 13:13:33 -08:00
Jeff Brown
6651a63834 Fix application launch shortcuts.
Improved quick launch bookmarks to support category-based shortcuts
instead of hardcoding package and class names for all apps.

Added a set of Intent categories for typical applications on the
platform.

Added support for some of the HID application launch usages to
reduce reliance on quick launch for special purpose keys.  Some
keyboard vendors have hardcoded launch keys that synthesize
"Search + X" type key combos.  The goal is to encourage them
to stop doing this by implementing more of HID.

Bug: 5674723
Change-Id: I79f1147c65a208efc3f67228c9f0fa5cd050c593
2011-11-29 12:17:22 -08:00
Eric Fischer
9ced561608 am 9ab3c624: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '9ab3c62499c054b600699fb107c28fc8926ca5a1':
  Import revised translations.  DO NOT MERGE
2011-11-29 11:47:00 -08:00
Eric Fischer
fa56c714f2 Import revised translations. DO NOT MERGE
Change-Id: Ia50fd44ea4492188f481e652caae940acaf961e2
2011-11-29 11:42:53 -08:00
Amith Yamasani
9b8a465dbc am aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1
* commit 'aefc0ed9677233d5e8c991196f970222b4899dc3':
  Don't upgrade some settings from GB to ICS.
2011-11-17 10:02:29 -08:00
Amith Yamasani
5cd1500cc4 Don't upgrade some settings from GB to ICS.
Copy the value of AUTO_TIME to AUTO_TIME_ZONE.
Don't upgrade screen timeout and auto brightness.

Bug: 5607851, 5217460

Also fix the default for vibrate mode. Bug: 5553900

Change-Id: I1b8d5215d55953f2b686e77bf55fd07110a08b8d
2011-11-16 18:09:15 -08:00
Jason Simmons
f0b82d61f5 resolved conflicts for merge of faa81c82 to ics-aah
Change-Id: I7464f16940058cc9b5a3dba5cb839bc67129009e
2011-11-10 14:29:46 -08:00
Tom Taylor
994da2ad32 Revert "Add new secure setting for controlling Messaging notifications"
This reverts commit 03da2f00aac04e6565a02cf5a9bf6bb1ec926930.

 Committer: Tom Taylor <tomtaylor@google.com>

 On branch revertsetting
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   api/current.txt
	modified:   core/java/android/provider/Settings.java
	modified:   core/java/android/provider/Telephony.java
	modified:   packages/SettingsProvider/res/values/defaults.xml
	modified:   packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

We've decided not to disable messaging notifications with a secure setting.
Instead, all the work will be done within the messaging app itself.

Change-Id: Icde6894e76da1007b6026c8ec7dc56e488453c06
2011-11-10 11:17:38 -08:00
Robert Greenwalt
b45a317b56 am ea54b760: Merge "Wimax : wimax framework related open source." into ics-mr1
* commit 'ea54b7608584bc0535c9e89417778c3e95b50975':
  Wimax : wimax framework related open source.
2011-11-08 18:28:16 +00:00
Jason Simmons
bfc3e70662 resolved conflicts for merge of 1366c756 to ics-aah
Change-Id: I9faea6d9604f44b389acb4268941a7e5917ef1a8
2011-11-08 10:05:56 -08:00
Robert Greenwalt
ea54b76085 Merge "Wimax : wimax framework related open source." into ics-mr1 2011-11-08 10:01:07 -08:00
tk.mun
148c7d0de7 Wimax : wimax framework related open source.
Integrate wimax network related changes into Android Framework.
- In Connectivity service, start wimax service.
- 4G icon display in StatusBarPolicy.
- DHCP renew add.
- Add radio for wiamx

Change-Id: I2d9012247edfdf49d71ca7e1414afd0006f330ca
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:5237167
2011-11-07 14:47:40 -08:00
Tom Taylor
03da2f00aa Add new secure setting for controlling Messaging notifications
Bug 5552615
We're adding a new intent to allow 3rd party apps to disable
the Messaging app's notification. We want any app to be able to query
the setting of whether sms notifications are on or off, but only allow
system apps, particularly the Messaging app, to change that setting.
Other apps can change the setting by firing off an intent which brings
up a dialog activity in the Messaging app that'll let them turn off
Messaging notifications.

Change-Id: I4d2721191b86010efb383a24c28d911496440657
2011-11-07 14:16:44 -08:00
Eric Fischer
a58afca896 am abf75396: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit 'abf7539642a7c3d8d31c1d12d705b54cf155db1a':
  Import revised translations.  DO NOT MERGE
2011-11-01 20:55:37 +00:00
Eric Fischer
9ac5d49125 Import revised translations. DO NOT MERGE
Change-Id: I43513501e2c0eee9339551d0f20411d14bd5eace
2011-11-01 13:33:04 -07:00
Mike Lockwood
0897602a61 SettingsProvider: Allow overridding default value for Setttings.Secure.DEVICE_PROVISIONED
Change-Id: I93c523b0e9b59f1fe72595ca6f3ae22e57c4939f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:52 -04:00
Mike Lockwood
3440013d65 Load lockscreen.disabled setting on database create as well as upgrade
Change-Id: I987cee2734b92458e799d9bac97b5a877a64d4f6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:52 -04:00
Mike Lockwood
017219ab2a SettingsProvider: Add support for overriding lockscreen.disabled default value
Change-Id: I88c03a01727538dde3cec1ab93ebe8a66a6768a7
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:52 -04:00
Mike Lockwood
091c4f67b1 Allow overriding default STAY_ON_WHILE_PLUGGED_IN setting value in an overlay
Change-Id: Ic9a6da1f52848a2445d64b87e6f23aa4750d2842
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:52 -04:00
Eric Fischer
b0d150aa53 Import revised translations.
Change-Id: I83ab00ec220b7c0ba0d37e7f4c91e945e35aab39
2011-10-18 15:03:21 -07:00
Justin Ho
89038b4df8 Update Settings Storage app icon
Change-Id: Ic4057f61a7e11fcfceb619ded7152621718262c0
2011-10-17 15:18:14 -07:00
Jeff Brown
1d8e7d640a Fix Cursor leak in SettingsBackupAgent.
Bug: 5434060

Change-Id: I805695a30d6778d0c7302e63bcfe3dc1a38488f4
2011-10-09 15:25:23 -07:00
Svetoslav Ganov
a571a5836c Settings are restored in alphabetical order rather in order of dependency.
Settings were restore in alphabetical order and capturing dependency
among them required keys to be chosen in such a way that after sorting
they apprear in dependency order. Now settings are exported and restored
in the order they are declared in the arrays of settings to backup.
Hence, the order in this array will capture the dependency order.

bug:5343351

Change-Id: I93a40bcdd194943cd6f85aa18f1557d546e38274
2011-09-21 18:21:24 -07:00
Dianne Hackborn
d2509fd835 Add boot mode where only "core apps" are started.
A core app is one that has coreApp="true" in its manifest tag.

The system can successfully boot (though a little painfully) with
only framework-res.apk, SettingsProvider.apk, SystemUI.apk,
DefaultContainerService.apk, and Launcher2.apk set as core apps.

Currently this boot mode is always turned off.

Change-Id: Ieaa4a8031c2c391a12996aa8d8b1d65fc2b09d6b
2011-09-12 12:29:43 -07:00
Nick Pelly
8d32a01bd2 Add NFC to airplane mode
NFC now observes airplanes mode, and is by default toggleable in airplane mode.

Change-Id: I5f19d35422c9eb1cffb0b5e0631b3f3c5eeaedcf
2011-08-09 16:31:46 -07:00
Amith Yamasani
e6087d7715 Don't change system sound defaults for upgrades.
This reverts an earlier change that reset the system sound defaults even
for upgrades.

Bug: 5114198
Change-Id: Ide0afbd26080ba87d177cedfa9b1d50352857a00
2011-08-04 15:51:32 -07:00
Amith Yamasani
42722bfa13 Volume panel changes.
Combined volume panel only in tablets. On phones show active volume.
Added dummy assets for ring+notification icon.

Deprecated the NOTIFICATION_USES_RING_VOLUME. Now they are always
tied together. Audio manager changes still required to ensure that.

Initialize all feedback sounds to true.

Change-Id: I3ad7890c9be9334eedb5f3b709a4b6995fe24638
2011-08-01 16:45:28 -07:00
Christopher Tate
0a779813e1 Merge "Support full-backup encryption and global backup password" 2011-07-28 16:28:21 -07:00
Christopher Tate
2efd2dbbac Support full-backup encryption and global backup password
If the user has supplied a backup password in Settings, that password
is validated during the full backup process and is used as an encryption
key for encoding the backed-up data itself.  This is the fundamental
mechanism whereby users can secure their data even against malicious
parties getting physical unlocked access to their device.

Technically the user-supplied password is not used as the encryption
key for the backed-up data itself.  What is actually done is that a
random key is generated to use as the raw encryption key.  THAT key,
in turn, is encrypted with the user-supplied password (after random
salting and key expansion with PBKDF2).  The encrypted master key
and a checksum are stored in the backup header.  At restore time,
the user supplies their password, which allows the system to decrypt
the master key, which in turn allows the decryption of the backup
data itself.

The checksum is part of the archive in order to permit validation
of the user-supplied password.  The checksum is the result of running
the user-supplied password through PBKDF2 with a randomly selected
salt.  At restore time, the proposed password is run through PBKDF2
with the salt described by the archive header.  If the result does
not match the archive's stated checksum, then the user has supplied
the wrong decryption password.

Also, suppress backup consideration for a few packages whose
data is either nonexistent or inapplicable across devices or
factory reset operations.

Bug 4901637

Change-Id: Id0cc9d0fdfc046602b129f273d48e23b7a14df36
2011-07-28 16:01:20 -07:00
Svetoslav Ganov
7434fe8be4 Merge "Updaing the database version" 2011-07-28 15:57:25 -07:00
Svetoslav Ganov
97c3311bb8 Updaing the database version
Change-Id: Iff671a152ac8c96d4136f0f268167c1b60842bb5
2011-07-28 12:45:06 -07:00
Svetoslav Ganov
8cbe6e8f12 Merge "Updating the data base upgrade/creation code for the new touch exploraion setting." 2011-07-28 12:29:29 -07:00
Svetoslav Ganov
a28a16d1c2 Updating the data base upgrade/creation code for the new touch exploraion setting.
1. Update the database creation/upgrade code to take care of the new setting
   to enable touch exploration.

2. Made the tocuh exploration settings persistent to the cloud.

Change-Id: Ie24e9184b4a21869432d11d207cb6464fadbac3b
2011-07-28 11:26:02 -07:00
Eric Fischer
3a6c36fdd7 Import revised translations.
Change-Id: Ia9c97db0cd31b9d3163318b4193a328a614a7098
2011-07-25 17:36:41 -07:00
Eric Laurent
c1d4166289 Fix issue 5012047: silent mode mutes music
Implemented different silent mode behaviors for tablets and phones.
The behavior inherited from Honeycomb was for tablets only and
was muting music in silent mode.

Change-Id: Ib053e7b70ca02190debc87648ab8a163f9d39577
2011-07-19 14:46:32 -07:00
Gilles Debunne
fa53d3002f Animation settings reset to default
Change-Id: Ie53c031ceb88d356742e80693edc14198506d54a
2011-07-08 11:21:09 -07:00
Christopher Tate
79ec80db70 Make full backup API available to apps
New methods for full backup/restore have been added to BackupAgent
(still hidden): onFullBackup() and onRestoreFile().  The former is the
entry point for a full app backup to adb/socket/etc: the app then writes
all of its files, entire, to the output.  During restore, the latter
new callback is invoked, once for each file being restored.

The full backup/restore interface does not use the previously-defined
BackupDataInput / BackupDataOutput classes, because those classes
provide an API designed for incremental key/value data structuring.
Instead, a new FullBackupDataOutput class has been introduced, through
which we restrict apps' abilities to write data during a full backup
operation to *only* writing entire on-disk files via a new BackupAgent
method called fullBackupFile().

"FullBackupAgent" exists now solely as a concrete shell class that
can be instantiated in the case of apps that do not have their own
BackupAgent implementations.

Along with the API change, responsibility for backing up the .apk
file and OBB container has been moved into the framework rather than
have the application side of the transaction do it.

Change-Id: I12849b06b1a6e4c44d080587c1e9828a52b70dae
2011-07-06 14:40:32 -07:00
Christopher Tate
f12fbcd608 Fix settings restore even harder
Change-Id: If6920743ae92dcf811a87a1eefd357f849c03a23
2011-06-28 16:16:42 -07:00