Commit Graph

993 Commits

Author SHA1 Message Date
Mike Cleron
5b1f4b493e am d02acfb9: Merge change I2abbb876 into eclair
Merge commit 'd02acfb908562780eec830a85e121f9925108c36' into eclair-plus-aosp

* commit 'd02acfb908562780eec830a85e121f9925108c36':
  New widgets
2009-10-28 00:22:03 -07:00
Android (Google) Code Review
d02acfb908 Merge change I2abbb876 into eclair
* changes:
  New widgets
2009-10-28 03:16:41 -04:00
Mike Cleron
c151e45d8c New widgets 2009-10-27 14:05:27 -07:00
Eric Fischer
034b695e5e am e0711522: Use consistent punctuation for the Chinese locale names.
Merge commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0' into eclair-plus-aosp

* commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0':
  Use consistent punctuation for the Chinese locale names.
2009-10-27 12:17:40 -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
6632979264 am 195bc434: Add Authentication Type field to the APN settings.
Merge commit '195bc43460967e57e4c1131ba156083a93e0e4e8' into eclair-plus-aosp

* commit '195bc43460967e57e4c1131ba156083a93e0e4e8':
  Add Authentication Type field to the APN settings.
2009-10-26 15:26:52 -07:00
Jaikumar Ganesh
195bc43460 Add Authentication Type field to the APN settings.
Bug: 1817100
2009-10-26 15:18:23 -07:00
Amith Yamasani
6ada350a6f am b3735744: Merge change I40dd2cfc into eclair
Merge commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50' into eclair-plus-aosp

* commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50':
  Fix for 2202408: Replace Never Timeout with 30 minutes
2009-10-23 10:16:35 -07:00
Neel Parekh
dc0df9c6c5 am 62d3407d: Minor change to use defined key rather than a string.
Merge commit '62d3407de4a843cb83397fa757bc89653d78c800' into eclair-plus-aosp

* commit '62d3407de4a843cb83397fa757bc89653d78c800':
  Minor change to use defined key rather than a string.
2009-10-23 10:16:30 -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
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
59c6e99e3c am e304b9f4: Add a intent extra to only show the access points in the settings menu.
Merge commit 'e304b9f4f7f5bf07522fcc05615d172abd6c52a3' into eclair-plus-aosp

* commit 'e304b9f4f7f5bf07522fcc05615d172abd6c52a3':
  Add a intent extra to only show the access points in the settings menu.
2009-10-22 17:46:23 -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
92e69ef5c1 am 8355d934: Import revised translations. DO NOT MERGE
Merge commit '8355d9343455eaacf559f0df0e752f236b7464d2' into eclair-plus-aosp

* commit '8355d9343455eaacf559f0df0e752f236b7464d2':
  Import revised translations.  DO NOT MERGE
2009-10-21 12:03:06 -07:00
Eric Fischer
8355d93434 Import revised translations. DO NOT MERGE
Approver: jerryw
2009-10-21 10:47:42 -07:00
Amith Yamasani
051c642cd2 am 941c3b17: Merge change I61c28c5f into eclair
Merge commit '941c3b1794203b48a8aa2e9d6f04c09d412262bd' into eclair-plus-aosp

* commit '941c3b1794203b48a8aa2e9d6f04c09d412262bd':
  Use radio hunting time in addition to signal strength for cell standby computation. Fixes #2176141
2009-10-19 15:27:51 -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
Mike Lockwood
5da235cfa7 am cdf42466: Remove PowerManager.setAutoBrightness()
Merge commit 'cdf42466bf3471337f1355b872eb2d529ba9409c' into eclair-plus-aosp

* commit 'cdf42466bf3471337f1355b872eb2d529ba9409c':
  Remove PowerManager.setAutoBrightness()
2009-10-16 09:37:10 -07: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
Dianne Hackborn
819f0843c8 am 9f1900dc: Fix issue #2185893: Can not install 3D Media Gallery
Merge commit '9f1900dc05773a0659030e21a8c2fa1641655669' into eclair-plus-aosp

* commit '9f1900dc05773a0659030e21a8c2fa1641655669':
  Fix issue #2185893: Can not install 3D Media Gallery
2009-10-13 15:52:28 -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
Eric Fischer
a8d752069c am 9ef9801f: am 0512f51f: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '9ef9801f6f42d25b7e539262ebfec428546107fc' into eclair-plus-aosp

* commit '9ef9801f6f42d25b7e539262ebfec428546107fc':
  Import revised translations.  DO NOT MERGE
2009-10-08 15:15:52 -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
Jaikumar Ganesh
d9896e86d0 am c065348e: Show an error message when the remote side cancels the authentication and show OPP device list correctly.
Merge commit 'c065348ebaf1ea9301d7b96633bea4de8c78c2aa' into eclair-plus-aosp

* commit 'c065348ebaf1ea9301d7b96633bea4de8c78c2aa':
  Show an error message when the remote side cancels the authentication
2009-10-08 13:18:24 -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
99479dd32f am d1a04291: Update application code for BluetoothAdapter.getDefaultAdapter().
Merge commit 'd1a04291c537e271999c7e7c5c72f1f61632aacf' into eclair-plus-aosp

* commit 'd1a04291c537e271999c7e7c5c72f1f61632aacf':
  Update application code for BluetoothAdapter.getDefaultAdapter().
2009-10-07 16:36:16 -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
Eric Fischer
4f962ace77 am 06a111be: Merge change Ia3151ad3 into eclair
Merge commit '06a111be6d3ccf44de545a084302c2085cbb07de' into eclair-plus-aosp

