Commit Graph

756 Commits

Author SHA1 Message Date
Eric Fischer
a4ec838d12 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.
2009-10-28 11:43:04 -07:00
Jaikumar Ganesh
760b45c2a6 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.
2009-10-28 10:30:20 -07:00
Eric Fischer
e0711522bc Use consistent punctuation for the Chinese locale names.
Bug 2216349
2009-10-27 10:30:54 -07:00
Jaikumar Ganesh
195bc43460 Add Authentication Type field to the APN settings.
Bug: 1817100
2009-10-26 15:18:23 -07:00
Robert Greenwalt
0a4ab1eab2 Disable Save of empty-named AP.
Empty SSID names can cause weird problems, so don't allow the user to save them.

bug: 2211656
2009-10-26 13:51:06 -07:00
Amith Yamasani
f0fed9dc87 am b3735744: Merge change I40dd2cfc into eclair
Merge commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50' into eclair-mr2

* commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50':
  Fix for 2202408: Replace Never Timeout with 30 minutes
2009-10-23 10:17:43 -07:00
Neel Parekh
eb48882e18 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.
2009-10-23 10:17:38 -07:00
Android (Google) Code Review
b3735744fd Merge change I40dd2cfc into eclair
* changes:
  Fix for 2202408: Replace Never Timeout with 30 minutes
2009-10-23 13:09:14 -04:00
Patrick Scott
a2bfad1399 Fix the build. 2009-10-23 09:53:06 -04:00
Amith Yamasani
40dd2cfcfd 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.
2009-10-22 20:57:32 -07:00
Neel Parekh
62d3407de4 Minor change to use defined key rather than a string. 2009-10-22 18:30:00 -07:00
Neel Parekh
0bc64d45b4 resolved conflicts for merge of e304b9f4 to eclair-mr2 2009-10-22 18:26:46 -07:00
Neel Parekh
e304b9f4f7 Add a intent extra to only show the access points in the settings menu.
Bug: 2198865
2009-10-22 17:37:58 -07:00
Eric Fischer
53250b3aa8 am 8355d934: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '8355d9343455eaacf559f0df0e752f236b7464d2' into eclair-mr2

* commit '8355d9343455eaacf559f0df0e752f236b7464d2':
  Import revised translations.  DO NOT MERGE
2009-10-22 06:45:55 -07:00
Eric Fischer
8355d93434 Import revised translations. DO NOT MERGE
Approver: jerryw
2009-10-21 10:47:42 -07:00
Amith Yamasani
8e10261e87 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
2009-10-19 15:27:14 -07:00
Android (Google) Code Review
941c3b1794 Merge change I61c28c5f into eclair
* changes:
  Use radio hunting time in addition to signal strength for cell standby computation. Fixes #2176141
2009-10-19 18:22:38 -04:00
Amith Yamasani
270d273e55 Use radio hunting time in addition to signal strength for cell standby computation. Fixes #2176141 2009-10-19 15:21:33 -07:00
Android (Google) Code Review
f239f3e082 Merge change Iec5461bc into eclair-mr2
* changes:
  Remove OEM-specific bits from RadioInfo.
2009-10-18 23:07:15 -04:00
Mike Lockwood
ee693a120a am cdf42466: Remove PowerManager.setAutoBrightness()
Merge commit 'cdf42466bf3471337f1355b872eb2d529ba9409c' into eclair-mr2

* commit 'cdf42466bf3471337f1355b872eb2d529ba9409c':
  Remove PowerManager.setAutoBrightness()
2009-10-16 09:37:47 -07:00
Tammo Spalink
a5f4c8f8c9 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
2009-10-16 10:24:18 +08:00
Mike Lockwood
cdf42466bf 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>
2009-10-14 21:19:04 -07:00
Android (Google) Code Review
880daa2916 Merge change I1b21ba17 into eclair-mr2
* changes:
  Import revised translations.  DO NOT MERGE
2009-10-13 20:01:09 -04:00
Eric Fischer
1b21ba1738 Import revised translations. DO NOT MERGE 2009-10-13 16:07:48 -07:00
Dianne Hackborn
3539cc5ef3 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
2009-10-13 15:51:41 -07:00
Dianne Hackborn
9f1900dc05 Fix issue #2185893: Can not install 3D Media Gallery
Allow the package details to show packages whose .apk is not installed.

Change-Id: I45aec93e6f731beb5fe7010ec680eb8df0241aed
2009-10-13 15:03:57 -07:00
Android (Google) Code Review
5676ccab33 Merge change I69ea4234 into eclair-mr2
* changes:
  Remove the getHumanReadibleSsid().
2009-10-13 10:39:01 -04:00
Chung-yih Wang
69ea4234a0 Remove the getHumanReadibleSsid().
Since we already push down the quotes handling in WifiService.java,
there is no need of the function.
2009-10-13 18:11:52 +08:00
Android (Google) Code Review
f20623b2b6 Merge change I6983cab3 into eclair-mr2
* changes:
  Add saving/restoring state in CredentialInstaller and ...
