git.osdn.net Git - android-x86/packages-apps-Settings.git/log

Eric Fischer [Thu, 22 Oct 2009 16:34:29 +0000 (09:34 -0700)]

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Fischer [Wed, 21 Oct 2009 17:47:42 +0000 (10:47 -0700)]

Import revised translations. DO NOT MERGE

Approver: jerryw

commit | commitdiff | tree

Amith Yamasani [Mon, 19 Oct 2009 22:33:43 +0000 (15:33 -0700)]

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Tammo Spalink [Mon, 19 Oct 2009 03:14:03 +0000 (20:14 -0700)]

am f239f3e0: Merge change Iec5461bc into eclair-mr2

Merge commit 'f239f3e082edec0063de8c35bdf8045851252213' into eclair-mr2-plus-aosp

* commit 'f239f3e082edec0063de8c35bdf8045851252213':
Remove OEM-specific bits from RadioInfo.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Mike Lockwood [Fri, 16 Oct 2009 16:43:20 +0000 (09:43 -0700)]

am ee693a12: am cdf42466: Remove PowerManager.setAutoBrightness()

Merge commit 'ee693a120ac57a84268d70447f12920827fbea6e' into eclair-mr2-plus-aosp

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

commit | commitdiff | tree

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()

commit | commitdiff | tree

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

commit | commitdiff | tree

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>

commit | commitdiff | tree

Jean-Baptiste Queru [Wed, 14 Oct 2009 23:02:18 +0000 (16:02 -0700)]

merge from open-source master

commit | commitdiff | tree

Eric Fischer [Wed, 14 Oct 2009 00:12:43 +0000 (17:12 -0700)]

am 880daa29: Merge change I1b21ba17 into eclair-mr2

Merge commit '880daa29161330c97e65101659ed6b88066a3dbe' into eclair-mr2-plus-aosp

* commit '880daa29161330c97e65101659ed6b88066a3dbe':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Fischer [Tue, 13 Oct 2009 23:07:48 +0000 (16:07 -0700)]

Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Dianne Hackborn [Tue, 13 Oct 2009 22:56:52 +0000 (15:56 -0700)]

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

commit | commitdiff | tree

Dianne Hackborn [Tue, 13 Oct 2009 22:52:28 +0000 (15:52 -0700)]

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Chung-yih Wang [Tue, 13 Oct 2009 16:36:33 +0000 (09:36 -0700)]

am 5676ccab: Merge change I69ea4234 into eclair-mr2

Merge commit '5676ccab335401e79beef78ad0585a2a40aaf42c' into eclair-mr2-plus-aosp

* commit '5676ccab335401e79beef78ad0585a2a40aaf42c':
Remove the getHumanReadibleSsid().

commit | commitdiff | tree

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().

commit | commitdiff | tree

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.

commit | commitdiff | tree

Hung-ying Tyan [Tue, 13 Oct 2009 10:00:12 +0000 (03:00 -0700)]

am f20623b2: Merge change I6983cab3 into eclair-mr2

Merge commit 'f20623b2b6f75ecbbe1ac5de4994dd2944083d7b' into eclair-mr2-plus-aosp

* commit 'f20623b2b6f75ecbbe1ac5de4994dd2944083d7b':
Add saving/restoring state in CredentialInstaller and ...

commit | commitdiff | tree

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 ...

commit | commitdiff | tree

Hung-ying Tyan [Sat, 10 Oct 2009 17:34:11 +0000 (01:34 +0800)]

Add saving/restoring state in CredentialInstaller and ...

make it transparent.

commit | commitdiff | tree

Chung-yih Wang [Tue, 13 Oct 2009 01:41:08 +0000 (18:41 -0700)]

am a5b7b45b: Push down the supplicant-specific double-quote handling to framework.

Merge commit 'a5b7b45b6fe125b5f04d248b0f624eee9a7ea7da' into eclair-mr2-plus-aosp

* commit 'a5b7b45b6fe125b5f04d248b0f624eee9a7ea7da':
Push down the supplicant-specific double-quote handling to framework.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Eric Fischer [Fri, 9 Oct 2009 00:52:46 +0000 (17:52 -0700)]

