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

Jim Miller [Fri, 20 May 2011 23:54:35 +0000 (16:54 -0700)]

am 318f7850: am 360f0603: Fix 4462497: Use new sw600dp resource target for LockScreen settings

* commit '318f7850f6651d5d62df1d5dce05d67dfa5d9188':
Fix 4462497: Use new sw600dp resource target for LockScreen settings

commit | commitdiff | tree

Jim Miller [Fri, 20 May 2011 23:51:46 +0000 (16:51 -0700)]

am 360f0603: Fix 4462497: Use new sw600dp resource target for LockScreen settings

* commit '360f060334d3be3dbf13f3af770eb4fcccfddfb2':
Fix 4462497: Use new sw600dp resource target for LockScreen settings

commit | commitdiff | tree

Jim Miller [Fri, 20 May 2011 22:49:27 +0000 (15:49 -0700)]

Fix 4462497: Use new sw600dp resource target for LockScreen settings

Change-Id: I3156aedff564dbf426fa0421a66c7f491af6a354

commit | commitdiff | tree

Jim Miller [Fri, 20 May 2011 20:26:49 +0000 (13:26 -0700)]

am d36628a7: am e8ebec86: Fix 4462497: Fixes crash in settings due to using wrong layout on 7" devices.

* commit 'd36628a74e699625e874608a7cb77cffaf0e9b29':
Fix 4462497: Fixes crash in settings due to using wrong layout on 7" devices.

commit | commitdiff | tree

Jim Miller [Fri, 20 May 2011 20:16:38 +0000 (13:16 -0700)]

am e8ebec86: Fix 4462497: Fixes crash in settings due to using wrong layout on 7" devices.

* commit 'e8ebec86e6ce342b929c96c001b1599d7d84effc':
Fix 4462497: Fixes crash in settings due to using wrong layout on 7" devices.

commit | commitdiff | tree

Irfan Sheriff [Fri, 20 May 2011 00:15:43 +0000 (17:15 -0700)]

am a6f178a8: Merge "Fix enabling of submit button" into honeycomb-LTE

* commit 'a6f178a817ec36d5cf6d6a3d9c19c73278f0c3ca':
Fix enabling of submit button

commit | commitdiff | tree

Jim Miller [Fri, 20 May 2011 00:09:10 +0000 (17:09 -0700)]

Fix 4462497: Fixes crash in settings due to using wrong layout on 7" devices.

Change-Id: I674112df2bdcec0bd94c85b1a777c336c037edc5

commit | commitdiff | tree

Irfan Sheriff [Thu, 19 May 2011 23:47:04 +0000 (16:47 -0700)]

Merge "Fix enabling of submit button" into honeycomb-LTE

commit | commitdiff | tree

Irfan Sheriff [Thu, 19 May 2011 23:05:02 +0000 (16:05 -0700)]

Fix enabling of submit button

Change I478c915b introduced a regression where the submit
button is enabled even if no password is entered for a secure
network.

This happened because our checks would override a password
check when IP and proxy settings are valid (which is the default
setting)

Bug: 4462439
Change-Id: Icd3fde90759f33fa391ec79ae8075b6d8388d2e9

commit | commitdiff | tree

Eric Fischer [Tue, 17 May 2011 20:33:53 +0000 (13:33 -0700)]

am d6e23b9a: am ce116503: Import revised translations. DO NOT MERGE

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

commit | commitdiff | tree

Eric Fischer [Tue, 17 May 2011 20:29:57 +0000 (13:29 -0700)]

am ce116503: Import revised translations. DO NOT MERGE

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

commit | commitdiff | tree

