Commit Graph

3009 Commits

Author SHA1 Message Date
Eric Fischer
789c772aab am 17fcd476: Import revised translations. DO NOT MERGE
Merge commit '17fcd476643e27943f548415e49e1be7d8e74ac1' into eclair-plus-aosp

* commit '17fcd476643e27943f548415e49e1be7d8e74ac1':
  Import revised translations.  DO NOT MERGE
2009-10-28 23:35:05 -07:00
Eric Fischer
17fcd47664 Import revised translations. DO NOT MERGE 2009-10-28 21:19:37 -07:00
Amith Yamasani
4d31288fe3 Fix for 1974140. Delete entry if not valid on hitting home.
If user doesn't enter an APN or name, then delete the entry on hitting home.

And if user has enough information but doesn't enter a name, then set the
name to "Untitled" to avoid blank APNs in the list.
2009-10-28 16:59:17 -07:00
Eric Fischer
4f75cca2cd am a4ec838d: am e0711522: Use consistent punctuation for the Chinese locale names.
Merge commit 'a4ec838d12c94b7103a4b3882ecda4ba28f6567b' into eclair-mr2-plus-aosp

* commit 'a4ec838d12c94b7103a4b3882ecda4ba28f6567b':
  Use consistent punctuation for the Chinese locale names.
2009-10-28 11:56:00 -07:00
Eric Fischer
a4ec838d12 am e0711522: Use consistent punctuation for the Chinese locale names.
Merge commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0' into eclair-mr2

* commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0':
  Use consistent punctuation for the Chinese locale names.
2009-10-28 11:43:04 -07:00
Jaikumar Ganesh
afed5fca00 am 760b45c2: am 195bc434: Add Authentication Type field to the APN settings.
Merge commit '760b45c2a688876b94383561163244de8086f1c6' into eclair-mr2-plus-aosp

* commit '760b45c2a688876b94383561163244de8086f1c6':
  Add Authentication Type field to the APN settings.
2009-10-28 10:42:30 -07:00
Jaikumar Ganesh
760b45c2a6 am 195bc434: Add Authentication Type field to the APN settings.
Merge commit '195bc43460967e57e4c1131ba156083a93e0e4e8' into eclair-mr2

* commit '195bc43460967e57e4c1131ba156083a93e0e4e8':
  Add Authentication Type field to the APN settings.
2009-10-28 10:30:20 -07:00
Mike Cleron
5b1f4b493e am d02acfb9: Merge change I2abbb876 into eclair
Merge commit 'd02acfb908562780eec830a85e121f9925108c36' into eclair-plus-aosp

* commit 'd02acfb908562780eec830a85e121f9925108c36':
  New widgets
2009-10-28 00:22:03 -07:00
Android (Google) Code Review
d02acfb908 Merge change I2abbb876 into eclair
* changes:
  New widgets
2009-10-28 03:16:41 -04:00
Mike Cleron
c151e45d8c New widgets 2009-10-27 14:05:27 -07:00
Eric Fischer
034b695e5e am e0711522: Use consistent punctuation for the Chinese locale names.
Merge commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0' into eclair-plus-aosp

* commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0':
  Use consistent punctuation for the Chinese locale names.
2009-10-27 12:17:40 -07:00
Eric Fischer
e0711522bc Use consistent punctuation for the Chinese locale names.
Bug 2216349
2009-10-27 10:30:54 -07:00
Jaikumar Ganesh
6632979264 am 195bc434: Add Authentication Type field to the APN settings.
Merge commit '195bc43460967e57e4c1131ba156083a93e0e4e8' into eclair-plus-aosp

* commit '195bc43460967e57e4c1131ba156083a93e0e4e8':
  Add Authentication Type field to the APN settings.
2009-10-26 15:26:52 -07:00
Jaikumar Ganesh
195bc43460 Add Authentication Type field to the APN settings.
Bug: 1817100
2009-10-26 15:18:23 -07:00
Amith Yamasani
43745f0ae5 am 32ac2100: am f0fed9dc: am b3735744: Merge change I40dd2cfc into eclair
Merge commit '32ac210016615fa6f0ee43ad5ffbc6d68ce75fab'

* commit '32ac210016615fa6f0ee43ad5ffbc6d68ce75fab':
  Fix for 2202408: Replace Never Timeout with 30 minutes
2009-10-26 14:33:44 -07:00
Amith Yamasani
32ac210016 am f0fed9dc: am b3735744: Merge change I40dd2cfc into eclair
Merge commit 'f0fed9dc8784f0635cd27c498beecc45e1f800be' into eclair-mr2-plus-aosp

* commit 'f0fed9dc8784f0635cd27c498beecc45e1f800be':
  Fix for 2202408: Replace Never Timeout with 30 minutes
