Jim Miller
9e8b6ba54e
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
2011-05-20 16:54:35 -07:00
Jim Miller
318f7850f6
am 360f0603
: Fix 4462497: Use new sw600dp resource target for LockScreen settings
...
* commit '360f060334d3be3dbf13f3af770eb4fcccfddfb2':
Fix 4462497: Use new sw600dp resource target for LockScreen settings
2011-05-20 16:51:46 -07:00
Jim Miller
360f060334
Fix 4462497: Use new sw600dp resource target for LockScreen settings
...
Change-Id: I3156aedff564dbf426fa0421a66c7f491af6a354
2011-05-20 15:50:42 -07:00
Jim Miller
6ba50de7ac
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.
2011-05-20 13:26:49 -07:00
Jim Miller
d36628a74e
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.
2011-05-20 13:16:38 -07:00
Irfan Sheriff
ba46f269ab
am a6f178a8
: Merge "Fix enabling of submit button" into honeycomb-LTE
...
* commit 'a6f178a817ec36d5cf6d6a3d9c19c73278f0c3ca':
Fix enabling of submit button
2011-05-19 17:15:43 -07:00
Jim Miller
e8ebec86e6
Fix 4462497: Fixes crash in settings due to using wrong layout on 7" devices.
...
Change-Id: I674112df2bdcec0bd94c85b1a777c336c037edc5
2011-05-19 17:09:10 -07:00
Irfan Sheriff
a6f178a817
Merge "Fix enabling of submit button" into honeycomb-LTE
2011-05-19 16:47:04 -07:00
Irfan Sheriff
990c3ad530
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
2011-05-19 16:06:31 -07:00
Eric Fischer
be94e211d1
am d6e23b9a
: am ce116503
: Import revised translations. DO NOT MERGE
...
* commit 'd6e23b9a5ca2f58a7082f7cca9f5eca982403531':
Import revised translations. DO NOT MERGE
2011-05-17 13:33:53 -07:00
Eric Fischer
d6e23b9a5c
am ce116503
: Import revised translations. DO NOT MERGE
...
* commit 'ce116503a7ca08302711fc77f6b21f2fbbe3e76e':
Import revised translations. DO NOT MERGE
2011-05-17 13:29:57 -07:00
Eric Fischer
ce116503a7
Import revised translations. DO NOT MERGE
...
Change-Id: Iafedceb5fee433d9a55f8f76e941778c2ace85e7
2011-05-17 13:21:44 -07:00
Eric Fischer
e7c82caf2c
am d779e5df
: am 0bbe27da
: am a9aa8aa3
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit 'd779e5dfbfc23a005b440f5931316d0742fdf3cc':
Import revised translations. DO NOT MERGE
2011-05-10 15:32:16 -07:00
Eric Fischer
d779e5dfbf
am 0bbe27da
: am a9aa8aa3
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '0bbe27dabe8d667133a599dfffa8d7c6715ae7e6':
Import revised translations. DO NOT MERGE
2011-05-10 15:03:23 -07:00
Eric Fischer
0bbe27dabe
am a9aa8aa3
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit 'a9aa8aa3341b164a54213a3b27fa0a1dd9ef9e70':
Import revised translations. DO NOT MERGE
2011-05-10 15:00:51 -07:00
Eric Fischer
c258d9979f
am 450721fc
: am 9766cccb
: Import revised translations. DO NOT MERGE
...
* commit '450721fca317a7c111555ad6650f62b1081eb740':
Import revised translations. DO NOT MERGE
2011-05-10 12:23:31 -07:00
Eric Fischer
450721fca3
am 9766cccb
: Import revised translations. DO NOT MERGE
...
* commit '9766cccb3969db4564ad4548582685ee7b18e2e6':
Import revised translations. DO NOT MERGE
2011-05-10 12:19:04 -07:00
Eric Fischer
9766cccb39
Import revised translations. DO NOT MERGE
...
Change-Id: Ieed2bec37375bf9dc2504922350c2d8ac3883f97
2011-05-09 17:04:32 -07:00
John Wang
7102353165
am 22e52793
: Update the MEID setting label.
...
* commit '22e5279382db1cbb05dd093a93ab7ddd9efbe2fe':
Update the MEID setting label.
2011-05-09 15:08:24 -07:00
John Wang
22e5279382
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
2011-05-09 11:36:19 -07:00
Robert Greenwalt
d65d1adb56
am 3c3490c8
: Use new RouteInfo class.
...
* commit '3c3490c819a1a6ce72468c1d867429ac0f86def8':
Use new RouteInfo class.
2011-05-02 13:29:26 -07:00
Robert Greenwalt
3c3490c819
Use new RouteInfo class.
...
Change-Id: I144ebb87e6d1809f59ebd32e64e186d836a365f8
2011-04-29 17:13:44 -07:00
Eric Fischer
a9aa8aa334
Import revised translations. DO NOT MERGE
...
Change-Id: Ia76f041ab40e27fb76f8f52f2e6e3b036421f910
2011-04-29 14:01:54 -07:00
Eric Fischer
a9b3463ea4
am 643e48b7
: (-s ours) am 7c284c2c
: Import revised translations. DO NOT MERGE
...
* commit '643e48b7fd1f1be62ac4bedc1051c00be129006b':
Import revised translations. DO NOT MERGE
2011-04-28 10:26:29 -07:00
Eric Fischer
643e48b7fd
am 7c284c2c
: Import revised translations. DO NOT MERGE
...
* commit '7c284c2c62ce565dacfae641108a2a5033e78721':
Import revised translations. DO NOT MERGE
2011-04-27 15:31:22 -07:00
Eric Fischer
7c284c2c62
Import revised translations. DO NOT MERGE
...
Change-Id: I56239c7b2a936acc9b93b8592a2a04e42a55458b
2011-04-27 13:53:57 -07:00
Conley Owens
fc5a1fe052
Ignoring empty list test in favor of commented out code.
...
Change-Id: I478980eb6d56be164bbe22a73ff945ae9c57a57a
2011-04-27 10:33:00 -07:00
Conley Owens
47cd8a47f7
am bc20d67f
: Merge "Avoid crash when switching to 2G/3G network."
...
* commit 'bc20d67fedd453eec9dcb127cf9df909a192baf5':
Avoid crash when switching to 2G/3G network.
2011-04-27 09:55:23 -07:00
Conley Owens
bc20d67fed
Merge "Avoid crash when switching to 2G/3G network."
2011-04-27 09:51:22 -07:00
Kenneth Westin
dd9131dcdf
Avoid crash when switching to 2G/3G network.
...
Adding test that active APN array is not empty.
Change-Id: I16246aa45c991a9396ef03d9bb083d97c3ca2e1a
2011-04-26 14:08:45 +02:00
Wink Saville
ac706b987b
am 2c3ec092
: Remove getCurrentDataConnectionList.
...
* commit '2c3ec09261bf1503e75328175b5286af5676845e':
Remove getCurrentDataConnectionList.
2011-04-20 11:32:53 -07:00
Wink Saville
2c3ec09261
Remove getCurrentDataConnectionList.
...
I'll add another mechanism which will probably use an
asynchronous interface with the DataConnectionTracker.
Change-Id: I71f80bb9fe0496c42ff9b1ddbf4e36a68d3f1592
2011-04-20 10:24:36 -07:00
Eric Fischer
0d3a75923e
am 20a44118
: am 76aa8fe0
: am 4ba98d53
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '20a44118ddce65bcb1a86a38ab17d82083528930':
Import revised translations. DO NOT MERGE
2011-04-14 14:27:34 -07:00
Eric Fischer
20a44118dd
am 76aa8fe0
: am 4ba98d53
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '76aa8fe0663004a7b481a830cca87492bd9c7987':
Import revised translations. DO NOT MERGE
2011-04-14 14:24:48 -07:00
Eric Fischer
76aa8fe066
am 4ba98d53
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '4ba98d5381d89f5afd83f9ce4a5f1e666e7579e7':
Import revised translations. DO NOT MERGE
2011-04-14 14:20:01 -07:00
Eric Fischer
4ba98d5381
Import revised translations. DO NOT MERGE
...
Change-Id: I64e7baff852f629d0281352be24fc54eadb48367
2011-04-14 14:04:03 -07:00
Glenn Kasten
386185a375
am 315b452c
: am 4f4ddaa8
: Bug 4167061 remove debug code
...
* commit '315b452c322f2eeeeb0ec946e31656ca93b8c0a7':
Bug 4167061 remove debug code
2011-04-13 11:51:59 -07:00
Glenn Kasten
315b452c32
am 4f4ddaa8
: Bug 4167061 remove debug code
...
* commit '4f4ddaa823bfa7bd2fdff97338ff1839739925dd':
Bug 4167061 remove debug code
2011-04-13 11:47:46 -07:00
Glenn Kasten
4f4ddaa823
Bug 4167061 remove debug code
...
Change-Id: I1a05b820030d503b4ae1a82789ad4607e46b43c0
2011-04-13 11:19:58 -07:00
Simon Wilson
a5babbb092
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
2011-04-11 17:33:20 -07:00
Eric Fischer
2439b7c00d
am 84c90053
: (-s ours) am fcb089c9
: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread
...
* commit '84c90053751ae1bcb07a845f5ac9747a808198b1':
Reimport Settings translations. DO NOT MERGE
2011-04-11 14:24:30 -07:00
Simon Wilson
719e1e4317
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
2011-04-11 14:24:28 -07:00
Eric Fischer
1985e381cb
am 6735ae14
: (-s ours) am b4bd78f5
: Revert "Import revised translations. DO NOT MERGE"
...
* commit '6735ae141fee012409a2eaa0310538f3b0173263':
Revert "Import revised translations. DO NOT MERGE"
2011-04-11 14:24:25 -07:00
Simon Wilson
f927cccd79
am 37063d6a
: DO NOT MERGE Clarify additional system update string length/usage
...
* commit '37063d6adf9b472a8bb4bd58493517e04aafba95':
DO NOT MERGE Clarify additional system update string length/usage
2011-04-11 14:12:43 -07:00
Glenn Kasten
fc52971f7e
am b72f1b0f
: am 858fd9a0
: HDCP debugging in setting app part 2 of 2
...
* commit 'b72f1b0f45401a3fb8abe8e5e40eb5eab12e2710':
HDCP debugging in setting app part 2 of 2
2011-04-11 12:46:36 -07:00
Glenn Kasten
b72f1b0f45
am 858fd9a0
: HDCP debugging in setting app part 2 of 2
...
* commit '858fd9a0302c6d34781133137a048a9bf668632a':
HDCP debugging in setting app part 2 of 2
2011-04-11 12:43:22 -07:00
Simon Wilson
37063d6adf
DO NOT MERGE Clarify additional system update string length/usage
...
Change-Id: I627c3d50de1af23a620fe6ca3abac03ad3aa7d49
2011-04-11 12:38:54 -07:00
Glenn Kasten
858fd9a030
HDCP debugging in setting app part 2 of 2
...
Change-Id: I931c50938526adce521a7bf02301aba75abaacaf
2011-04-11 11:11:56 -07:00
Eric Fischer
94cdd67dcf
am 84edd9d5
: am 8214c76e
: Import revised translations. DO NOT MERGE
...
* commit '84edd9d5281cb8e03ea31631aa232b8458136f32':
Import revised translations. DO NOT MERGE
2011-04-06 14:19:10 -07:00
Eric Fischer
84edd9d528
am 8214c76e
: Import revised translations. DO NOT MERGE
...
* commit '8214c76e27de37a663cf8ce7a30091bf23c9be02':
Import revised translations. DO NOT MERGE
2011-04-06 14:16:10 -07:00