Commit Graph

3713 Commits

Author SHA1 Message Date
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
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
Eric Fischer
8214c76e27 Import revised translations. DO NOT MERGE
Change-Id: I5096f0341965e767187b8444f93804cad934ada9
2011-04-06 13:51:27 -07:00
Eric Fischer
b7185a549c am dfb78827: (-s ours) am 955ab98f: Import revised translations. DO NOT MERGE
* commit 'dfb78827767e14c8db205d8a7200f3f4025a0831':
  Import revised translations.  DO NOT MERGE
2011-04-04 17:42:55 -07:00
Eric Fischer
84c9005375 am fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread
* commit 'fcb089c94280dd3b5a1ed8f90610d258a43abb78':
  Reimport Settings translations.  DO NOT MERGE
2011-04-04 14:43:04 -07:00
Simon Wilson
2ca7add59f 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
2011-04-04 14:43:02 -07:00
Eric Fischer
6735ae141f am b4bd78f5: Revert "Import revised translations. DO NOT MERGE"
* commit 'b4bd78f52305aa1b47fe9ac09d99e00116f201a6':
  Revert "Import revised translations.  DO NOT MERGE"
2011-04-04 14:42:59 -07:00
Eric Fischer
dfb7882776 am 955ab98f: Import revised translations. DO NOT MERGE
* commit '955ab98f030cd198d838bdff8768ff87a17be9a8':
  Import revised translations.  DO NOT MERGE
2011-04-04 12:21:25 -07:00
Eric Fischer
fcb089c942 Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread 2011-04-01 16:52:28 -07:00
Simon Wilson
ca572fb64b Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread 2011-04-01 16:47:22 -07:00
Eric Fischer
3ac5c8cfd2 Reimport Settings translations. DO NOT MERGE
Change-Id: I90c528fe4f87a3f53875eae9f98b2a6aaa4d1b6a
2011-04-01 16:42:38 -07:00
Eric Fischer
b4bd78f523 Revert "Import revised translations. DO NOT MERGE"
This reverts commit 955ab98f03.

Bug 4204088 requires that these strings not be translated.

Change-Id: I98044cc669a9ee70a8892123a05c0fc33599d404
2011-04-01 16:13:11 -07:00
Simon Wilson
5014f281d7 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
2011-04-01 13:59:32 -07:00
Park Sanghyun
ebfc5e3ed6 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
2011-03-30 15:29:48 -07:00
Kenny Root
42f178d10b resolved conflicts for merge of 70a1ff03 to honeycomb-plus-aosp
Change-Id: I1df4d790b070acbf89b9ee16bd750918486fce58
2011-03-30 09:36:40 -07:00
Park Sanghyun
2b2959b321 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
2011-03-30 09:31:15 -07:00
Kenny Root
70a1ff0357 am 7fceefa7: Merge "Settings: Improved UX when viewing open source license info."
* commit '7fceefa79229ece2efab0446841543a8f8f20a1d':
  Settings: Improved UX when viewing open source license info.
2011-03-29 15:43:38 -07:00
Kenny Root
7fceefa792 Merge "Settings: Improved UX when viewing open source license info." 2011-03-29 15:03:25 -07:00
Henrik Carlsson
2cb19ab9e2 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
2011-03-29 15:02:44 -07:00
Eric Fischer
f701fd1a96 am 573235d9: am 142f4533: am 429687b9: (-s ours) Import revised translations. DO NOT MERGE
* commit '573235d9a73efdf3af066e47803a6c24382e6979':
  Import revised translations.  DO NOT MERGE
2011-03-29 14:19:44 -07:00
Eric Fischer
573235d9a7 am 142f4533: am 429687b9: (-s ours) Import revised translations. DO NOT MERGE
* commit '142f453399a123a3f9c046f5cec626b7e7d6facd':
  Import revised translations.  DO NOT MERGE
2011-03-29 14:15:16 -07:00
Eric Fischer
142f453399 am 429687b9: (-s ours) Import revised translations. DO NOT MERGE
* commit '429687b9ceace0d7fab9aa65c9d93e8f3eec93ba':
  Import revised translations.  DO NOT MERGE
2011-03-29 14:07:12 -07:00
Jake Hamby
823a6ee9ec 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.
2011-03-29 13:34:20 -07:00