Jeff Brown
ad7ff60105
am a13be290
: am 9c0cc3b8
: Merge "Refresh apps when they become (un)available." into froyo
2010-03-31 09:55:44 -07:00
Jeff Brown
a13be2908c
am 9c0cc3b8
: Merge "Refresh apps when they become (un)available." into froyo
...
Merge commit '9c0cc3b8ee5f32c485ced17e72a2d9dc551e1caa' into kraken
* commit '9c0cc3b8ee5f32c485ced17e72a2d9dc551e1caa':
Refresh apps when they become (un)available.
2010-03-31 09:33:40 -07:00
Jeff Brown
9c0cc3b8ee
Merge "Refresh apps when they become (un)available." into froyo
2010-03-31 09:27:25 -07:00
Dianne Hackborn
9dd0bb3889
am 45c4bc1a
: am d4fb738a
: Merge "Fix issue# 2544176: running services list update outside of ui thread." into froyo
2010-03-30 18:39:26 -07:00
Dianne Hackborn
45c4bc1ae5
am d4fb738a
: Merge "Fix issue# 2544176: running services list update outside of ui thread." into froyo
...
Merge commit 'd4fb738aa721f5bd16e5fa71bb3bbbe14d85a450' into kraken
* commit 'd4fb738aa721f5bd16e5fa71bb3bbbe14d85a450':
Fix issue# 2544176: running services list update outside of ui thread.
2010-03-30 18:32:33 -07:00
Dianne Hackborn
d4fb738aa7
Merge "Fix issue# 2544176: running services list update outside of ui thread." into froyo
2010-03-30 18:25:10 -07:00
Dianne Hackborn
309f236255
Fix issue# 2544176: running services list update outside of ui thread.
...
Also fix to put the services in a somewhat reasonable order.
Change-Id: I564c4d3fb1c0d803fe795c3d3a4a1d1d731f77fa
2010-03-30 18:14:38 -07:00
Robert Greenwalt
ffda073955
am 5a7e9a66
: am 388b4a87
: Merge "Add Title to the Tether help dialog" into froyo
2010-03-30 16:08:15 -07:00
Robert Greenwalt
5a7e9a663c
am 388b4a87
: Merge "Add Title to the Tether help dialog" into froyo
...
Merge commit '388b4a8726459c20827bc44488ffb9eb890080ee' into kraken
* commit '388b4a8726459c20827bc44488ffb9eb890080ee':
Add Title to the Tether help dialog
2010-03-30 16:00:11 -07:00
Robert Greenwalt
388b4a8726
Merge "Add Title to the Tether help dialog" into froyo
2010-03-30 15:54:47 -07:00
Mike LeBeau
4f71216194
am e81d2381
: am 38947ddc
: Fix the build - doh.
2010-03-30 14:59:25 -07:00
Mike LeBeau
e81d23819c
am 38947ddc
: Fix the build - doh.
...
Merge commit '38947ddcfb2411d380d631ebfc29d66b11821879' into kraken
* commit '38947ddcfb2411d380d631ebfc29d66b11821879':
Fix the build - doh.
2010-03-30 14:53:38 -07:00
Mike LeBeau
38947ddcfb
Fix the build - doh.
...
Change-Id: Iffaf7276340c00b3652e38580abdb218e5907917
2010-03-30 14:45:00 -07:00
Mike LeBeau
7f9d9965bc
am 898c7e18
: am e076bef9
: Add new string to identify what speech recognizer the settings are for.
2010-03-30 14:30:35 -07:00
Mike LeBeau
898c7e1862
am e076bef9
: Add new string to identify what speech recognizer the settings are for.
...
Merge commit 'e076bef97d4ec83b6ef3a27ca7b8143d8ad306f2' into kraken
* commit 'e076bef97d4ec83b6ef3a27ca7b8143d8ad306f2':
Add new string to identify what speech recognizer the settings are for.
2010-03-30 14:24:55 -07:00
Mike LeBeau
e076bef97d
Add new string to identify what speech recognizer the settings are for.
...
http://b/2546173
Change-Id: I7d59a69eba0e4f3c87586c968574d291a200352c
2010-03-30 14:16:34 -07:00
Jim Miller
03077b68d8
am 9b0a726e
: am 43630806
: Merge "Fix 2527411: Remove unusable display timeouts from Settings." into froyo
2010-03-30 14:04:17 -07:00
Jim Miller
9b0a726efc
am 43630806
: Merge "Fix 2527411: Remove unusable display timeouts from Settings." into froyo
...
Merge commit '43630806bbe4dab6509fe825938ce28b0b4b76c8' into kraken
* commit '43630806bbe4dab6509fe825938ce28b0b4b76c8':
Fix 2527411: Remove unusable display timeouts from Settings.
2010-03-30 13:58:03 -07:00
Jim Miller
43630806bb
Merge "Fix 2527411: Remove unusable display timeouts from Settings." into froyo
2010-03-30 13:51:43 -07:00
Robert Greenwalt
b6b3d17007
Add Title to the Tether help dialog
...
bug:2546313
Change-Id: Ib70118b40289abd3cafdecf7fc814ca48bce2960
2010-03-30 13:48:27 -07:00
Daniel Sandler
7811009111
Restore dependency between volume settings and silent mode.
...
Volume (of the ringer, notifications, media, and alarms) may
no longer be adjusted while the phone is in silent mode.
This was the behavior in Eclair and earlier releases.
This rolls back a small portion of change I724c43aa in the
interest of stability (see bugs listed below for weirdness
that occurs when the ringer's SeekBarVolumizer is visible
when the ringtone stream is muted).
Bug: 2552268
Bug: 2544706
Change-Id: I4858e6d85e5ec8c4bba83b649e24dd5915252eb2
2010-03-30 14:55:23 -04:00
Kenny Root
6af7564dd9
am bb2ddbba
: am c0b5624c
: Import revised translations
2010-03-30 09:53:24 -07:00
Kenny Root
bb2ddbba63
am c0b5624c
: Import revised translations
...
Merge commit 'c0b5624ccc3b88b6b22fb39da30eed227b87785b' into kraken
* commit 'c0b5624ccc3b88b6b22fb39da30eed227b87785b':
Import revised translations
2010-03-30 09:46:20 -07:00
Kenny Root
c0b5624ccc
Import revised translations
...
Change-Id: Ib730899be1485cc95ed6254279bae0c9413332b3
2010-03-30 09:33:49 -07:00
Jim Miller
d90b5a84d8
Fix 2527411: Remove unusable display timeouts from Settings.
...
This fix removes unusable display timeouts from Settings when
a device policy is enabled.
Patch 3 catches the case where not having any active policies clears the list.
Change-Id: I5b08d420c73b1c2e6fe2bb4e65656790290574cd
2010-03-29 22:16:55 -07:00
Jeff Brown
347c9a0544
Refresh apps when they become (un)available.
...
This fixes a bug in the current code that causes apps to be removed
from the list when they become unavailable.
Change-Id: Ic0b4c0fa34662ce3c458117b6807742448ec6575
2010-03-29 17:51:23 -07:00
Oscar Montemayor
b61ff1aac9
am dcdbfc51
: (-s ours) am 316c0db4
: (-s ours) Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo
2010-03-29 16:36:51 -07:00
Oscar Montemayor
dcdbfc5178
am 316c0db4
: (-s ours) Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo
...
Merge commit '316c0db4ebe4ba491e147cad3eb6ac87ba31095d' into kraken
* commit '316c0db4ebe4ba491e147cad3eb6ac87ba31095d':
DO NOT MERGE
2010-03-29 16:30:34 -07:00
Oscar Montemayor
316c0db4eb
Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo
2010-03-29 16:23:53 -07:00
Suchi Amalapurapu
29c8037335
Merge "Return empty string for new error code. The new string will be defined later." into froyo
2010-03-29 15:31:34 -07:00
Suchi Amalapurapu
9a3a1a4e58
Return empty string for new error code.
...
The new string will be defined later.
Change-Id: I7dc80ca96461e083cd8d8fba4815ac263dac61a4
2010-03-29 15:18:34 -07:00
San Mehat
8439822289
Settings: Fix for http://b/issue?id=2538399 (ANR while formatting sd)
...
Change-Id: I94b84a45557cbce706c37d5088d398283a639c80
Signed-off-by: San Mehat <san@google.com >
2010-03-29 14:32:02 -07:00
Oscar Montemayor
6f72be68c1
DO NOT MERGE
...
Removing unused features from source tree.
Please refer to Bug#2502219.
Change-Id: Ib3321f3c0e3edf7dff947917ba9bad0f7da93c89
2010-03-26 18:45:05 -07:00
Dianne Hackborn
39e64e76c1
API council: don't allow admin add from new task.
...
Change-Id: I45f75f8e2c43ba0dae51d37e104d18d0b1a2cdbf
2010-03-26 13:24:39 -07:00
Jim Miller
449708b123
Merge "Fix 2535700: Add support for enforcing password quality"
2010-03-25 19:55:54 -07:00
Jim Miller
af366a3ed6
Fix 2535700: Add support for enforcing password quality
...
Change-Id: I908b4229d46061f3d450adec72b04276fe10afc1
2010-03-25 18:45:22 -07:00
Jaikumar Ganesh
9166a9635e
Merge "Stop scanning as soon as device is picked in the device picker."
2010-03-25 15:57:17 -07:00
Jaikumar Ganesh
cdc5e6eea2
Stop scanning as soon as device is picked in the device picker.
...
This improves OPP transfer time by a couple of seconds.
Change-Id: I40e8f092ca3950a2d180b78f07f1cc717f2daaf6
2010-03-25 14:21:10 -07:00
Irfan Sheriff
9303d97e6a
Remember Wifi state prior to tethering
...
We now remember whether Wifi was enabled
prior to enabling tethering. This will
allow us to restore Wifi when tethering
is disabled.
Bug: 2537983
Change-Id: Ia530563bd5647856d62cd59b67ae5156de6fd5d9
2010-03-25 12:23:18 -07:00
Irfan Sheriff
a6a74e222a
Disable tethering to enable Wifi
...
We need to explicitly disable wifi while enabling
tethering and disable tethering while enabling wifi
Bug: 2539071
Change-Id: I7fda6e4d9d1bb804e81561d52b5f3a982a674b0e
2010-03-25 11:39:11 -07:00
Amith Yamasani
305b0fb47c
Fix 2242164 Soft keyboard keeps getting enabled even if I disable it
...
On keyboardful devices, it is possible to disable the system soft input
method. Something changed in eclair that caused the ime to be re-enabled
on every package manager update (packages added/deleted).
Now keep track of disabled system imes in the settings db and search
in that list before enabling a system IME on package changes.
Every time the user goes to settings to enable/disable imes, the list
is re-created.
Any new system IMEs that may be added via an OTA will get enabled if
they have a different package name.
2010-03-24 22:30:16 -07:00
Suchi Amalapurapu
3d503e356f
When unmounting the sdcard, we are currently checking for apps that
...
have open file references on the sdcard. We also have to check for apps on sd
that are currently running. Use the new ActivityManager api to get a list of these apps before deciding to show the dialog.
Change-Id: Idb00fcbd0a3f314d75ee1662cb2b10a84569527a
2010-03-24 09:08:40 -07:00
Suchi Amalapurapu
e4a318f15c
Merge "Disable uninstall button when move is in progress. Handle onActivityResult in ManageApplications when a package has been uninstalled."
2010-03-23 16:11:32 -07:00
Suchi Amalapurapu
de03ac27b7
Disable uninstall button when move is in progress.
...
Handle onActivityResult in ManageApplications when a package has been
uninstalled.
Change-Id: I4c4a8a54f9743f89949f47e21c1e143ac08ca2c3
2010-03-23 15:43:35 -07:00
Suchi Amalapurapu
983192df77
Merge "The getStorageUsers only returns list of storage users accessing the sdcard. We also have to check if applications on sdcard are currently running."
2010-03-23 15:37:12 -07:00
Suchi Amalapurapu
6f58b1b426
The getStorageUsers only returns list of storage users accessing the sdcard.
...
We also have to check if applications on sdcard are currently running.
Change-Id: I4b6478bc834e956f963735f69829c5ba4c7fb8c2
2010-03-23 15:17:52 -07:00
Dianne Hackborn
98d55daeea
Update running services in background thread.
...
This avoid the main UI glitching when an update happens. Also fix
some problems with how overall memory usage was shown.
Change-Id: Ida415eb07c8671059a24c3be1ebf16910f4b6da2
2010-03-23 10:45:07 -07:00
Jim Miller
28bcb47ef7
Merge "Fix 2535700: Strings for additional security policies."
2010-03-23 01:02:02 -07:00
Chung-yih Wang
141fe818f1
Fix the incorrect keystore prefix of private key in the wpa_supplicant.conf.
...
Change-Id: Ibc77d10f6c945d274037422b2e4e58d1bbd9888d
2010-03-23 12:17:20 +08:00
Jim Miller
b11e275a99
Fix 2535700: Strings for additional security policies.
...
Change-Id: Icd2f31ae5393ee7b26113d8c3f31ef06b3469939
2010-03-22 19:36:34 -07:00