OSDN Git Service

android-x86/packages-apps-Settings.git
14 years agoam fd07eb22: Merge change Ibe1d06fc into eclair
Mike Lockwood [Fri, 30 Oct 2009 17:02:57 +0000 (10:02 -0700)]
am fd07eb22: Merge change Ibe1d06fc into eclair

Merge commit 'fd07eb222b6bd32039cdc2545fb75552835e418f' into eclair-mr2

* commit 'fd07eb222b6bd32039cdc2545fb75552835e418f':
  Avoid setting screen brightness when initializing brightness dialog in automatic mode.

14 years agoMerge change Ibe1d06fc into eclair
Android (Google) Code Review [Fri, 30 Oct 2009 16:56:20 +0000 (12:56 -0400)]
Merge change Ibe1d06fc into eclair

* changes:
  Avoid setting screen brightness when initializing brightness dialog in automatic mode.

14 years agoAvoid setting screen brightness when initializing brightness dialog in automatic...
Mike Lockwood [Fri, 30 Oct 2009 07:08:03 +0000 (03:08 -0400)]
Avoid setting screen brightness when initializing brightness dialog in automatic mode.

Fixes bug b/2226257 (Brightness wonky)

Change-Id: Ibe1d06fc907960dcb6a70faa92e6c3a562016865
Signed-off-by: Mike Lockwood <lockwood@android.com>
14 years agoam 0cb3743e: b/2219381 Gray out Bluetooth Settings for the emulator
Michael Chan [Fri, 30 Oct 2009 02:34:49 +0000 (19:34 -0700)]
am 0cb3743e: b/2219381 Gray out Bluetooth Settings for the emulator

Merge commit '0cb3743e93aef81e7669f1e6c81184559e0f8154' into eclair-mr2

* commit '0cb3743e93aef81e7669f1e6c81184559e0f8154':
  b/2219381 Gray out Bluetooth Settings for the emulator

14 years agoam dd45a47b: Merge change I4d31288f into eclair
Amith Yamasani [Fri, 30 Oct 2009 02:27:12 +0000 (19:27 -0700)]
am dd45a47b: Merge change I4d31288f into eclair

Merge commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec' into eclair-mr2

* commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec':
  Fix for 1974140. Delete entry if not valid on hitting home.

14 years agoam 17fcd476: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 30 Oct 2009 02:24:59 +0000 (19:24 -0700)]
am 17fcd476: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '17fcd476643e27943f548415e49e1be7d8e74ac1' into eclair-mr2

* commit '17fcd476643e27943f548415e49e1be7d8e74ac1':
  Import revised translations.  DO NOT MERGE

14 years agob/2219381 Gray out Bluetooth Settings for the emulator
Michael Chan [Thu, 29 Oct 2009 21:42:06 +0000 (14:42 -0700)]
b/2219381 Gray out Bluetooth Settings for the emulator

Change-Id: I11ae2e6c7652ba550aeadf0dadb6f520c19dedc6

14 years agoam 53dcdeeb: Don\'t restore old brightness when cancelling brightness dialog in autom...
Mike Lockwood [Thu, 29 Oct 2009 20:45:44 +0000 (13:45 -0700)]
am 53dcdeeb: Don\'t restore old brightness when cancelling brightness dialog in automatic mode.

Merge commit '53dcdeeb85e523e0b752d802d3413f5d4001d575' into eclair-mr2

* commit '53dcdeeb85e523e0b752d802d3413f5d4001d575':
  Don't restore old brightness when cancelling brightness dialog in automatic mode.

14 years agoMerge change I4d31288f into eclair
Android (Google) Code Review [Thu, 29 Oct 2009 13:28:35 +0000 (09:28 -0400)]
Merge change I4d31288f into eclair

* changes:
  Fix for 1974140. Delete entry if not valid on hitting home.

14 years agoam d02acfb9: Merge change I2abbb876 into eclair
Mike Cleron [Thu, 29 Oct 2009 08:26:57 +0000 (01:26 -0700)]
am d02acfb9: Merge change I2abbb876 into eclair

