Commit Graph

141854 Commits

Author SHA1 Message Date
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
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
Patrick Scott
398b2f350b am b52788de: am a2bfad13: Fix the build.
Merge commit 'b52788de3e2c994096a0b74386101009acf62298'

* commit 'b52788de3e2c994096a0b74386101009acf62298':
  Fix the build.
2009-10-23 07:41:39 -07:00
Patrick Scott
b52788de3e am a2bfad13: Fix the build.
Merge commit 'a2bfad13995d8ee00ab084f1ce5c31aea5db1317' into eclair-mr2-plus-aosp

* commit 'a2bfad13995d8ee00ab084f1ce5c31aea5db1317':
  Fix the build.
2009-10-23 07:29:08 -07: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
2ec8d4c15b am 83ee51b4: am 0bc64d45: resolved conflicts for merge of e304b9f4 to eclair-mr2
Merge commit '83ee51b4858bfdef133cbb2d103a0d5a3c635ab1'

* commit '83ee51b4858bfdef133cbb2d103a0d5a3c635ab1':
  Add a intent extra to only show the access points in the settings menu.
2009-10-22 19:06:51 -07:00
Neel Parekh
83ee51b485 am 0bc64d45: resolved conflicts for merge of e304b9f4 to eclair-mr2
Merge commit '0bc64d45b418c70dca77a74ddbea62612ae4fe19' into eclair-mr2-plus-aosp

* commit '0bc64d45b418c70dca77a74ddbea62612ae4fe19':
  Add a intent extra to only show the access points in the settings menu.
2009-10-22 18:34:49 -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
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
58a0917e84 am aa5a2807: (-s ours) am 53250b3a: am 8355d934: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'aa5a28077c2e6c76da6e6c7f634eaa6bd22a8f7e'

* commit 'aa5a28077c2e6c76da6e6c7f634eaa6bd22a8f7e':
  Import revised translations.  DO NOT MERGE
2009-10-22 09:46:47 -07:00
Eric Fischer
aa5a28077c am 53250b3a: am 8355d934: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '53250b3aa8c85adb31bfe9db30907f72acab7103' into eclair-mr2-plus-aosp

* commit '53250b3aa8c85adb31bfe9db30907f72acab7103':
  Import revised translations.  DO NOT MERGE
2009-10-22 09:34:29 -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
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
65158396ff am 28309905: am 8e10261e: am 941c3b17: Merge change I61c28c5f into eclair
Merge commit '28309905ad2bcaff26d6773b2a20399296196e2e'

* commit '28309905ad2bcaff26d6773b2a20399296196e2e':
  Use radio hunting time in addition to signal strength for cell standby computation. Fixes #2176141
2009-10-19 15:38:47 -07:00
Amith Yamasani
28309905ad am 8e10261e: am 941c3b17: Merge change I61c28c5f into eclair
Merge commit '8e10261e87cf4b474cde0acb5fd837272e8c147e' into eclair-mr2-plus-aosp

* commit '8e10261e87cf4b474cde0acb5fd837272e8c147e':
  Use radio hunting time in addition to signal strength for cell standby computation. Fixes #2176141
2009-10-19 15:33:43 -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
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
Tammo Spalink
19a94f1bf3 am 45bbba85: am f239f3e0: Merge change Iec5461bc into eclair-mr2
Merge commit '45bbba8543cb61dfef315d069d21bdd77d1dc81e'

* commit '45bbba8543cb61dfef315d069d21bdd77d1dc81e':
  Remove OEM-specific bits from RadioInfo.
2009-10-18 20:20:12 -07:00
Tammo Spalink
45bbba8543 am f239f3e0: Merge change Iec5461bc into eclair-mr2
Merge commit 'f239f3e082edec0063de8c35bdf8045851252213' into eclair-mr2-plus-aosp

* commit 'f239f3e082edec0063de8c35bdf8045851252213':
  Remove OEM-specific bits from RadioInfo.
2009-10-18 20:14:03 -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
5544631783 am 1d855b18: am ee693a12: am cdf42466: Remove PowerManager.setAutoBrightness()
Merge commit '1d855b188354f9770eb1d261544123b9bb43e34d'