* commit '06a111be6d3ccf44de545a084302c2085cbb07de':
  Import revised translations.   DO NOT MERGE
2009-10-07 12:08:59 -07:00
Hung-ying Tyan
d92be71168 am c0e34db1: Merge change Ifad4a4c0 into eclair
Merge commit 'c0e34db16864e25946b288cb165ad833b62d3b18' into eclair-plus-aosp

* commit 'c0e34db16864e25946b288cb165ad833b62d3b18':
  Add L2tpIpsec case in VpnSettings.processSecrets()
2009-10-07 12:08:55 -07:00
Jaikumar Ganesh
caf43948b7 am 98d76cc9: Remove STOPSHIP debug log.
Merge commit '98d76cc9b882466a97fb55913f5a507a642b5018' into eclair-plus-aosp

* commit '98d76cc9b882466a97fb55913f5a507a642b5018':
  Remove STOPSHIP debug log.
2009-10-07 11:55:47 -07:00
Chung-yih Wang
02c9f8eb95 am a8f2f72d: Add the auth_alg field back.
Merge commit 'a8f2f72da8693418f867de9c904eb250b7aae4ff' into eclair-plus-aosp

* commit 'a8f2f72da8693418f867de9c904eb250b7aae4ff':
  Add the auth_alg field back.
2009-10-07 11:39:17 -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
Eric Fischer
098ef4cb96 am 6de9fb39: Import revised translations. DO NOT MERGE
Merge commit '6de9fb390b9eab0dbaf9709db5149eefc18724da' into eclair-plus-aosp

* commit '6de9fb390b9eab0dbaf9709db5149eefc18724da':
  Import revised translations.  DO NOT MERGE
2009-10-07 11:36:10 -07:00
Jaikumar Ganesh
ff50d1c3a6 am 6e6d2362: Merge change I25f2afba into eclair
Merge commit '6e6d2362ccd119e51839a4f306c26783f634ab15' into eclair-plus-aosp

* commit '6e6d2362ccd119e51839a4f306c26783f634ab15':
  Check if a device is added to the cache before returning.
2009-10-07 11:32:19 -07:00
Chia-chi Yeh
21f14b5f46 am 85ed0862: Merge change I454a0dbf into eclair
Merge commit '85ed086217427308c3b2df5b4ba77fa5ae7326e6' into eclair-plus-aosp

* commit '85ed086217427308c3b2df5b4ba77fa5ae7326e6':
  SecuritySettings: revert "minor tuning".
2009-10-07 11:31:30 -07:00
Chia-chi Yeh
901607e2c3 am 9767612c: Merge change If764d20a into eclair
Merge commit '9767612cc8207f906173dc9459b45cd07d881c4e' into eclair-plus-aosp

* commit '9767612cc8207f906173dc9459b45cd07d881c4e':
  SecuritySettings: fix a the status before handling the intent.
2009-10-07 11:31:26 -07:00
Chia-chi Yeh
cb741212e3 am e61a2403: Merge change I844d3db3 into eclair
Merge commit 'e61a2403a64bd711dcf3abb36594eb6545601c80' into eclair-plus-aosp

* commit 'e61a2403a64bd711dcf3abb36594eb6545601c80':
  SecuritySettings: set the check box before further processing.
2009-10-07 11:31:22 -07:00
Chia-chi Yeh
85fe2beb21 am 1e98dfb4: Merge change I446bf8b5 into eclair
Merge commit '1e98dfb480f7c7be6bd2c0dc752d7742765cd74e' into eclair-plus-aosp

* commit '1e98dfb480f7c7be6bd2c0dc752d7742765cd74e':
  SecuritySettings: minor tuning.
2009-10-07 11:31:18 -07:00
Chia-chi Yeh
3d5f9fbf45 am b83ff4af: Merge change Ibf07c83d into eclair
Merge commit 'b83ff4af8c359fd5cea276318f0c9e4487ec7465' into eclair-plus-aosp

* commit 'b83ff4af8c359fd5cea276318f0c9e4487ec7465':
  SecuritySettings: remove debug messages.
2009-10-07 11:31:15 -07:00
Chia-chi Yeh
9cb59deecc am 51e97b33: Merge change Ia7c57145 into eclair
Merge commit '51e97b33d265709da2aa69c861994574a0544aaa' into eclair-plus-aosp

* commit '51e97b33d265709da2aa69c861994574a0544aaa':
  SecuritySettings: remove trailing spaces.
2009-10-07 11:31:11 -07:00
Chia-chi Yeh
ecd42371f4 am c49ca127: Merge change I02f58e89 into eclair
Merge commit 'c49ca127aa993dc2ae402680ce392da06f0e1d4c' into eclair-plus-aosp

* commit 'c49ca127aa993dc2ae402680ce392da06f0e1d4c':
  SecuritySettings: clean up.
2009-10-07 11:31:08 -07:00
Chia-chi Yeh
69a58693d0 am d2fa30ba: Merge change I28f1a0fc into eclair
Merge commit 'd2fa30baee10b755704beded16e8cf0ab2eb502f' into eclair-plus-aosp

* commit 'd2fa30baee10b755704beded16e8cf0ab2eb502f':
  WifiSettings: use keystore namespace instead of blobl.
2009-10-07 11:31:03 -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
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
Chung-yih Wang
a8f2f72da8 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.
2009-10-02 16:09:15 +08:00
Eric Fischer
6de9fb390b Import revised translations. DO NOT MERGE
Approver: jerryw
2009-10-01 17:02:17 -07:00