Merge commit 'd02acfb908562780eec830a85e121f9925108c36' into eclair-mr2

* commit 'd02acfb908562780eec830a85e121f9925108c36':
  New widgets

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 29 Oct 2009 04:19:37 +0000 (21:19 -0700)]
Import revised translations.  DO NOT MERGE

14 years agoFix for 1974140. Delete entry if not valid on hitting home.
Amith Yamasani [Wed, 28 Oct 2009 23:59:17 +0000 (16:59 -0700)]
Fix for 1974140. Delete entry if not valid on hitting home.

If user doesn't enter an APN or name, then delete the entry on hitting home.

And if user has enough information but doesn't enter a name, then set the
name to "Untitled" to avoid blank APNs in the list.

14 years agoDon't restore old brightness when cancelling brightness dialog in automatic mode.
Mike Lockwood [Wed, 28 Oct 2009 22:33:04 +0000 (18:33 -0400)]
Don't restore old brightness when cancelling brightness dialog in automatic mode.

Fixes a problem that could result in the backlight getting set to a bogus brightness
level if you open the dialog and cancel when in automatic mode.

Bug b/2015734

Change-Id: I302697e4ebd37afcdbfdd74ba0b1cc9be27ee40b
Signed-off-by: Mike Lockwood <lockwood@android.com>
14 years agoam e0711522: Use consistent punctuation for the Chinese locale names.
Eric Fischer [Wed, 28 Oct 2009 18:43:04 +0000 (11:43 -0700)]
am e0711522: Use consistent punctuation for the Chinese locale names.

Merge commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0' into eclair-mr2

* commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0':
  Use consistent punctuation for the Chinese locale names.

14 years agoam 195bc434: Add Authentication Type field to the APN settings.
Jaikumar Ganesh [Wed, 28 Oct 2009 17:30:20 +0000 (10:30 -0700)]
am 195bc434: Add Authentication Type field to the APN settings.

Merge commit '195bc43460967e57e4c1131ba156083a93e0e4e8' into eclair-mr2

* commit '195bc43460967e57e4c1131ba156083a93e0e4e8':
  Add Authentication Type field to the APN settings.

14 years agoMerge change I2abbb876 into eclair
Android (Google) Code Review [Wed, 28 Oct 2009 07:16:41 +0000 (03:16 -0400)]
Merge change I2abbb876 into eclair

* changes:
  New widgets

14 years agoNew widgets
Mike Cleron [Tue, 27 Oct 2009 21:05:27 +0000 (14:05 -0700)]
New widgets

14 years agoUse consistent punctuation for the Chinese locale names.
Eric Fischer [Tue, 27 Oct 2009 00:54:44 +0000 (17:54 -0700)]
Use consistent punctuation for the Chinese locale names.

Bug 2216349

14 years agoAdd Authentication Type field to the APN settings.
Jaikumar Ganesh [Mon, 26 Oct 2009 20:01:36 +0000 (13:01 -0700)]
Add Authentication Type field to the APN settings.

Bug: 1817100

14 years agoDisable Save of empty-named AP.
Robert Greenwalt [Mon, 26 Oct 2009 20:51:06 +0000 (13:51 -0700)]
Disable Save of empty-named AP.

Empty SSID names can cause weird problems, so don't allow the user to save them.

bug: 2211656

14 years agoam b3735744: Merge change I40dd2cfc into eclair
Amith Yamasani [Fri, 23 Oct 2009 17:17:43 +0000 (10:17 -0700)]
am b3735744: Merge change I40dd2cfc into eclair

Merge commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50' into eclair-mr2

* commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50':
  Fix for 2202408: Replace Never Timeout with 30 minutes

14 years agoam 62d3407d: Minor change to use defined key rather than a string.
Neel Parekh [Fri, 23 Oct 2009 17:17:38 +0000 (10:17 -0700)]
am 62d3407d: Minor change to use defined key rather than a string.

Merge commit '62d3407de4a843cb83397fa757bc89653d78c800' into eclair-mr2

* commit '62d3407de4a843cb83397fa757bc89653d78c800':
  Minor change to use defined key rather than a string.