* commit '1d855b188354f9770eb1d261544123b9bb43e34d':
  Remove PowerManager.setAutoBrightness()
2009-10-16 09:50:08 -07:00
Mike Lockwood
1d855b1883 am ee693a12: am cdf42466: Remove PowerManager.setAutoBrightness()
Merge commit 'ee693a120ac57a84268d70447f12920827fbea6e' into eclair-mr2-plus-aosp

* commit 'ee693a120ac57a84268d70447f12920827fbea6e':
  Remove PowerManager.setAutoBrightness()
2009-10-16 09:43:20 -07: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
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
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
Jean-Baptiste Queru
2d5171c69e am b4b73756: merge from open-source master
Merge commit 'b4b73756d426ee99df615a0a37a71c2ff79a0d38'

* commit 'b4b73756d426ee99df615a0a37a71c2ff79a0d38':
2009-10-14 16:20:05 -07:00
Jean-Baptiste Queru
b4b73756d4 merge from open-source master 2009-10-14 16:02:18 -07:00
Eric Fischer
1d1eaa36aa am 889f7568: (-s ours) am 880daa29: Merge change I1b21ba17 into eclair-mr2
Merge commit '889f756808998691ec8dc22e55f80e8f9a528893'

* commit '889f756808998691ec8dc22e55f80e8f9a528893':
  Import revised translations.  DO NOT MERGE
2009-10-13 17:24:38 -07:00
Eric Fischer
889f756808 am 880daa29: Merge change I1b21ba17 into eclair-mr2
Merge commit '880daa29161330c97e65101659ed6b88066a3dbe' into eclair-mr2-plus-aosp

* commit '880daa29161330c97e65101659ed6b88066a3dbe':
  Import revised translations.  DO NOT MERGE
2009-10-13 17:12:43 -07:00
Dianne Hackborn
ac1bc2761c am 8271a531: am 3539cc5e: am 9f1900dc: Fix issue #2185893: Can not install 3D Media Gallery
Merge commit '8271a531b73ffa82202a223d28581c7c44e03d35'

* commit '8271a531b73ffa82202a223d28581c7c44e03d35':
  Fix issue #2185893: Can not install 3D Media Gallery
2009-10-13 17:11:43 -07:00
Chung-yih Wang
785e404b09 am 2683c04a: am 5676ccab: Merge change I69ea4234 into eclair-mr2
Merge commit '2683c04ae8bf2db63f9ea2c4031854b98eed21ce'

* commit '2683c04ae8bf2db63f9ea2c4031854b98eed21ce':
  Remove the getHumanReadibleSsid().
2009-10-13 17:06:02 -07:00
Hung-ying Tyan
2f188c204e am ae59063b: am f20623b2: Merge change I6983cab3 into eclair-mr2
Merge commit 'ae59063b7afc234216050c9b5a99b1dc878754e7'

* commit 'ae59063b7afc234216050c9b5a99b1dc878754e7':
  Add saving/restoring state in CredentialInstaller and ...
2009-10-13 17:05:51 -07:00
Chung-yih Wang
b15fe6623c am c0ef160b: am a5b7b45b: Push down the supplicant-specific double-quote handling to framework.
Merge commit 'c0ef160be719ae320e9d9574898ec9eef01ceb55'

* commit 'c0ef160be719ae320e9d9574898ec9eef01ceb55':
  Push down the supplicant-specific double-quote handling to framework.
2009-10-13 17:05:12 -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
1d75440144 Reimport translations.
Change-Id: I0127a0ad80f0736263d4e5dd01371184f2e16cdf
2009-10-13 16:43:35 -07:00
Eric Fischer
1b21ba1738 Import revised translations. DO NOT MERGE 2009-10-13 16:07:48 -07:00
Dianne Hackborn
8271a531b7 am 3539cc5e: am 9f1900dc: Fix issue #2185893: Can not install 3D Media Gallery
Merge commit '3539cc5ef317b58c0e12c083d7cbda942658cad0' into eclair-mr2-plus-aosp

* commit '3539cc5ef317b58c0e12c083d7cbda942658cad0':
  Fix issue #2185893: Can not install 3D Media Gallery
2009-10-13 15:56:52 -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
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