am 5204b662: am 9ef9801f: (-s ours) am 0512f51f: (-s ours) Import revised translations. DO NOT MERGE

Merge commit '5204b662a0c155f695cf4e7b6341872a803a7e80' into eclair-mr2-plus-aosp

* commit '5204b662a0c155f695cf4e7b6341872a803a7e80':

commit | commitdiff | tree

Jaikumar Ganesh [Fri, 9 Oct 2009 00:52:42 +0000 (17:52 -0700)]

am db99bb36: am c065348e: Show an error message when the remote side cancels the authentication and show OPP device list correctly.

Merge commit 'db99bb36449f34d6f26f61092a6c77de1bb98c91' into eclair-mr2-plus-aosp

* commit 'db99bb36449f34d6f26f61092a6c77de1bb98c91':

commit | commitdiff | tree

Eric Fischer [Fri, 9 Oct 2009 00:52:42 +0000 (17:52 -0700)]

Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Fischer [Thu, 8 Oct 2009 22:15:52 +0000 (15:15 -0700)]

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jaikumar Ganesh [Thu, 8 Oct 2009 20:18:24 +0000 (13:18 -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-plus-aosp

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

commit | commitdiff | tree

Michael Chan [Thu, 8 Oct 2009 19:07:14 +0000 (12:07 -0700)]

am 81cdaff7: b/2173596 Cancel Bluetooth scanning when the user leaves Bluetooth Settings.

Merge commit '81cdaff7b5aed3ea2b987b23e2e9a6c0213b0aa5' into eclair-mr2-plus-aosp

* commit '81cdaff7b5aed3ea2b987b23e2e9a6c0213b0aa5':
b/2173596 Cancel Bluetooth scanning when the user leaves Bluetooth Settings.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Nick Pelly [Wed, 7 Oct 2009 23:41:31 +0000 (16:41 -0700)]

am 94ca23dc: am d1a04291: Update application code for BluetoothAdapter.getDefaultAdapter().

Merge commit '94ca23dcb049c11b097c3c1f9fe9091b3d40d337' into eclair-mr2-plus-aosp

* commit '94ca23dcb049c11b097c3c1f9fe9091b3d40d337':

commit | commitdiff | tree

Nick Pelly [Wed, 7 Oct 2009 23:41:31 +0000 (16:41 -0700)]

Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp

commit | commitdiff | tree

Nick Pelly [Wed, 7 Oct 2009 23:36:16 +0000 (16:36 -0700)]

am d1a04291: Update application code for BluetoothAdapter.getDefaultAdapter().

Merge commit 'd1a04291c537e271999c7e7c5c72f1f61632aacf' into eclair-plus-aosp

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

commit | commitdiff | tree

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().

commit | commitdiff | tree

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.

commit | commitdiff | tree

Eric Fischer [Wed, 7 Oct 2009 19:08:59 +0000 (12:08 -0700)]

am 06a111be: Merge change Ia3151ad3 into eclair

Merge commit '06a111be6d3ccf44de545a084302c2085cbb07de' into eclair-plus-aosp

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

commit | commitdiff | tree

Hung-ying Tyan [Wed, 7 Oct 2009 19:08:55 +0000 (12:08 -0700)]

am c0e34db1: Merge change Ifad4a4c0 into eclair

Merge commit 'c0e34db16864e25946b288cb165ad833b62d3b18' into eclair-plus-aosp

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

commit | commitdiff | tree

Elliott Hughes [Wed, 7 Oct 2009 19:02:16 +0000 (12:02 -0700)]

am c52637df: Merge change I8e1b0fb7 into eclair-mr2

Merge commit 'c52637dfab3178fa4d973ec3b41158903b71454f' into eclair-mr2-plus-aosp

* commit 'c52637dfab3178fa4d973ec3b41158903b71454f':
Fix Settings to show versionName instead of versionCode.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Jaikumar Ganesh [Wed, 7 Oct 2009 18:55:47 +0000 (11:55 -0700)]

am 98d76cc9: Remove STOPSHIP debug log.

Merge commit '98d76cc9b882466a97fb55913f5a507a642b5018' into eclair-plus-aosp

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

commit | commitdiff | tree

Eric Fischer [Wed, 7 Oct 2009 18:52:21 +0000 (11:52 -0700)]

am c197f154: am 06a111be: (-s ours) Merge change Ia3151ad3 into eclair

Merge commit 'c197f15486c053e89bc610c7e7b497130f4fb5a7' into eclair-mr2-plus-aosp

* commit 'c197f15486c053e89bc610c7e7b497130f4fb5a7':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Hung-ying Tyan [Wed, 7 Oct 2009 18:52:17 +0000 (11:52 -0700)]

am 1cd02cac: am c0e34db1: Merge change Ifad4a4c0 into eclair

Merge commit '1cd02caccd4aa5b70ae342de386a21255cf9bed7' into eclair-mr2-plus-aosp

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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()

commit | commitdiff | tree

Chung-yih Wang [Wed, 7 Oct 2009 18:39:17 +0000 (11:39 -0700)]

am a8f2f72d: Add the auth_alg field back.

Merge commit 'a8f2f72da8693418f867de9c904eb250b7aae4ff' into eclair-plus-aosp

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Fischer [Wed, 7 Oct 2009 18:36:10 +0000 (11:36 -0700)]

am 6de9fb39: Import revised translations. DO NOT MERGE

Merge commit '6de9fb390b9eab0dbaf9709db5149eefc18724da' into eclair-plus-aosp

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

commit | commitdiff | tree

Jaikumar Ganesh [Wed, 7 Oct 2009 18:32:19 +0000 (11:32 -0700)]

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.

commit | commitdiff | tree

Chia-chi Yeh [Wed, 7 Oct 2009 18:31:30 +0000 (11:31 -0700)]

am 85ed0862: Merge change I454a0dbf into eclair

Merge commit '85ed086217427308c3b2df5b4ba77fa5ae7326e6' into eclair-plus-aosp

* commit '85ed086217427308c3b2df5b4ba77fa5ae7326e6':
SecuritySettings: revert "minor tuning".

commit | commitdiff | tree

Chia-chi Yeh [Wed, 7 Oct 2009 18:31:26 +0000 (11:31 -0700)]

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.

commit | commitdiff | tree

Chia-chi Yeh [Wed, 7 Oct 2009 18:31:22 +0000 (11:31 -0700)]

am e61a2403: Merge change I844d3db3 into eclair

Merge commit 'e61a2403a64bd711dcf3abb36594eb6545601c80' into eclair-plus-aosp

* commit 'e61a2403a64bd711dcf3abb36594eb6545601c80':
SecuritySettings: set the check box before further processing.

commit | commitdiff | tree

Chia-chi Yeh [Wed, 7 Oct 2009 18:31:18 +0000 (11:31 -0700)]

am 1e98dfb4: Merge change I446bf8b5 into eclair

Merge commit '1e98dfb480f7c7be6bd2c0dc752d7742765cd74e' into eclair-plus-aosp

* commit '1e98dfb480f7c7be6bd2c0dc752d7742765cd74e':
SecuritySettings: minor tuning.

commit | commitdiff | tree

Chia-chi Yeh [Wed, 7 Oct 2009 18:31:15 +0000 (11:31 -0700)]

am b83ff4af: Merge change Ibf07c83d into eclair

Merge commit 'b83ff4af8c359fd5cea276318f0c9e4487ec7465' into eclair-plus-aosp

* commit 'b83ff4af8c359fd5cea276318f0c9e4487ec7465':
SecuritySettings: remove debug messages.

commit | commitdiff | tree

Chia-chi Yeh [Wed, 7 Oct 2009 18:31:11 +0000 (11:31 -0700)]

am 51e97b33: Merge change Ia7c57145 into eclair

Merge commit '51e97b33d265709da2aa69c861994574a0544aaa' into eclair-plus-aosp

* commit '51e97b33d265709da2aa69c861994574a0544aaa':
SecuritySettings: remove trailing spaces.

commit | commitdiff | tree

Chia-chi Yeh [Wed, 7 Oct 2009 18:31:08 +0000 (11:31 -0700)]

am c49ca127: Merge change I02f58e89 into eclair

Merge commit 'c49ca127aa993dc2ae402680ce392da06f0e1d4c' into eclair-plus-aosp

* commit 'c49ca127aa993dc2ae402680ce392da06f0e1d4c':
SecuritySettings: clean up.

commit | commitdiff | tree

Chia-chi Yeh [Wed, 7 Oct 2009 18:31:03 +0000 (11:31 -0700)]

am d2fa30ba: Merge change I28f1a0fc into eclair

Merge commit 'd2fa30baee10b755704beded16e8cf0ab2eb502f' into eclair-plus-aosp

* commit 'd2fa30baee10b755704beded16e8cf0ab2eb502f':
WifiSettings: use keystore namespace instead of blobl.

commit | commitdiff | tree

Elliott Hughes [Wed, 7 Oct 2009 18:12:33 +0000 (11:12 -0700)]

Fix Settings to show versionName instead of versionCode.

commit | commitdiff | tree

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()

commit | commitdiff | tree

Eric Fischer [Tue, 6 Oct 2009 23:54:08 +0000 (16:54 -0700)]

Import revised translations. DO NOT MERGE

Approver: jerryw

commit | commitdiff | tree

Amith Yamasani [Tue, 6 Oct 2009 22:18:15 +0000 (15:18 -0700)]

am cab9fe2d: Merge change I3c9f79ba into eclair-mr2

Merge commit 'cab9fe2d41eba522a485dcad2b8e91f789e48c57' into eclair-mr2-plus-aosp

* commit 'cab9fe2d41eba522a485dcad2b8e91f789e48c57':
Retain webview history when viewing Safety notices. Fixes #2160518

commit | commitdiff | tree

Jaikumar Ganesh [Tue, 6 Oct 2009 21:50:40 +0000 (14:50 -0700)]

am f43b1a9d: am 98d76cc9: Remove STOPSHIP debug log.

Merge commit 'f43b1a9d2428ec9e403a918ffb724ccf755ba2f9' into eclair-mr2-plus-aosp

* commit 'f43b1a9d2428ec9e403a918ffb724ccf755ba2f9':
Remove STOPSHIP debug log.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Jaikumar Ganesh [Tue, 6 Oct 2009 15:01:21 +0000 (08:01 -0700)]

Remove STOPSHIP debug log.

Bug: 2151872
Dr No: Eastham

commit | commitdiff | tree

Chia-chi Yeh [Tue, 6 Oct 2009 10:05:02 +0000 (03:05 -0700)]

am 0bc5e275: SecuritySettings: reduce 1 access to KeyStore and clean up.

Merge commit '0bc5e275fdbbb8e80f8259136caf45a356922c40' into eclair-mr2-plus-aosp

* commit '0bc5e275fdbbb8e80f8259136caf45a356922c40':
SecuritySettings: reduce 1 access to KeyStore and clean up.

commit | commitdiff | tree

Dan Vacura [Tue, 6 Oct 2009 10:05:02 +0000 (03:05 -0700)]

Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp

commit | commitdiff | tree

Hung-ying Tyan [Tue, 6 Oct 2009 08:15:42 +0000 (16:15 +0800)]

Add L2tpIpsec case in VpnSettings.processSecrets()

commit | commitdiff | tree

Chia-chi Yeh [Tue, 6 Oct 2009 07:43:55 +0000 (15:43 +0800)]

SecuritySettings: reduce 1 access to KeyStore and clean up.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

Eric Fischer [Fri, 2 Oct 2009 00:02:17 +0000 (17:02 -0700)]

Import revised translations. DO NOT MERGE

Approver: jerryw

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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".

commit | commitdiff | tree

Chia-chi Yeh [Thu, 1 Oct 2009 18:32:54 +0000 (02:32 +0800)]

SecuritySettings: revert "minor tuning".

commit | commitdiff | tree

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.

commit | commitdiff | tree

Chia-chi Yeh [Thu, 1 Oct 2009 18:16:08 +0000 (02:16 +0800)]

SecuritySettings: fix a the status before handling the intent.