14 years agoMerge change I40dd2cfc into eclair
Android (Google) Code Review [Fri, 23 Oct 2009 17:09:14 +0000 (13:09 -0400)]
Merge change I40dd2cfc into eclair

* changes:
  Fix for 2202408: Replace Never Timeout with 30 minutes

14 years agoFix the build.
Patrick Scott [Fri, 23 Oct 2009 13:53:06 +0000 (09:53 -0400)]
Fix the build.

14 years agoFix for 2202408: Replace Never Timeout with 30 minutes
Amith Yamasani [Fri, 23 Oct 2009 03:57:32 +0000 (20:57 -0700)]
Fix for 2202408: Replace Never Timeout with 30 minutes

Maximum timeout is now 30 minutes. Never Timeout will cause
burn-in problems with OLED and a bit with LCD as well.

14 years agoMinor change to use defined key rather than a string.
Neel Parekh [Fri, 23 Oct 2009 01:30:00 +0000 (18:30 -0700)]
Minor change to use defined key rather than a string.

14 years agoresolved conflicts for merge of e304b9f4 to eclair-mr2
Neel Parekh [Fri, 23 Oct 2009 01:26:46 +0000 (18:26 -0700)]
resolved conflicts for merge of e304b9f4 to eclair-mr2

14 years agoAdd a intent extra to only show the access points in the settings menu.
Neel Parekh [Fri, 23 Oct 2009 00:12:49 +0000 (17:12 -0700)]
Add a intent extra to only show the access points in the settings menu.

Bug: 2198865

14 years agoam 8355d934: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 22 Oct 2009 13:45:55 +0000 (06:45 -0700)]
am 8355d934: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '8355d9343455eaacf559f0df0e752f236b7464d2' into eclair-mr2

* commit '8355d9343455eaacf559f0df0e752f236b7464d2':
  Import revised translations.  DO NOT MERGE

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 21 Oct 2009 17:47:42 +0000 (10:47 -0700)]
Import revised translations.  DO NOT MERGE

Approver: jerryw

14 years agoam 941c3b17: Merge change I61c28c5f into eclair
Amith Yamasani [Mon, 19 Oct 2009 22:27:14 +0000 (15:27 -0700)]
am 941c3b17: Merge change I61c28c5f into eclair

Merge commit '941c3b1794203b48a8aa2e9d6f04c09d412262bd' into eclair-mr2

* commit '941c3b1794203b48a8aa2e9d6f04c09d412262bd':
  Use radio hunting time in addition to signal strength for cell standby computation. Fixes #2176141

14 years agoMerge change I61c28c5f into eclair
Android (Google) Code Review [Mon, 19 Oct 2009 22:22:38 +0000 (18:22 -0400)]
Merge change I61c28c5f into eclair

* changes:
  Use radio hunting time in addition to signal strength for cell standby computation. Fixes #2176141

14 years agoUse radio hunting time in addition to signal strength for cell standby computation...
Amith Yamasani [Mon, 19 Oct 2009 18:45:18 +0000 (11:45 -0700)]
Use radio hunting time in addition to signal strength for cell standby computation. Fixes #2176141

14 years agoMerge change Iec5461bc into eclair-mr2
Android (Google) Code Review [Mon, 19 Oct 2009 03:07:15 +0000 (23:07 -0400)]
Merge change Iec5461bc into eclair-mr2

* changes:
  Remove OEM-specific bits from RadioInfo.

14 years agoam cdf42466: Remove PowerManager.setAutoBrightness()
Mike Lockwood [Fri, 16 Oct 2009 16:37:47 +0000 (09:37 -0700)]
am cdf42466: Remove PowerManager.setAutoBrightness()

Merge commit 'cdf42466bf3471337f1355b872eb2d529ba9409c' into eclair-mr2

* commit 'cdf42466bf3471337f1355b872eb2d529ba9409c':
  Remove PowerManager.setAutoBrightness()

14 years agoRemove OEM-specific bits from RadioInfo.
Tammo Spalink [Thu, 15 Oct 2009 12:08:58 +0000 (20:08 +0800)]
Remove OEM-specific bits from RadioInfo.