2009-10-26 14:28:13 -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
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
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
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
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
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
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
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
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
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
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
Hung-ying Tyan
ae59063b7a 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 ...
2009-10-13 03:00:12 -07:00
Hung-ying Tyan
2b9d9ef2aa Add saving/restoring state in CredentialInstaller and ...
make it transparent.
2009-10-13 17:40:25 +08:00
Chia-chi Yeh
86b3b534b9 am c49ca127: Merge change I02f58e89 into eclair
Merge commit 'c49ca127aa993dc2ae402680ce392da06f0e1d4c'

* commit 'c49ca127aa993dc2ae402680ce392da06f0e1d4c':
  SecuritySettings: clean up.
2009-10-12 11:17:03 -07:00
Eric Fischer
4f962ace77 am 06a111be: Merge change Ia3151ad3 into eclair
Merge commit '06a111be6d3ccf44de545a084302c2085cbb07de' into eclair-plus-aosp

* commit '06a111be6d3ccf44de545a084302c2085cbb07de':
  Import revised translations.   DO NOT MERGE
2009-10-07 12:08:59 -07:00
Eric Fischer
098ef4cb96 am 6de9fb39: Import revised translations. DO NOT MERGE
Merge commit '6de9fb390b9eab0dbaf9709db5149eefc18724da' into eclair-plus-aosp

* commit '6de9fb390b9eab0dbaf9709db5149eefc18724da':
  Import revised translations.  DO NOT MERGE
2009-10-07 11:36:10 -07:00
Chia-chi Yeh
ecd42371f4 am c49ca127: Merge change I02f58e89 into eclair
Merge commit 'c49ca127aa993dc2ae402680ce392da06f0e1d4c' into eclair-plus-aosp

* commit 'c49ca127aa993dc2ae402680ce392da06f0e1d4c':
  SecuritySettings: clean up.
2009-10-07 11:31:08 -07:00
Eric Fischer
a3151ad37c Import revised translations. DO NOT MERGE
Approver: jerryw
2009-10-06 16:54:08 -07:00
Dan Vacura
a89d3d3591 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp 2009-10-06 03:05:02 -07:00
Eric Fischer
6de9fb390b Import revised translations. DO NOT MERGE
Approver: jerryw
2009-10-01 17:02:17 -07:00
Amith Yamasani
5161a7b13d am 7c8a08d5: am ee52bed5: Merge change I39527366 into eclair
Merge commit '7c8a08d51389e1c2c0411a1a4a12646880199e01'

* commit '7c8a08d51389e1c2c0411a1a4a12646880199e01':
  Use a custom system icon for native processes.
2009-10-01 13:39:27 -07:00
Mike Cleron
dacd552d03 am d6372e99: am c5648906: Merge change I00ab9f0b into eclair
Merge commit 'd6372e995c5a4ea2f60ea416aab1c4c3cc6debd0'

* commit 'd6372e995c5a4ea2f60ea416aab1c4c3cc6debd0':
  Fix widgets
2009-10-01 13:39:22 -07:00
Jaikumar Ganesh
dbbff54890 am 8c5ff4b7: am 1eb1df08: Add strings for authentication type.
Merge commit '8c5ff4b76a5bd3bc7d578ca2cdf89c2e1c423973'

* commit '8c5ff4b76a5bd3bc7d578ca2cdf89c2e1c423973':
  Add strings for authentication type.
2009-10-01 12:17:53 -07:00
Debajit Ghosh
00e9be647b am a6ddefe6: am 99716fb4: updating sync settings icon
Merge commit 'a6ddefe68f465a78cf8dcacfbbf0b289816d1d19'

* commit 'a6ddefe68f465a78cf8dcacfbbf0b289816d1d19':
  updating sync settings icon
2009-10-01 12:13:27 -07:00
Mike Cleron
28c6e2e962 am 9c06c4b2: am 08df1488: Newer icons
Merge commit '9c06c4b2df16042ca09e4f51c4a86bdb595258de'

* commit '9c06c4b2df16042ca09e4f51c4a86bdb595258de':
  Newer icons
2009-10-01 11:54:10 -07:00
Dianne Hackborn
986a88ab79 am 78651523: am cabb147c: Improve running services info.
Merge commit '78651523727ee3aadec008faa7ae5a945c51ab69'

* commit '78651523727ee3aadec008faa7ae5a945c51ab69':
  Improve running services info.
2009-10-01 11:44:45 -07:00
Mike Cleron
3442d59157 am 31794fa9: am 69c51fea: New icons
Merge commit '31794fa97992a7a17a108ac99247ae2c904b8509'

* commit '31794fa97992a7a17a108ac99247ae2c904b8509':
  New icons
2009-10-01 11:12:20 -07:00