Eric Fischer [Tue, 17 May 2011 20:21:44 +0000 (13:21 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: Iafedceb5fee433d9a55f8f76e941778c2ace85e7

commit | commitdiff | tree

Eric Fischer [Tue, 10 May 2011 22:32:16 +0000 (15:32 -0700)]

am d779e5df: am 0bbe27da: am a9aa8aa3: (-s ours) Import revised translations. DO NOT MERGE

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

commit | commitdiff | tree

Eric Fischer [Tue, 10 May 2011 22:03:23 +0000 (15:03 -0700)]

am 0bbe27da: am a9aa8aa3: (-s ours) Import revised translations. DO NOT MERGE

* commit '0bbe27dabe8d667133a599dfffa8d7c6715ae7e6':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 10 May 2011 22:00:51 +0000 (15:00 -0700)]

am a9aa8aa3: (-s ours) Import revised translations. DO NOT MERGE

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

commit | commitdiff | tree

Eric Fischer [Tue, 10 May 2011 19:23:31 +0000 (12:23 -0700)]

am 450721fc: am 9766cccb: Import revised translations. DO NOT MERGE

* commit '450721fca317a7c111555ad6650f62b1081eb740':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 10 May 2011 19:19:04 +0000 (12:19 -0700)]

am 9766cccb: Import revised translations. DO NOT MERGE

* commit '9766cccb3969db4564ad4548582685ee7b18e2e6':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 10 May 2011 00:04:32 +0000 (17:04 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: Ieed2bec37375bf9dc2504922350c2d8ac3883f97

commit | commitdiff | tree

John Wang [Mon, 9 May 2011 22:08:24 +0000 (15:08 -0700)]

am 22e52793: Update the MEID setting label.

* commit '22e5279382db1cbb05dd093a93ab7ddd9efbe2fe':
Update the MEID setting label.

commit | commitdiff | tree

John Wang [Mon, 9 May 2011 18:36:19 +0000 (11:36 -0700)]

Update the MEID setting label.

Currently show MEID for CDMA devices. For LTE devices, this should be IMEI.

Both values are the same for CDMA-LTE devices. Update "MEID" to "IMEI / MEID".

bug:4356748
Change-Id: I39b1f1c4c776a4acb045aa9ef7d8869ed66a30e4

commit | commitdiff | tree

Robert Greenwalt [Mon, 2 May 2011 20:29:26 +0000 (13:29 -0700)]

am 3c3490c8: Use new RouteInfo class.

* commit '3c3490c819a1a6ce72468c1d867429ac0f86def8':
Use new RouteInfo class.

commit | commitdiff | tree

Robert Greenwalt [Sat, 30 Apr 2011 00:13:44 +0000 (17:13 -0700)]

Use new RouteInfo class.

Change-Id: I144ebb87e6d1809f59ebd32e64e186d836a365f8

commit | commitdiff | tree

Eric Fischer [Fri, 29 Apr 2011 21:01:54 +0000 (14:01 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: Ia76f041ab40e27fb76f8f52f2e6e3b036421f910

commit | commitdiff | tree

Eric Fischer [Thu, 28 Apr 2011 17:26:29 +0000 (10:26 -0700)]

am 643e48b7: (-s ours) am 7c284c2c: Import revised translations. DO NOT MERGE

* commit '643e48b7fd1f1be62ac4bedc1051c00be129006b':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 27 Apr 2011 22:31:22 +0000 (15:31 -0700)]

am 7c284c2c: Import revised translations. DO NOT MERGE

* commit '7c284c2c62ce565dacfae641108a2a5033e78721':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 27 Apr 2011 20:53:57 +0000 (13:53 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: I56239c7b2a936acc9b93b8592a2a04e42a55458b

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 17:32:42 +0000 (10:32 -0700)]

Ignoring empty list test in favor of commented out code.

Change-Id: I478980eb6d56be164bbe22a73ff945ae9c57a57a

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 16:55:23 +0000 (09:55 -0700)]

am bc20d67f: Merge "Avoid crash when switching to 2G/3G network."

* commit 'bc20d67fedd453eec9dcb127cf9df909a192baf5':
Avoid crash when switching to 2G/3G network.

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 16:51:22 +0000 (09:51 -0700)]

Merge "Avoid crash when switching to 2G/3G network."

commit | commitdiff | tree

Kenneth Westin [Tue, 26 Apr 2011 12:08:45 +0000 (14:08 +0200)]