The extracted bits will move into the HTC vendor tree, and it (or
similar settings for other vendors) can be accessed via a generic
OEM_RADIO_INFO activity.

Addresses issue:
http://buganizer/issue?id=1645706

Change-Id: Iec5461bcb3e241a1230f5f6d53baa3bb838ff4a9

14 years agoRemove PowerManager.setAutoBrightness()
Mike Lockwood [Thu, 15 Oct 2009 04:19:04 +0000 (21:19 -0700)]
Remove PowerManager.setAutoBrightness()

We will use the System.SCREEN_BRIGHTNESS_MODE Settings value instead.

Change-Id: I1850549f513e3541b5761aae28ebc615410377de
Signed-off-by: Mike Lockwood <lockwood@android.com>
14 years agoMerge change I1b21ba17 into eclair-mr2
Android (Google) Code Review [Wed, 14 Oct 2009 00:01:09 +0000 (20:01 -0400)]
Merge change I1b21ba17 into eclair-mr2

* changes:
  Import revised translations.  DO NOT MERGE

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 13 Oct 2009 23:07:48 +0000 (16:07 -0700)]
Import revised translations.  DO NOT MERGE

14 years agoam 9f1900dc: Fix issue #2185893: Can not install 3D Media Gallery
Dianne Hackborn [Tue, 13 Oct 2009 22:51:41 +0000 (15:51 -0700)]
am 9f1900dc: Fix issue #2185893: Can not install 3D Media Gallery

Merge commit '9f1900dc05773a0659030e21a8c2fa1641655669' into eclair-mr2

* commit '9f1900dc05773a0659030e21a8c2fa1641655669':
  Fix issue #2185893: Can not install 3D Media Gallery

14 years agoFix issue #2185893: Can not install 3D Media Gallery
Dianne Hackborn [Tue, 13 Oct 2009 22:03:57 +0000 (15:03 -0700)]
Fix issue #2185893: Can not install 3D Media Gallery

Allow the package details to show packages whose .apk is not installed.

Change-Id: I45aec93e6f731beb5fe7010ec680eb8df0241aed

14 years agoMerge change I69ea4234 into eclair-mr2
Android (Google) Code Review [Tue, 13 Oct 2009 14:39:01 +0000 (10:39 -0400)]
Merge change I69ea4234 into eclair-mr2

* changes:
  Remove the getHumanReadibleSsid().

14 years agoRemove the getHumanReadibleSsid().
Chung-yih Wang [Tue, 13 Oct 2009 10:11:52 +0000 (18:11 +0800)]
Remove the getHumanReadibleSsid().

Since we already push down the quotes handling in WifiService.java,
there is no need of the function.

14 years agoMerge change I6983cab3 into eclair-mr2
Android (Google) Code Review [Tue, 13 Oct 2009 09:54:26 +0000 (05:54 -0400)]
Merge change I6983cab3 into eclair-mr2

* changes:
  Add saving/restoring state in CredentialInstaller and ...

14 years agoAdd saving/restoring state in CredentialInstaller and ...
Hung-ying Tyan [Sat, 10 Oct 2009 17:34:11 +0000 (01:34 +0800)]
Add saving/restoring state in CredentialInstaller and ...

make it transparent.

14 years agoPush down the supplicant-specific double-quote handling to framework.
Chung-yih Wang [Fri, 9 Oct 2009 03:29:45 +0000 (11:29 +0800)]
Push down the supplicant-specific double-quote handling to framework.

So we are able to connect to AP with ssid containing double-quotes.

14 years agoam 9ef9801f: (-s ours) am 0512f51f: (-s ours) Import revised translations. DO NOT...
Eric Fischer [Fri, 9 Oct 2009 00:35:21 +0000 (17:35 -0700)]
am 9ef9801f: (-s ours) am 0512f51f: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '9ef9801f6f42d25b7e539262ebfec428546107fc' into eclair-mr2

* commit '9ef9801f6f42d25b7e539262ebfec428546107fc':
  Import revised translations.  DO NOT MERGE

