OSDN Git Service
Charles Chen [Tue, 13 Apr 2010 00:01:32 +0000 (17:01 -0700)]
am
ac8398a9: am
28e7651f: Merge "Fixing bug
2577511 - incorrectly trying to access a setting." into froyo
Jim Miller [Tue, 13 Apr 2010 00:01:30 +0000 (17:01 -0700)]
am
e587fb67: am
0b326a6f: Merge "Fix
2579923: Make changing lock screen method more discoverable." into froyo
Charles Chen [Mon, 12 Apr 2010 21:29:23 +0000 (14:29 -0700)]
am
28e7651f: Merge "Fixing bug
2577511 - incorrectly trying to access a setting." into froyo
Merge commit '
28e7651f804003ee7843be8aed92fd72854496ee' into kraken
* commit '
28e7651f804003ee7843be8aed92fd72854496ee':
Fixing bug
2577511 - incorrectly trying to access a setting.
Charles Chen [Mon, 12 Apr 2010 21:21:59 +0000 (14:21 -0700)]
Merge "Fixing bug
2577511 - incorrectly trying to access a setting." into froyo
Jim Miller [Mon, 12 Apr 2010 20:55:43 +0000 (13:55 -0700)]
am
0b326a6f: Merge "Fix
2579923: Make changing lock screen method more discoverable." into froyo
Merge commit '
0b326a6fad8caf250b61cc49b962495202562a5c' into kraken
* commit '
0b326a6fad8caf250b61cc49b962495202562a5c':
Fix
2579923: Make changing lock screen method more discoverable.
Jim Miller [Mon, 12 Apr 2010 20:48:36 +0000 (13:48 -0700)]
Merge "Fix
2579923: Make changing lock screen method more discoverable." into froyo
Charles Chen [Mon, 12 Apr 2010 19:06:30 +0000 (12:06 -0700)]
Fixing bug
2577511 - incorrectly trying to access a setting.
Change-Id: I50f3b2f4878bea1392aa36d47015cd312a59e23a
Jim Miller [Fri, 9 Apr 2010 02:40:19 +0000 (19:40 -0700)]
Fix
2579923: Make changing lock screen method more discoverable.
This changes the organization of lock screen security settings
to make choosing an alternate unlock method more discoverable.
Instead of having to disable the old lock method to use a new
one, the user now just has one set/change option in lock settings,
with a list of method-specific setting below it.
In addition, we ask the user to confirm their old credentials
before prompting them to choose a new one, which eliminates one
source of confusion.
Also, ChooseLockGeneric now shows a UI if quality isn't specified.
Any unlock method less secure than minimum specified by
DevicePolicyManager (if active) is greyed out.
Change-Id: Iecc6f64d4d3368a583f06f8d5fe9655cc3d5bd3b
Irfan Sheriff [Sat, 10 Apr 2010 18:58:12 +0000 (11:58 -0700)]
am
a4bbf553: am
3957b3c1: Merge "scan only when wifi is enabled" into froyo
Irfan Sheriff [Sat, 10 Apr 2010 18:47:09 +0000 (11:47 -0700)]
am
3957b3c1: Merge "scan only when wifi is enabled" into froyo
Merge commit '
3957b3c147673d631feef2df49f1177289e08d41' into kraken
* commit '
3957b3c147673d631feef2df49f1177289e08d41':
scan only when wifi is enabled
Irfan Sheriff [Sat, 10 Apr 2010 16:42:15 +0000 (09:42 -0700)]
Merge "scan only when wifi is enabled" into froyo
Irfan Sheriff [Fri, 9 Apr 2010 18:34:33 +0000 (11:34 -0700)]
scan only when wifi is enabled
Bug:
2570611
Change-Id: Ibb51dee8ec110179ec28f9469526a1fe61e74d00
Charles Chen [Fri, 9 Apr 2010 15:52:49 +0000 (08:52 -0700)]
am
df7d8ee6: am
8c8185b2: Fixing bugs
2577511 and
2581920. Making sure that the language, country, and variant defaults are always set to something to ensure that there won\'t be an NPE. Dismissing the ListPreference dialogs before a rotation to avoid list data corrup
Charles Chen [Fri, 9 Apr 2010 05:42:14 +0000 (22:42 -0700)]
am
8c8185b2: Fixing bugs
2577511 and
2581920. Making sure that the language, country, and variant defaults are always set to something to ensure that there won\'t be an NPE. Dismissing the ListPreference dialogs before a rotation to avoid list data corruption caused by
Merge commit '
8c8185b2606f3a232e4498b1128ca7bdecc3628f' into kraken
* commit '
8c8185b2606f3a232e4498b1128ca7bdecc3628f':
Fixing bugs
2577511 and
2581920.
Charles Chen [Thu, 8 Apr 2010 23:51:35 +0000 (16:51 -0700)]
Fixing bugs
2577511 and
2581920.
Making sure that the language, country, and variant defaults are always
set to something to ensure that there won't be an NPE.
Dismissing the ListPreference dialogs before a rotation to avoid list
data corruption caused by the list being displayed while its data is
being re-initialized.
Change-Id: Iecdb3b4d415542dc8a4db162c930e6a6570a55f2
Jim Miller [Thu, 8 Apr 2010 20:56:54 +0000 (13:56 -0700)]
am
d86cfdda: am
2088c1ad: Merge "Fix
2579481: Fix change alphanumeric password security hole" into froyo
Jim Miller [Thu, 8 Apr 2010 20:44:55 +0000 (13:44 -0700)]
am
2088c1ad: Merge "Fix
2579481: Fix change alphanumeric password security hole" into froyo
Merge commit '
2088c1ada1f1997e7f363a5897dfc26b3635c80e' into kraken
* commit '
2088c1ada1f1997e7f363a5897dfc26b3635c80e':
Fix
2579481: Fix change alphanumeric password security hole
Jim Miller [Thu, 8 Apr 2010 20:39:57 +0000 (13:39 -0700)]
Merge "Fix
2579481: Fix change alphanumeric password security hole" into froyo
Charles Chen [Thu, 8 Apr 2010 16:57:06 +0000 (09:57 -0700)]
am
add29bfb: am
755cb302: Merge "Fix for
2579445 - Using the correct strings for accessing Intent extras now." into froyo
Charles Chen [Thu, 8 Apr 2010 16:52:18 +0000 (09:52 -0700)]
am
755cb302: Merge "Fix for
2579445 - Using the correct strings for accessing Intent extras now." into froyo
Merge commit '
755cb302e90b06820b313c09abfdf35ab899132c' into kraken
* commit '
755cb302e90b06820b313c09abfdf35ab899132c':
Fix for
2579445 - Using the correct strings for accessing Intent extras now.
Charles Chen [Thu, 8 Apr 2010 16:45:17 +0000 (09:45 -0700)]
Merge "Fix for
2579445 - Using the correct strings for accessing Intent extras now." into froyo
Jim Miller [Thu, 8 Apr 2010 07:48:52 +0000 (00:48 -0700)]
Fix
2579481: Fix change alphanumeric password security hole
This fixes a bug where changing an alphanumeric password didn't
ask for the old password first.
Change-Id: I8ef4d2b4b87d02c6ddd23da3177e6802fc579c64
Suchi Amalapurapu [Thu, 8 Apr 2010 04:36:55 +0000 (21:36 -0700)]
am
e6683e0c: am
3a95f926: Merge "Fix
2579461 Disable move when manifest option for install location is unspecified and install location is auto/internal" into froyo
Suchi Amalapurapu [Thu, 8 Apr 2010 04:32:26 +0000 (21:32 -0700)]
am
3a95f926: Merge "Fix
2579461 Disable move when manifest option for install location is unspecified and install location is auto/internal" into froyo
Merge commit '
3a95f92650e6bd9a994048878abda0950c11ec8b' into kraken
* commit '
3a95f92650e6bd9a994048878abda0950c11ec8b':
Fix
2579461
Suchi Amalapurapu [Thu, 8 Apr 2010 04:24:44 +0000 (21:24 -0700)]
Merge "Fix
2579461 Disable move when manifest option for install location is unspecified and install location is auto/internal" into froyo
Suchi Amalapurapu [Thu, 8 Apr 2010 02:34:48 +0000 (19:34 -0700)]
Fix
2579461
Disable move when manifest option for install location is unspecified
and install location is auto/internal
Change-Id: Ic7a493ecbbed6017326e2ec728e25c6ea9de8223
Charles Chen [Thu, 8 Apr 2010 00:41:07 +0000 (17:41 -0700)]
Fix for
2579445 - Using the correct strings for accessing Intent extras now.
Change-Id: I8a0b8f3add637ffffed4119b976c800ab3251b72
Michael Chan [Wed, 7 Apr 2010 23:42:53 +0000 (16:42 -0700)]
am
12b01014: am
0557a706: Merge "b/
2174155 Remove debug logging in bluetooth" into froyo
Charles Chen [Wed, 7 Apr 2010 23:42:51 +0000 (16:42 -0700)]
am
ecfe14cb: am
263b7704: Merge "Fix for bug #
2577984 - Settings app was trying to access the TTS before the TTS was ready." into froyo
Michael Chan [Wed, 7 Apr 2010 23:35:48 +0000 (16:35 -0700)]
am
0557a706: Merge "b/
2174155 Remove debug logging in bluetooth" into froyo
Merge commit '
0557a7062d4e40d895cbc86253a39cfe7f720f06' into kraken
* commit '
0557a7062d4e40d895cbc86253a39cfe7f720f06':
b/
2174155 Remove debug logging in bluetooth
Charles Chen [Wed, 7 Apr 2010 23:35:46 +0000 (16:35 -0700)]
am
263b7704: Merge "Fix for bug #
2577984 - Settings app was trying to access the TTS before the TTS was ready." into froyo
Merge commit '
263b7704bc7567429a9ed145d8f572066e510c5f' into kraken
* commit '
263b7704bc7567429a9ed145d8f572066e510c5f':
Fix for bug #
2577984 - Settings app was trying to access the TTS
Michael Chan [Wed, 7 Apr 2010 22:48:07 +0000 (15:48 -0700)]
Merge "b/
2174155 Remove debug logging in bluetooth" into froyo
Charles Chen [Wed, 7 Apr 2010 22:40:21 +0000 (15:40 -0700)]
Merge "Fix for bug #
2577984 - Settings app was trying to access the TTS before the TTS was ready." into froyo
Irfan Sheriff [Wed, 7 Apr 2010 22:09:43 +0000 (15:09 -0700)]
am
0e10c088: am
0b266964: Fix window leak on orientation change
Irfan Sheriff [Wed, 7 Apr 2010 22:04:07 +0000 (15:04 -0700)]
am
0b266964: Fix window leak on orientation change
Merge commit '
0b2669647f1328d2df79fd2d259bc9d15433ba0a' into kraken
* commit '
0b2669647f1328d2df79fd2d259bc9d15433ba0a':
Fix window leak on orientation change
Irfan Sheriff [Tue, 6 Apr 2010 22:16:44 +0000 (15:16 -0700)]
Fix window leak on orientation change
Use Activity managed dialogs
Bug:
2571764
Bug:
2571820
Change-Id: Id506988abd4200155774e92b31dd132519e29172
Charles Chen [Wed, 7 Apr 2010 21:26:31 +0000 (14:26 -0700)]
Fix for bug #
2577984 - Settings app was trying to access the TTS
before the TTS was ready.
Change-Id: Ic8127f12a2608982fb35e126c7522cf6747b93ac
Michael Chan [Wed, 7 Apr 2010 20:53:00 +0000 (13:53 -0700)]
am
746fac2d: am
d9db9e76: Merge "b/
2498180 b/
2568119 Retry if BT dock disconnects unexpectedly" into froyo
Michael Chan [Wed, 7 Apr 2010 20:31:21 +0000 (13:31 -0700)]
b/
2174155 Remove debug logging in bluetooth
Change-Id: Ia40af3bb362fe99fbfda1a23cdcb04fb96af7ca8
Michael Chan [Wed, 7 Apr 2010 20:19:51 +0000 (13:19 -0700)]
am
d9db9e76: Merge "b/
2498180 b/
2568119 Retry if BT dock disconnects unexpectedly" into froyo
Merge commit '
d9db9e762190f4cf46df0109139867c7a77746fe' into kraken
* commit '
d9db9e762190f4cf46df0109139867c7a77746fe':
b/
2498180 b/
2568119 Retry if BT dock disconnects unexpectedly
Michael Chan [Wed, 7 Apr 2010 20:12:33 +0000 (13:12 -0700)]
Merge "b/
2498180 b/
2568119 Retry if BT dock disconnects unexpectedly" into froyo
Adam Powell [Wed, 7 Apr 2010 17:00:24 +0000 (10:00 -0700)]
am
7cf43204: am
bdbb57b6: Merge "Fix bug
2564450 - prevent deadlock in BT settings" into froyo
Adam Powell [Wed, 7 Apr 2010 16:54:29 +0000 (09:54 -0700)]
am
bdbb57b6: Merge "Fix bug
2564450 - prevent deadlock in BT settings" into froyo
Merge commit '
bdbb57b6ab58ce5e14ce5cb1cd3b5d0351d566c4' into kraken
* commit '
bdbb57b6ab58ce5e14ce5cb1cd3b5d0351d566c4':
Fix bug
2564450 - prevent deadlock in BT settings
Adam Powell [Wed, 7 Apr 2010 16:48:28 +0000 (09:48 -0700)]
Merge "Fix bug
2564450 - prevent deadlock in BT settings" into froyo
Brad Fitzpatrick [Wed, 7 Apr 2010 16:33:41 +0000 (09:33 -0700)]
am
a494ff40: am
6e29e073: Merge "Make Power Control widget a bit more responsive." into froyo
Brad Fitzpatrick [Wed, 7 Apr 2010 16:25:06 +0000 (09:25 -0700)]
am
6e29e073: Merge "Make Power Control widget a bit more responsive." into froyo
Merge commit '
6e29e07357cb733ff204de21bfb4bf45833d4861' into kraken
* commit '
6e29e07357cb733ff204de21bfb4bf45833d4861':
Make Power Control widget a bit more responsive.
Brad Fitzpatrick [Wed, 7 Apr 2010 16:19:14 +0000 (09:19 -0700)]
Merge "Make Power Control widget a bit more responsive." into froyo
Charles Chen [Wed, 7 Apr 2010 00:58:24 +0000 (17:58 -0700)]
am
e2dabc76: am
473111bc: Fixing bug #
2575499 - TextToSpeech Settings did not verify that the current default language was still supported when the default engine changes.
Charles Chen [Wed, 7 Apr 2010 00:46:18 +0000 (17:46 -0700)]
am
473111bc: Fixing bug #
2575499 - TextToSpeech Settings did not verify that the current default language was still supported when the default engine changes.
Merge commit '
473111bcfca1342fdbd74af10189931a386c8f24' into kraken
* commit '
473111bcfca1342fdbd74af10189931a386c8f24':
Fixing bug #
2575499 - TextToSpeech Settings did not verify that the
Charles Chen [Tue, 6 Apr 2010 22:50:42 +0000 (15:50 -0700)]
Fixing bug #
2575499 - TextToSpeech Settings did not verify that the
current default language was still supported when the default engine
changes.
Change-Id: I2f4b986311161ceaa9d4b9cf3a495f536d9425cd
Brad Fitzpatrick [Mon, 5 Apr 2010 17:12:09 +0000 (10:12 -0700)]
Make Power Control widget a bit more responsive.
Based on a lot of timings on Sapphire.
Also, initially this CL improved the speed of Toasts, but now it just
removes the use of Toasts in the widget after eng/UX discussions with
various people.
BUG=
2535155
Change-Id: I134a730f17ebee8a119b7796984f00b22e0d6120
Michael Chan [Tue, 6 Apr 2010 21:49:30 +0000 (14:49 -0700)]
b/
2498180 b/
2568119 Retry if BT dock disconnects unexpectedly
Change-Id: Ic4771e7c305192fee56f5f80c6cabeecf11a99dc
Adam Powell [Tue, 6 Apr 2010 20:32:35 +0000 (13:32 -0700)]
Fix bug
2564450 - prevent deadlock in BT settings
Change-Id: Iea5d341d771d18e5d9bf7c6686995ba6cbbf2172
Irfan Sheriff [Mon, 5 Apr 2010 17:19:31 +0000 (10:19 -0700)]
am
dbb0a7ed: am
6e74d41b: Fix network disable on connect
Irfan Sheriff [Mon, 5 Apr 2010 16:39:52 +0000 (09:39 -0700)]
am
6e74d41b: Fix network disable on connect
Merge commit '
6e74d41bd0525459c43ed010e8f049ffc20ca362' into kraken
* commit '
6e74d41bd0525459c43ed010e8f049ffc20ca362':
Fix network disable on connect
Irfan Sheriff [Sat, 3 Apr 2010 00:36:19 +0000 (17:36 -0700)]
Fix network disable on connect
If we dont have an updated access point list
when we are re-enabling networks after connecting,
we could end up keeping some networks disabled.
This could happen if there is no event that
triggers an access point before enabling networks
Update the current access point list
right before enabling all networks.
Bug:
2567770
Change-Id: Ieb1ac8147d4acb05a6d13c44396653f0af94643d
Kenny Root [Mon, 5 Apr 2010 15:32:55 +0000 (08:32 -0700)]
am
6e117870: am
af05891d: Import revised translations
Kenny Root [Sat, 3 Apr 2010 21:13:50 +0000 (14:13 -0700)]
am
af05891d: Import revised translations
Merge commit '
af05891d31bf86e12910602be305a61fdcf1ace7' into kraken
* commit '
af05891d31bf86e12910602be305a61fdcf1ace7':
Import revised translations
Kenny Root [Sat, 3 Apr 2010 21:02:57 +0000 (14:02 -0700)]
Import revised translations
Change-Id: I7ce7aa7745bfb57870f1239dba8bd0bd714590dd
Daniel Sandler [Fri, 2 Apr 2010 18:06:33 +0000 (11:06 -0700)]
am
f57e0670: am
1ce25342: Merge "Restore dependency between volume settings and silent mode." into froyo
Daniel Sandler [Fri, 2 Apr 2010 18:00:27 +0000 (11:00 -0700)]
am
1ce25342: Merge "Restore dependency between volume settings and silent mode." into froyo
Merge commit '
1ce25342bfe918f60a895f5dc6b7feac3e1d6174' into kraken
* commit '
1ce25342bfe918f60a895f5dc6b7feac3e1d6174':
Restore dependency between volume settings and silent mode.
Daniel Sandler [Fri, 2 Apr 2010 17:53:17 +0000 (10:53 -0700)]
Merge "Restore dependency between volume settings and silent mode." into froyo
Freeman Ng [Wed, 31 Mar 2010 23:01:44 +0000 (16:01 -0700)]
Merge "wifi settings option to only enable Next button once a wifi connection is established"
Dianne Hackborn [Wed, 31 Mar 2010 18:20:24 +0000 (11:20 -0700)]
am
b4ecbb36: am
07f63605: Fix issue #
2549511 Crash while moving the installed app to Phone
Dianne Hackborn [Wed, 31 Mar 2010 18:14:27 +0000 (11:14 -0700)]
am
07f63605: Fix issue #
2549511 Crash while moving the installed app to Phone
Merge commit '
07f636059a2fb45f2d8284fedbbbba2c78b05157' into kraken
* commit '
07f636059a2fb45f2d8284fedbbbba2c78b05157':
Fix issue #
2549511 Crash while moving the installed app to Phone
Freeman Ng [Wed, 31 Mar 2010 18:11:28 +0000 (11:11 -0700)]
wifi settings option to only enable Next button once a wifi connection is established
Change-Id: I4b346648bce4b93f4885f1577a1510dcd18d8df5
Dianne Hackborn [Wed, 31 Mar 2010 06:27:20 +0000 (23:27 -0700)]
Fix issue #
2549511 Crash while moving the installed app to Phone
android.view.WindowManager$BadTokenException: Unable to add window
Change-Id: Ie844fd9cde05134431695f4f5bd27827e9e23ce5
Jeff Brown [Wed, 31 Mar 2010 16:55:44 +0000 (09:55 -0700)]
am
a13be290: am
9c0cc3b8: Merge "Refresh apps when they become (un)available." into froyo
Jeff Brown [Wed, 31 Mar 2010 16:33:40 +0000 (09:33 -0700)]
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.
Jeff Brown [Wed, 31 Mar 2010 16:27:25 +0000 (09:27 -0700)]
Merge "Refresh apps when they become (un)available." into froyo
Dianne Hackborn [Wed, 31 Mar 2010 01:39:26 +0000 (18:39 -0700)]
am
45c4bc1a: am
d4fb738a: Merge "Fix issue#
2544176: running services list update outside of ui thread." into froyo
Dianne Hackborn [Wed, 31 Mar 2010 01:32:33 +0000 (18:32 -0700)]
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.
Dianne Hackborn [Wed, 31 Mar 2010 01:25:10 +0000 (18:25 -0700)]
Merge "Fix issue#
2544176: running services list update outside of ui thread." into froyo
Dianne Hackborn [Wed, 31 Mar 2010 01:07:04 +0000 (18:07 -0700)]
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
Robert Greenwalt [Tue, 30 Mar 2010 23:08:15 +0000 (16:08 -0700)]
am
5a7e9a66: am
388b4a87: Merge "Add Title to the Tether help dialog" into froyo
Robert Greenwalt [Tue, 30 Mar 2010 23:00:11 +0000 (16:00 -0700)]
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
Robert Greenwalt [Tue, 30 Mar 2010 22:54:47 +0000 (15:54 -0700)]
Merge "Add Title to the Tether help dialog" into froyo
Mike LeBeau [Tue, 30 Mar 2010 21:59:25 +0000 (14:59 -0700)]
am
e81d2381: am
38947ddc: Fix the build - doh.
Mike LeBeau [Tue, 30 Mar 2010 21:53:38 +0000 (14:53 -0700)]
Mike LeBeau [Tue, 30 Mar 2010 21:45:00 +0000 (14:45 -0700)]
Fix the build - doh.
Change-Id: Iffaf7276340c00b3652e38580abdb218e5907917
Mike LeBeau [Tue, 30 Mar 2010 21:30:35 +0000 (14:30 -0700)]
am
898c7e18: am
e076bef9: Add new string to identify what speech recognizer the settings are for.
Mike LeBeau [Tue, 30 Mar 2010 21:24:55 +0000 (14:24 -0700)]
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.
Mike LeBeau [Tue, 30 Mar 2010 19:03:39 +0000 (12:03 -0700)]
Add new string to identify what speech recognizer the settings are for.
http://b/
2546173
Change-Id: I7d59a69eba0e4f3c87586c968574d291a200352c
Jim Miller [Tue, 30 Mar 2010 21:04:17 +0000 (14:04 -0700)]
am
9b0a726e: am
43630806: Merge "Fix
2527411: Remove unusable display timeouts from Settings." into froyo
Jim Miller [Tue, 30 Mar 2010 20:58:03 +0000 (13:58 -0700)]
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.
Jim Miller [Tue, 30 Mar 2010 20:51:43 +0000 (13:51 -0700)]
Merge "Fix
2527411: Remove unusable display timeouts from Settings." into froyo
Robert Greenwalt [Tue, 30 Mar 2010 20:48:27 +0000 (13:48 -0700)]
Add Title to the Tether help dialog
bug:
2546313
Change-Id: Ib70118b40289abd3cafdecf7fc814ca48bce2960
Daniel Sandler [Tue, 30 Mar 2010 18:55:23 +0000 (14:55 -0400)]
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
Kenny Root [Tue, 30 Mar 2010 16:53:24 +0000 (09:53 -0700)]
am
bb2ddbba: am
c0b5624c: Import revised translations
Kenny Root [Tue, 30 Mar 2010 16:46:20 +0000 (09:46 -0700)]
am
c0b5624c: Import revised translations
Merge commit '
c0b5624ccc3b88b6b22fb39da30eed227b87785b' into kraken
* commit '
c0b5624ccc3b88b6b22fb39da30eed227b87785b':
Import revised translations
Kenny Root [Tue, 30 Mar 2010 16:16:49 +0000 (09:16 -0700)]
Import revised translations
Change-Id: Ib730899be1485cc95ed6254279bae0c9413332b3
Jim Miller [Tue, 30 Mar 2010 03:18:51 +0000 (20:18 -0700)]
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
Jeff Brown [Tue, 30 Mar 2010 00:51:23 +0000 (17:51 -0700)]
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
Oscar Montemayor [Mon, 29 Mar 2010 23:36:51 +0000 (16:36 -0700)]
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
Oscar Montemayor [Mon, 29 Mar 2010 23:30:34 +0000 (16:30 -0700)]
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
Oscar Montemayor [Mon, 29 Mar 2010 23:23:53 +0000 (16:23 -0700)]
Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#
2502219." into froyo
Suchi Amalapurapu [Mon, 29 Mar 2010 22:31:34 +0000 (15:31 -0700)]
Merge "Return empty string for new error code. The new string will be defined later." into froyo
Suchi Amalapurapu [Mon, 29 Mar 2010 22:15:31 +0000 (15:15 -0700)]
Return empty string for new error code.
The new string will be defined later.
Change-Id: I7dc80ca96461e083cd8d8fba4815ac263dac61a4
San Mehat [Mon, 29 Mar 2010 21:30:38 +0000 (14:30 -0700)]
Settings: Fix for b/issue?id=
2538399 (ANR while formatting sd)
Change-Id: I94b84a45557cbce706c37d5088d398283a639c80
Signed-off-by: San Mehat <san@google.com>
Oscar Montemayor [Sat, 27 Mar 2010 01:45:05 +0000 (18:45 -0700)]
DO NOT MERGE
Removing unused features from source tree.
Please refer to Bug#
2502219.
Change-Id: Ib3321f3c0e3edf7dff947917ba9bad0f7da93c89
OSDN Git Service