2009-10-13 05:54:26 -04:00
Hung-ying Tyan
2b9d9ef2aa Add saving/restoring state in CredentialInstaller and ...
make it transparent.
2009-10-13 17:40:25 +08:00
Chung-yih Wang
a5b7b45b6f Push down the supplicant-specific double-quote handling to framework.
So we are able to connect to AP with ssid containing double-quotes.
2009-10-09 11:29:45 +08:00
Eric Fischer
5204b662a0 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
2009-10-08 17:35:21 -07:00
Jaikumar Ganesh
db99bb3644 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
2009-10-08 17:30:28 -07:00
Eric Fischer
9ef9801f6f am 0512f51f: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '0512f51f21901e4a3f3f60aba82e3bb87ab0cc72' into eclair

* commit '0512f51f21901e4a3f3f60aba82e3bb87ab0cc72':
  Import revised translations.  DO NOT MERGE
2009-10-08 15:02:30 -07:00
Michael Chan
81cdaff7b5 b/2173596 Cancel Bluetooth scanning when the user leaves Bluetooth Settings.
Change-Id: Ib4dd6254c90da619e853b1be22fba3ff1365258e
2009-10-08 11:55:47 -07:00
Jaikumar Ganesh
c065348eba Show an error message when the remote side cancels the authentication
and show OPP device list correctly.

Dr No: Eastham
Bug: 2174874
2009-10-08 08:06:27 -07:00
Nick Pelly
94ca23dcb0 am d1a04291: Update application code for BluetoothAdapter.getDefaultAdapter().
Merge commit 'd1a04291c537e271999c7e7c5c72f1f61632aacf' into eclair-mr2

* commit 'd1a04291c537e271999c7e7c5c72f1f61632aacf':
  Update application code for BluetoothAdapter.getDefaultAdapter().
2009-10-07 16:36:07 -07:00
Nick Pelly
d1a04291c5 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.
2009-10-08 01:03:34 +02:00
Android (Google) Code Review
c52637dfab Merge change I8e1b0fb7 into eclair-mr2
* changes:
  Fix Settings to show versionName instead of versionCode.
2009-10-07 14:58:06 -04:00
Eric Fischer
c197f15486 am 06a111be: (-s ours) Merge change Ia3151ad3 into eclair
Merge commit '06a111be6d3ccf44de545a084302c2085cbb07de' into eclair-mr2

* commit '06a111be6d3ccf44de545a084302c2085cbb07de':
  Import revised translations.   DO NOT MERGE
2009-10-07 11:46:42 -07:00
Hung-ying Tyan
1cd02caccd am c0e34db1: Merge change Ifad4a4c0 into eclair
Merge commit 'c0e34db16864e25946b288cb165ad833b62d3b18' into eclair-mr2

* commit 'c0e34db16864e25946b288cb165ad833b62d3b18':
  Add L2tpIpsec case in VpnSettings.processSecrets()
2009-10-07 11:46:38 -07:00
Android (Google) Code Review
06a111be6d Merge change Ia3151ad3 into eclair
* changes:
  Import revised translations.   DO NOT MERGE
2009-10-07 14:38:10 -04:00
Elliott Hughes
8e1b0fb77c Fix Settings to show versionName instead of versionCode. 2009-10-07 11:12:33 -07:00
Android (Google) Code Review
c0e34db168 Merge change Ifad4a4c0 into eclair
* changes:
  Add L2tpIpsec case in VpnSettings.processSecrets()
2009-10-06 20:47:46 -04:00
Eric Fischer
a3151ad37c Import revised translations. DO NOT MERGE
Approver: jerryw
2009-10-06 16:54:08 -07:00
Android (Google) Code Review
cab9fe2d41 Merge change I3c9f79ba into eclair-mr2
* changes:
  Retain webview history when viewing Safety notices. Fixes #2160518
2009-10-06 16:58:21 -04:00
Jaikumar Ganesh
f43b1a9d24 am 98d76cc9: Remove STOPSHIP debug log.
Merge commit '98d76cc9b882466a97fb55913f5a507a642b5018' into eclair-mr2

* commit '98d76cc9b882466a97fb55913f5a507a642b5018':
  Remove STOPSHIP debug log.
2009-10-06 13:35:19 -07:00
Amith Yamasani
3c9f79ba35 Retain webview history when viewing Safety notices. Fixes #2160518
Save and restore webview history when changing orientation.
2009-10-06 13:10:14 -07:00
Jaikumar Ganesh
98d76cc9b8 Remove STOPSHIP debug log.
Bug: 2151872
Dr No: Eastham
2009-10-06 08:01:21 -07:00
Hung-ying Tyan
fad4a4c07a Add L2tpIpsec case in VpnSettings.processSecrets() 2009-10-06 16:15:42 +08:00