14 years agoam c065348e: Show an error message when the remote side cancels the authentication...
Jaikumar Ganesh [Fri, 9 Oct 2009 00:30:28 +0000 (17:30 -0700)]
am c065348e: Show an error message when the remote side cancels the authentication and show OPP device list correctly.

Merge commit 'c065348ebaf1ea9301d7b96633bea4de8c78c2aa' into eclair-mr2

* commit 'c065348ebaf1ea9301d7b96633bea4de8c78c2aa':
  Show an error message when the remote side cancels the authentication

14 years agoam 0512f51f: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Oct 2009 22:02:30 +0000 (15:02 -0700)]
am 0512f51f: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '0512f51f21901e4a3f3f60aba82e3bb87ab0cc72' into eclair

* commit '0512f51f21901e4a3f3f60aba82e3bb87ab0cc72':
  Import revised translations.  DO NOT MERGE

14 years agob/2173596 Cancel Bluetooth scanning when the user leaves Bluetooth Settings.
Michael Chan [Wed, 7 Oct 2009 23:13:47 +0000 (16:13 -0700)]
b/2173596 Cancel Bluetooth scanning when the user leaves Bluetooth Settings.

Change-Id: Ib4dd6254c90da619e853b1be22fba3ff1365258e

14 years agoShow an error message when the remote side cancels the authentication
Jaikumar Ganesh [Thu, 8 Oct 2009 15:06:27 +0000 (08:06 -0700)]
Show an error message when the remote side cancels the authentication
and show OPP device list correctly.

Dr No: Eastham
Bug: 2174874

14 years agoam d1a04291: Update application code for BluetoothAdapter.getDefaultAdapter().
Nick Pelly [Wed, 7 Oct 2009 23:36:07 +0000 (16:36 -0700)]
am d1a04291: Update application code for BluetoothAdapter.getDefaultAdapter().

Merge commit 'd1a04291c537e271999c7e7c5c72f1f61632aacf' into eclair-mr2

* commit 'd1a04291c537e271999c7e7c5c72f1f61632aacf':
  Update application code for BluetoothAdapter.getDefaultAdapter().

14 years agoUpdate application code for BluetoothAdapter.getDefaultAdapter().
Nick Pelly [Wed, 7 Oct 2009 23:03:34 +0000 (01:03 +0200)]
Update application code for BluetoothAdapter.getDefaultAdapter().

Change-Id: Ic8f2188a28631f55ceb048daff545ca5e6053f92
DrNo: eastham
Bug: 2158765
Joke: When is a car not a car? When it turns into a driveway.

14 years agoMerge change I8e1b0fb7 into eclair-mr2
Android (Google) Code Review [Wed, 7 Oct 2009 18:58:06 +0000 (14:58 -0400)]
Merge change I8e1b0fb7 into eclair-mr2

* changes:
  Fix Settings to show versionName instead of versionCode.

14 years agoam 06a111be: (-s ours) Merge change Ia3151ad3 into eclair
Eric Fischer [Wed, 7 Oct 2009 18:46:42 +0000 (11:46 -0700)]
am 06a111be: (-s ours) Merge change Ia3151ad3 into eclair

Merge commit '06a111be6d3ccf44de545a084302c2085cbb07de' into eclair-mr2

* commit '06a111be6d3ccf44de545a084302c2085cbb07de':
  Import revised translations.   DO NOT MERGE

14 years agoam c0e34db1: Merge change Ifad4a4c0 into eclair
Hung-ying Tyan [Wed, 7 Oct 2009 18:46:38 +0000 (11:46 -0700)]
am c0e34db1: Merge change Ifad4a4c0 into eclair

Merge commit 'c0e34db16864e25946b288cb165ad833b62d3b18' into eclair-mr2

* commit 'c0e34db16864e25946b288cb165ad833b62d3b18':
  Add L2tpIpsec case in VpnSettings.processSecrets()

14 years agoMerge change Ia3151ad3 into eclair
Android (Google) Code Review [Wed, 7 Oct 2009 18:38:10 +0000 (14:38 -0400)]
Merge change Ia3151ad3 into eclair