Avoid crash when switching to 2G/3G network.

Adding test that active APN array is not empty.

Change-Id: I16246aa45c991a9396ef03d9bb083d97c3ca2e1a

commit | commitdiff | tree

Wink Saville [Wed, 20 Apr 2011 18:32:53 +0000 (11:32 -0700)]

am 2c3ec092: Remove getCurrentDataConnectionList.

* commit '2c3ec09261bf1503e75328175b5286af5676845e':
Remove getCurrentDataConnectionList.

commit | commitdiff | tree

Wink Saville [Wed, 20 Apr 2011 17:24:36 +0000 (10:24 -0700)]

Remove getCurrentDataConnectionList.

I'll add another mechanism which will probably use an
asynchronous interface with the DataConnectionTracker.

Change-Id: I71f80bb9fe0496c42ff9b1ddbf4e36a68d3f1592

commit | commitdiff | tree

Eric Fischer [Thu, 14 Apr 2011 21:27:34 +0000 (14:27 -0700)]

am 20a44118: am 76aa8fe0: am 4ba98d53: (-s ours) Import revised translations. DO NOT MERGE

* commit '20a44118ddce65bcb1a86a38ab17d82083528930':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Thu, 14 Apr 2011 21:24:48 +0000 (14:24 -0700)]

am 76aa8fe0: am 4ba98d53: (-s ours) Import revised translations. DO NOT MERGE

* commit '76aa8fe0663004a7b481a830cca87492bd9c7987':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Thu, 14 Apr 2011 21:20:01 +0000 (14:20 -0700)]

am 4ba98d53: (-s ours) Import revised translations. DO NOT MERGE

* commit '4ba98d5381d89f5afd83f9ce4a5f1e666e7579e7':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Thu, 14 Apr 2011 21:04:03 +0000 (14:04 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: I64e7baff852f629d0281352be24fc54eadb48367

commit | commitdiff | tree

Glenn Kasten [Wed, 13 Apr 2011 18:51:59 +0000 (11:51 -0700)]

am 315b452c: am 4f4ddaa8: Bug 4167061 remove debug code

* commit '315b452c322f2eeeeb0ec946e31656ca93b8c0a7':
Bug 4167061 remove debug code

commit | commitdiff | tree

Glenn Kasten [Wed, 13 Apr 2011 18:47:46 +0000 (11:47 -0700)]

am 4f4ddaa8: Bug 4167061 remove debug code

* commit '4f4ddaa823bfa7bd2fdff97338ff1839739925dd':
Bug 4167061 remove debug code

commit | commitdiff | tree

Glenn Kasten [Wed, 13 Apr 2011 18:19:58 +0000 (11:19 -0700)]

Bug 4167061 remove debug code

Change-Id: I1a05b820030d503b4ae1a82789ad4607e46b43c0

commit | commitdiff | tree

Simon Wilson [Tue, 12 Apr 2011 00:33:20 +0000 (17:33 -0700)]

am f927cccd: (-s ours) am 37063d6a: DO NOT MERGE Clarify additional system update string length/usage

* commit 'f927cccd795c75247bf6bfba881059d5e9c43fb5':
DO NOT MERGE Clarify additional system update string length/usage

commit | commitdiff | tree

Eric Fischer [Mon, 11 Apr 2011 21:24:30 +0000 (14:24 -0700)]

am 84c90053: (-s ours) am fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread

* commit '84c90053751ae1bcb07a845f5ac9747a808198b1':
Reimport Settings translations. DO NOT MERGE

commit | commitdiff | tree

Simon Wilson [Mon, 11 Apr 2011 21:24:28 +0000 (14:24 -0700)]

am 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread

* commit '2ca7add59f2437c4584029ba081bd4d222445ff9':
DO NOT MERGE Put additional update package names in config.xml

commit | commitdiff | tree

Eric Fischer [Mon, 11 Apr 2011 21:24:25 +0000 (14:24 -0700)]

am 6735ae14: (-s ours) am b4bd78f5: Revert "Import revised translations. DO NOT MERGE"

* commit '6735ae141fee012409a2eaa0310538f3b0173263':
Revert "Import revised translations. DO NOT MERGE"

commit | commitdiff | tree

Simon Wilson [Mon, 11 Apr 2011 21:12:43 +0000 (14:12 -0700)]

am 37063d6a: DO NOT MERGE Clarify additional system update string length/usage

* commit '37063d6adf9b472a8bb4bd58493517e04aafba95':
DO NOT MERGE Clarify additional system update string length/usage

commit | commitdiff | tree

Glenn Kasten [Mon, 11 Apr 2011 19:46:36 +0000 (12:46 -0700)]

am b72f1b0f: am 858fd9a0: HDCP debugging in setting app part 2 of 2

* commit 'b72f1b0f45401a3fb8abe8e5e40eb5eab12e2710':
HDCP debugging in setting app part 2 of 2

commit | commitdiff | tree

Glenn Kasten [Mon, 11 Apr 2011 19:43:22 +0000 (12:43 -0700)]

am 858fd9a0: HDCP debugging in setting app part 2 of 2

* commit '858fd9a0302c6d34781133137a048a9bf668632a':
HDCP debugging in setting app part 2 of 2

commit | commitdiff | tree

Simon Wilson [Mon, 11 Apr 2011 19:38:21 +0000 (12:38 -0700)]

DO NOT MERGE Clarify additional system update string length/usage

Change-Id: I627c3d50de1af23a620fe6ca3abac03ad3aa7d49

commit | commitdiff | tree

Glenn Kasten [Mon, 11 Apr 2011 18:11:56 +0000 (11:11 -0700)]

HDCP debugging in setting app part 2 of 2

Change-Id: I931c50938526adce521a7bf02301aba75abaacaf

commit | commitdiff | tree

Eric Fischer [Wed, 6 Apr 2011 21:19:10 +0000 (14:19 -0700)]

am 84edd9d5: am 8214c76e: Import revised translations. DO NOT MERGE

* commit '84edd9d5281cb8e03ea31631aa232b8458136f32':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 6 Apr 2011 21:16:10 +0000 (14:16 -0700)]