* changes:
  Import revised translations.   DO NOT MERGE

14 years agoFix Settings to show versionName instead of versionCode.
Elliott Hughes [Wed, 7 Oct 2009 18:12:33 +0000 (11:12 -0700)]
Fix Settings to show versionName instead of versionCode.

14 years agoMerge change Ifad4a4c0 into eclair
Android (Google) Code Review [Wed, 7 Oct 2009 00:47:46 +0000 (20:47 -0400)]
Merge change Ifad4a4c0 into eclair

* changes:
  Add L2tpIpsec case in VpnSettings.processSecrets()

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 6 Oct 2009 23:54:08 +0000 (16:54 -0700)]
Import revised translations.   DO NOT MERGE

Approver: jerryw

14 years agoMerge change I3c9f79ba into eclair-mr2
Android (Google) Code Review [Tue, 6 Oct 2009 20:58:21 +0000 (16:58 -0400)]
Merge change I3c9f79ba into eclair-mr2

* changes:
  Retain webview history when viewing Safety notices. Fixes #2160518

14 years agoam 98d76cc9: Remove STOPSHIP debug log.
Jaikumar Ganesh [Tue, 6 Oct 2009 20:35:19 +0000 (13:35 -0700)]
am 98d76cc9: Remove STOPSHIP debug log.

Merge commit '98d76cc9b882466a97fb55913f5a507a642b5018' into eclair-mr2

* commit '98d76cc9b882466a97fb55913f5a507a642b5018':
  Remove STOPSHIP debug log.

14 years agoRetain webview history when viewing Safety notices. Fixes #2160518
Amith Yamasani [Tue, 6 Oct 2009 20:10:14 +0000 (13:10 -0700)]
Retain webview history when viewing Safety notices. Fixes #2160518

Save and restore webview history when changing orientation.

14 years agoRemove STOPSHIP debug log.
Jaikumar Ganesh [Tue, 6 Oct 2009 15:01:21 +0000 (08:01 -0700)]
Remove STOPSHIP debug log.

Bug: 2151872
Dr No: Eastham

14 years agoAdd L2tpIpsec case in VpnSettings.processSecrets()
Hung-ying Tyan [Tue, 6 Oct 2009 08:15:42 +0000 (16:15 +0800)]
Add L2tpIpsec case in VpnSettings.processSecrets()

14 years agoSecuritySettings: reduce 1 access to KeyStore and clean up.
Chia-chi Yeh [Tue, 6 Oct 2009 07:43:55 +0000 (15:43 +0800)]
SecuritySettings: reduce 1 access to KeyStore and clean up.

14 years agoam a8f2f72d: Add the auth_alg field back.
Chung-yih Wang [Sun, 4 Oct 2009 22:18:34 +0000 (15:18 -0700)]
am a8f2f72d: Add the auth_alg field back.

Merge commit 'a8f2f72da8693418f867de9c904eb250b7aae4ff' into eclair-mr2

* commit 'a8f2f72da8693418f867de9c904eb250b7aae4ff':
  Add the auth_alg field back.

14 years agoam 6de9fb39: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Sun, 4 Oct 2009 22:15:58 +0000 (15:15 -0700)]
am 6de9fb39: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '6de9fb390b9eab0dbaf9709db5149eefc18724da' into eclair-mr2

* commit '6de9fb390b9eab0dbaf9709db5149eefc18724da':
  Import revised translations.  DO NOT MERGE

14 years agoAdd the auth_alg field back.
Chung-yih Wang [Fri, 2 Oct 2009 08:06:22 +0000 (16:06 +0800)]
Add the auth_alg field back.

This change is to fix the issue http://b/issue?id=2161539.

The auth_alg field is required for auth. type 'SHARED' with WEP mode, it will
not be automatically selected as claimed. The change has been verified on
Linksys WRT54G.

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 2 Oct 2009 00:02:17 +0000 (17:02 -0700)]
Import revised translations.  DO NOT MERGE

Approver: jerryw

14 years agoMerge change I25f2afba into eclair
Android (Google) Code Review [Thu, 1 Oct 2009 20:07:49 +0000 (16:07 -0400)]
Merge change I25f2afba into eclair

* changes:
  Check if a device is added to the cache before returning.

14 years agoCheck if a device is added to the cache before returning.
Jaikumar Ganesh [Thu, 1 Oct 2009 18:34:17 +0000 (11:34 -0700)]
Check if a device is added to the cache before returning.

For incoming connections, we don't have the device in the Settings cache.
After we tried to readPairedDevices, check if we added to the cache.
If we successfully added it, continue with the connections, else bail out.

Bug id: 2160617

Change-Id: I25f2afba8ef6d2c32a7940f967cf12f1321ad9e0

14 years agoMerge change I454a0dbf into eclair
Android (Google) Code Review [Thu, 1 Oct 2009 18:35:13 +0000 (14:35 -0400)]
Merge change I454a0dbf into eclair

* changes:
  SecuritySettings: revert "minor tuning".

14 years agoSecuritySettings: revert "minor tuning".
Chia-chi Yeh [Thu, 1 Oct 2009 18:32:54 +0000 (02:32 +0800)]
SecuritySettings: revert "minor tuning".

14 years agoMerge change If764d20a into eclair
Android (Google) Code Review [Thu, 1 Oct 2009 18:17:26 +0000 (14:17 -0400)]
Merge change If764d20a into eclair

* changes:
  SecuritySettings: fix a the status before handling the intent.

14 years agoSecuritySettings: fix a the status before handling the intent.
Chia-chi Yeh [Thu, 1 Oct 2009 18:16:08 +0000 (02:16 +0800)]
SecuritySettings: fix a the status before handling the intent.

14 years agoMerge change I844d3db3 into eclair
Android (Google) Code Review [Thu, 1 Oct 2009 17:14:59 +0000 (13:14 -0400)]
Merge change I844d3db3 into eclair

* changes:
  SecuritySettings: set the check box before further processing.

14 years agoSecuritySettings: set the check box before further processing.
Chia-chi Yeh [Thu, 1 Oct 2009 17:13:36 +0000 (01:13 +0800)]
SecuritySettings: set the check box before further processing.

14 years agoMerge change I446bf8b5 into eclair
Android (Google) Code Review [Thu, 1 Oct 2009 17:12:21 +0000 (13:12 -0400)]
Merge change I446bf8b5 into eclair

* changes:
  SecuritySettings: minor tuning.

14 years agoSecuritySettings: minor tuning.
Chia-chi Yeh [Thu, 1 Oct 2009 17:11:17 +0000 (01:11 +0800)]
SecuritySettings: minor tuning.

14 years agoMerge change Ibf07c83d into eclair
Android (Google) Code Review [Thu, 1 Oct 2009 17:04:25 +0000 (13:04 -0400)]
Merge change Ibf07c83d into eclair

* changes:
  SecuritySettings: remove debug messages.

14 years agoSecuritySettings: remove debug messages.
Chia-chi Yeh [Thu, 1 Oct 2009 17:03:50 +0000 (01:03 +0800)]
SecuritySettings: remove debug messages.

14 years agoMerge change Ia7c57145 into eclair
Android (Google) Code Review [Thu, 1 Oct 2009 16:49:08 +0000 (12:49 -0400)]
Merge change Ia7c57145 into eclair

* changes:
  SecuritySettings: remove trailing spaces.

14 years agoSecuritySettings: remove trailing spaces.
Chia-chi Yeh [Thu, 1 Oct 2009 16:48:32 +0000 (00:48 +0800)]
SecuritySettings: remove trailing spaces.

14 years agoMerge change I02f58e89 into eclair
Android (Google) Code Review [Thu, 1 Oct 2009 16:47:24 +0000 (12:47 -0400)]
Merge change I02f58e89 into eclair

* changes:
  SecuritySettings: clean up.

14 years agoMerge change I28f1a0fc into eclair
Android (Google) Code Review [Thu, 1 Oct 2009 16:47:12 +0000 (12:47 -0400)]
Merge change I28f1a0fc into eclair