am 8214c76e: Import revised translations. DO NOT MERGE

* commit '8214c76e27de37a663cf8ce7a30091bf23c9be02':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 6 Apr 2011 20:51:27 +0000 (13:51 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: I5096f0341965e767187b8444f93804cad934ada9

commit | commitdiff | tree

Eric Fischer [Tue, 5 Apr 2011 00:42:55 +0000 (17:42 -0700)]

am dfb78827: (-s ours) am 955ab98f: Import revised translations. DO NOT MERGE

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

commit | commitdiff | tree

Eric Fischer [Mon, 4 Apr 2011 21:43:04 +0000 (14:43 -0700)]

am fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread

* commit 'fcb089c94280dd3b5a1ed8f90610d258a43abb78':
Reimport Settings translations. DO NOT MERGE

commit | commitdiff | tree

Simon Wilson [Mon, 4 Apr 2011 21:43:02 +0000 (14:43 -0700)]

am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread

* commit 'ca572fb64b77a2fe3ff93874ee5956214368b104':
DO NOT MERGE Put additional update package names in config.xml

commit | commitdiff | tree

Eric Fischer [Mon, 4 Apr 2011 21:42:59 +0000 (14:42 -0700)]

am b4bd78f5: Revert "Import revised translations. DO NOT MERGE"

* commit 'b4bd78f52305aa1b47fe9ac09d99e00116f201a6':
Revert "Import revised translations. DO NOT MERGE"

commit | commitdiff | tree

Eric Fischer [Mon, 4 Apr 2011 19:21:25 +0000 (12:21 -0700)]

am 955ab98f: Import revised translations. DO NOT MERGE

* commit '955ab98f030cd198d838bdff8768ff87a17be9a8':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Fri, 1 Apr 2011 23:52:28 +0000 (16:52 -0700)]

Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread

commit | commitdiff | tree

Simon Wilson [Fri, 1 Apr 2011 23:47:22 +0000 (16:47 -0700)]

Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread

commit | commitdiff | tree

Eric Fischer [Fri, 1 Apr 2011 23:42:38 +0000 (16:42 -0700)]

Reimport Settings translations. DO NOT MERGE

Change-Id: I90c528fe4f87a3f53875eae9f98b2a6aaa4d1b6a

commit | commitdiff | tree

Eric Fischer [Fri, 1 Apr 2011 23:12:35 +0000 (16:12 -0700)]

Revert "Import revised translations. DO NOT MERGE"

This reverts commit 955ab98f030cd198d838bdff8768ff87a17be9a8.

Bug 4204088 requires that these strings not be translated.

Change-Id: I98044cc669a9ee70a8892123a05c0fc33599d404

commit | commitdiff | tree

Simon Wilson [Fri, 1 Apr 2011 20:41:03 +0000 (13:41 -0700)]

DO NOT MERGE Put additional update package names in config.xml

Prevents them from being duplicated to other language resources,
which in turn prevents the overlay from working. This fixes the
bug where we see a blank menu item in Settings->About phone
when the non-default language is selected.

Change-Id: I73056716156c580606433bb63abfdd35c1b9892a

commit | commitdiff | tree

Park Sanghyun [Wed, 30 Mar 2011 22:29:48 +0000 (15:29 -0700)]

am 2b2959b3: (-s ours) am e5da8565: DO NOT MERGE Add support for additional System Update menu item

* commit '2b2959b32141e86a0de880ded77c3ef63a081e0f':
DO NOT MERGE Add support for additional System Update menu item

commit | commitdiff | tree

Kenny Root [Wed, 30 Mar 2011 16:36:19 +0000 (09:36 -0700)]

resolved conflicts for merge of 70a1ff03 to honeycomb-plus-aosp

Change-Id: I1df4d790b070acbf89b9ee16bd750918486fce58

commit | commitdiff | tree

Park Sanghyun [Wed, 30 Mar 2011 16:31:15 +0000 (09:31 -0700)]

am e5da8565: DO NOT MERGE Add support for additional System Update menu item

* commit 'e5da8565ca7930483c2e8c6467710716cf51ba51':
DO NOT MERGE Add support for additional System Update menu item

commit | commitdiff | tree

Kenny Root [Tue, 29 Mar 2011 22:43:38 +0000 (15:43 -0700)]

am 7fceefa7: Merge "Settings: Improved UX when viewing open source license info."

* commit '7fceefa79229ece2efab0446841543a8f8f20a1d':
Settings: Improved UX when viewing open source license info.

commit | commitdiff | tree

Kenny Root [Tue, 29 Mar 2011 22:03:25 +0000 (15:03 -0700)]

Merge "Settings: Improved UX when viewing open source license info."

commit | commitdiff | tree

Henrik Carlsson [Fri, 3 Sep 2010 09:08:19 +0000 (11:08 +0200)]

Settings: Improved UX when viewing open source license info.

Added spinning progress indicator to the open source license dialog.
The actual file loading is now handled by a separate thread, in
order to provide user feedback and reduce risk for ANR.

Change-Id: Ia12727ecc2fe8114e0d1384769b568142c8a1db6

commit | commitdiff | tree

Eric Fischer [Tue, 29 Mar 2011 21:19:44 +0000 (14:19 -0700)]

am 573235d9: am 142f4533: am 429687b9: (-s ours) Import revised translations. DO NOT MERGE

* commit '573235d9a73efdf3af066e47803a6c24382e6979':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 29 Mar 2011 21:15:16 +0000 (14:15 -0700)]

am 142f4533: am 429687b9: (-s ours) Import revised translations. DO NOT MERGE

* commit '142f453399a123a3f9c046f5cec626b7e7d6facd':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 29 Mar 2011 21:07:12 +0000 (14:07 -0700)]

am 429687b9: (-s ours) Import revised translations. DO NOT MERGE

* commit '429687b9ceace0d7fab9aa65c9d93e8f3eec93ba':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Jake Hamby [Tue, 29 Mar 2011 20:34:20 +0000 (13:34 -0700)]