* changes:
  WifiSettings: use keystore namespace instead of blobl.

14 years agoSecuritySettings: clean up.
Chia-chi Yeh [Thu, 1 Oct 2009 16:39:14 +0000 (00:39 +0800)]
SecuritySettings: clean up.

14 years agoempty merge to avoid future conflicts
android-build SharedAccount [Thu, 1 Oct 2009 15:46:43 +0000 (08:46 -0700)]
empty merge to avoid future conflicts

Merge branch 'eclair-release' into HEAD

14 years agoMerge change Ie7e8a7ef into eclair
Android (Google) Code Review [Thu, 1 Oct 2009 14:46:26 +0000 (10:46 -0400)]
Merge change Ie7e8a7ef into eclair

* changes:
  Don't auto-connect to OPP after pairing

14 years agoWifiSettings: use keystore namespace instead of blobl.
Chia-chi Yeh [Thu, 1 Oct 2009 11:17:55 +0000 (19:17 +0800)]
WifiSettings: use keystore namespace instead of blobl.

14 years agoDon't auto-connect to OPP after pairing
Michael Chan [Thu, 1 Oct 2009 06:08:19 +0000 (23:08 -0700)]
Don't auto-connect to OPP after pairing

Change-Id: Ie7e8a7ef7188f7ffa6b32595764c100a0d72be89

14 years agoMerge change I39527366 into eclair
Android (Google) Code Review [Thu, 1 Oct 2009 01:43:48 +0000 (21:43 -0400)]
Merge change I39527366 into eclair

* changes:
  Use a custom system icon for native processes.

14 years agoUse a custom system icon for native processes.
Amith Yamasani [Wed, 30 Sep 2009 22:54:26 +0000 (15:54 -0700)]
Use a custom system icon for native processes.

New icons for system components in Battery Use screen.

14 years agoMerge change I00ab9f0b into eclair
Android (Google) Code Review [Thu, 1 Oct 2009 01:34:36 +0000 (21:34 -0400)]
Merge change I00ab9f0b into eclair

* changes:
  Fix widgets

14 years agoFix widgets
Mike Cleron [Thu, 1 Oct 2009 01:29:25 +0000 (18:29 -0700)]
Fix widgets

14 years agob/2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth...
Michael Chan [Wed, 30 Sep 2009 21:26:10 +0000 (14:26 -0700)]
b/2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..."

Change-Id: I34249a4828707bde491da4a82dca94ecf37cf490

14 years agob/2154576 Fixed the problem were some BT profiles were not connected when first UUID...
Michael Chan [Wed, 30 Sep 2009 19:18:51 +0000 (12:18 -0700)]
b/2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs

Reset connect timer event if profile was non-empty.
Clear profiles after unpair
mConnectAttemptedWithoutUuid

Change-Id: I5eab1270a755c6c87eb5be13a2f43dbbcd9a2f88

14 years agoMerge change Ibe023c8a into eclair
Android (Google) Code Review [Wed, 30 Sep 2009 22:05:03 +0000 (18:05 -0400)]
Merge change Ibe023c8a into eclair

* changes:
  Fix Safety Settings screen bugs - 215094221514402151727

14 years agoAdd strings for authentication type.
Jaikumar Ganesh [Wed, 30 Sep 2009 16:43:34 +0000 (09:43 -0700)]
Add strings for authentication type.

A new field is going to be added to the APN editor.
Authentication type: 4 possible values - None, PAP, CHAP, PAP or CHAP
These strings are too technical for the end user, however these
fields will be pre-populated and the user would not have to change them.

Change-Id: I7df326722fc4aebfe68d2726e2695eda8ea798a9

14 years agoFix Safety Settings screen bugs - 2150942, 2151440, 2151727
Amith Yamasani [Wed, 30 Sep 2009 19:18:51 +0000 (12:18 -0700)]
Fix Safety Settings screen bugs - 215094221514402151727

Handle the back key.
Finish the activity if dialog is cancelled.
Show an error and finish the activity if URL couldn't be found due to
connectivity problem and not just when Telephony is not available.