am e9fdee0e: am 81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1

* commit 'e9fdee0ed0ca2f2e0e83cda161906ca3a0a673a6':
Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.

commit | commitdiff | tree

Eric Fischer [Tue, 29 Mar 2011 20:32:59 +0000 (13:32 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: Id19c294af4493e0d47193ab3477d5c0a1c068669

commit | commitdiff | tree

Jake Hamby [Tue, 29 Mar 2011 20:31:54 +0000 (13:31 -0700)]

am 81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1

* commit '81cb6be834f4604f6b58d8516f2b8e12620a3d16':
Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.

commit | commitdiff | tree

Jake Hamby [Tue, 29 Mar 2011 20:28:48 +0000 (13:28 -0700)]

Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1

commit | commitdiff | tree

Eric Fischer [Tue, 29 Mar 2011 19:24:35 +0000 (12:24 -0700)]

am 388fc081: am 3b4b91d4: Import revised translations. DO NOT MERGE

* commit '388fc081bcca23525fa5a7cea58b8d4ae794d69c':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 29 Mar 2011 19:19:35 +0000 (12:19 -0700)]

am 3b4b91d4: Import revised translations. DO NOT MERGE

* commit '3b4b91d43de5be5f920b7ed931c942817970e336':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 29 Mar 2011 19:00:36 +0000 (12:00 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: Ic677ab3652341f1ef35a068f7290e15145172f37

commit | commitdiff | tree

Eric Fischer [Tue, 29 Mar 2011 17:58:24 +0000 (10:58 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: Ic2e2fd3330cb069f55054e08aad153c1b342e0a4

commit | commitdiff | tree

Jake Hamby [Tue, 29 Mar 2011 03:25:23 +0000 (20:25 -0700)]

Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.

Fix NPE when entering Settings app in the SDK (and for devices without
Bluetooth). Also remove the "Bluetooth settings" item in addition to
the Bluetooth toggle item from Wireless settings when BT is missing.

Bug: 4149307
Change-Id: Iecc5960a193cf88664d3217b4d7bdbc2276dabc0

commit | commitdiff | tree

Park Sanghyun [Fri, 25 Mar 2011 07:23:59 +0000 (16:23 +0900)]

DO NOT MERGE Add support for additional System Update menu item

Change-Id: I21bf87b5d2805da672c0617a098258e0e2b78915

commit | commitdiff | tree

Amith Yamasani [Wed, 23 Mar 2011 22:53:22 +0000 (15:53 -0700)]

am 2ba97451: am f3b325f5: Debug feature for HDCP compliance testing.

* commit '2ba9745180b2bb3400d0e1376552902d1b27c89a':
Debug feature for HDCP compliance testing.

commit | commitdiff | tree

Amith Yamasani [Wed, 23 Mar 2011 22:47:40 +0000 (15:47 -0700)]

am f3b325f5: Debug feature for HDCP compliance testing.

* commit 'f3b325f54dadb482d73111ab17cf6a51784de11a':
Debug feature for HDCP compliance testing.

commit | commitdiff | tree

Amith Yamasani [Wed, 23 Mar 2011 19:49:20 +0000 (12:49 -0700)]

Debug feature for HDCP compliance testing.

Bug: 4149811

Add a setting in Application->Development to change HDCP checking.

Change-Id: I5561b097b3fd7dbfc4eaf1977b80a37fc29572aa

commit | commitdiff | tree

Irfan Sheriff [Wed, 23 Mar 2011 02:34:46 +0000 (19:34 -0700)]

am e2d30184: am 6864195a: Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1

* commit 'e2d301842807bc7f1ea13672a685e5f83824140f':
Fix ANR with bypass proxy regex

commit | commitdiff | tree

Irfan Sheriff [Wed, 23 Mar 2011 02:33:16 +0000 (19:33 -0700)]

am 6864195a: Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1

* commit '6864195aa0195831a0cfbe92cd37f76c09df43b8':
Fix ANR with bypass proxy regex

commit | commitdiff | tree

Irfan Sheriff [Wed, 23 Mar 2011 02:30:22 +0000 (19:30 -0700)]

Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1

commit | commitdiff | tree

Irfan Sheriff [Wed, 23 Mar 2011 00:19:05 +0000 (17:19 -0700)]

Fix ANR with bypass proxy regex

Bug: 4148297
Change-Id: I5519ed297acabb65e1992c65e4b4110380983bb1

commit | commitdiff | tree

Eric Fischer [Tue, 22 Mar 2011 21:04:17 +0000 (14:04 -0700)]

am 3b9fa42b: am 36f7f4a7: Import revised translations. DO NOT MERGE

* commit '3b9fa42b6bfab20022cb5760cf41a3000325bc0c':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 22 Mar 2011 21:01:54 +0000 (14:01 -0700)]

am 36f7f4a7: Import revised translations. DO NOT MERGE

* commit '36f7f4a773b19121850699ca5b617fe3a1c6bd16':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 22 Mar 2011 20:39:43 +0000 (13:39 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: I889f8414c773a57bd38d30c0b60a51216ef00b1b

commit | commitdiff | tree

Eric Fischer [Fri, 18 Mar 2011 23:58:12 +0000 (16:58 -0700)]

am 9567622d: (-s ours) am c4eeeb29: Import revised translations. DO NOT MERGE

* commit '9567622d32e322ce866969c38ba19dfb882752d5':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Fri, 18 Mar 2011 23:52:30 +0000 (16:52 -0700)]

am c4eeeb29: Import revised translations. DO NOT MERGE

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

commit | commitdiff | tree

Eric Fischer [Fri, 18 Mar 2011 22:17:01 +0000 (15:17 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: I512bfadfc427f0676bce9e79c20babe006324ca1

commit | commitdiff | tree

TK MUN [Thu, 17 Mar 2011 23:27:29 +0000 (16:27 -0700)]

am 8c2a02de: (-s ours) am e0e845fe: DO NOT MERGE Do not allow shortcut for "4G Settings"

* commit '8c2a02defc4139b2532861602d8e2816018f53b9':
DO NOT MERGE Do not allow shortcut for "4G Settings"

commit | commitdiff | tree

TK MUN [Thu, 17 Mar 2011 23:20:42 +0000 (16:20 -0700)]

am e0e845fe: DO NOT MERGE Do not allow shortcut for "4G Settings"

* commit 'e0e845fee6703a1a2ed75c4fe67cb0202dd076c0':
DO NOT MERGE Do not allow shortcut for "4G Settings"

commit | commitdiff | tree

Eric Fischer [Thu, 17 Mar 2011 20:34:44 +0000 (13:34 -0700)]

am 1a04c21b: am 7f050e2e: Import revised translations. DO NOT MERGE

* commit '1a04c21b5ae872a5be7f533caa80b6bb87e14b0c':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Thu, 17 Mar 2011 20:32:23 +0000 (13:32 -0700)]

am 7f050e2e: Import revised translations. DO NOT MERGE

* commit '7f050e2ef8e1593d8a89f9d3357015c5eb1b8764':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Thu, 17 Mar 2011 20:13:20 +0000 (13:13 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: I6302e63ef939e3b0c14f1223121934ee0a5f1e14

commit | commitdiff | tree

TK MUN [Wed, 16 Mar 2011 07:04:54 +0000 (16:04 +0900)]

DO NOT MERGE Do not allow shortcut for "4G Settings"

Settings shortcuts are only for the modules inside the settings
application. The pathclassloader is /system/app/Settings.apk for
all the settings shortcuts. Since 4G settings is outside of
Settings.apk, we cannot support a shortcut for this.

Change-Id: I1b5523618ef5e8eea8535793f3a983e6ba21d551

commit | commitdiff | tree

Eric Fischer [Thu, 17 Mar 2011 00:09:45 +0000 (17:09 -0700)]

am dd68cde8: am 24d61952: Import revised translations. DO NOT MERGE

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