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
Chia-chi Yeh
02f58e898d
SecuritySettings: clean up.
2009-10-02 00:39:14 +08:00
Amith Yamasani
7c8a08d513
am ee52bed5
: Merge change I39527366 into eclair
...
Merge commit 'ee52bed514cbee1fade95a9f862e238c4975cd8b' into eclair-plus-aosp
* commit 'ee52bed514cbee1fade95a9f862e238c4975cd8b':
Use a custom system icon for native processes.
2009-09-30 21:15:52 -07:00
Mike Cleron
d6372e995c
am c5648906
: Merge change I00ab9f0b into eclair
...
Merge commit 'c564890637bf91e92ede27789e4d98863c46e681' into eclair-plus-aosp
* commit 'c564890637bf91e92ede27789e4d98863c46e681':
Fix widgets
2009-09-30 21:15:36 -07:00
Android (Google) Code Review
ee52bed514
Merge change I39527366 into eclair
...
* changes:
Use a custom system icon for native processes.
2009-09-30 21:43:48 -04:00
Amith Yamasani
395273662c
Use a custom system icon for native processes.
...
New icons for system components in Battery Use screen.
2009-09-30 18:42:29 -07:00
Android (Google) Code Review
c564890637
Merge change I00ab9f0b into eclair
...
* changes:
Fix widgets
2009-09-30 21:34:36 -04:00
Mike Cleron
00ab9f0b51
Fix widgets
2009-09-30 18:29:25 -07:00
Jaikumar Ganesh
8c5ff4b76a
am 1eb1df08
: Add strings for authentication type.
...
Merge commit '1eb1df082d59bdef8b3e0cda6d1af635449833ab' into eclair-plus-aosp
* commit '1eb1df082d59bdef8b3e0cda6d1af635449833ab':
Add strings for authentication type.
2009-09-30 14:15:29 -07:00
Jaikumar Ganesh
1eb1df082d
Add strings for authentication type.
...
A new field is going to be added to the APN editor.
Authentication type: 4 possible values - None, PAP, CHAP, PAP or CHAP
These strings are too technical for the end user, however these
fields will be pre-populated and the user would not have to change them.
Change-Id: I7df326722fc4aebfe68d2726e2695eda8ea798a9
2009-09-30 13:40:11 -07:00
Debajit Ghosh
a6ddefe68f
am 99716fb4
: updating sync settings icon
...
Merge commit '99716fb4b4b0b3ca411dd8e699f5bc34a9c8b1ba' into eclair-plus-aosp
* commit '99716fb4b4b0b3ca411dd8e699f5bc34a9c8b1ba':
updating sync settings icon
2009-09-30 11:43:48 -07:00
Debajit Ghosh
99716fb4b4
updating sync settings icon
2009-09-30 11:01:26 -07:00
Mike Cleron
9c06c4b2df
am 08df1488
: Newer icons
...
Merge commit '08df148848eb72d16564264f02b5424c8203c746' into eclair-plus-aosp
* commit '08df148848eb72d16564264f02b5424c8203c746':
Newer icons
2009-09-30 01:36:04 -07:00
Mike Cleron
08df148848
Newer icons
2009-09-30 01:18:17 -07:00
Dianne Hackborn
7865152372
am cabb147c
: Improve running services info.
...
Merge commit 'cabb147ce57bdcbb6baa08686415ce03f97028d7' into eclair-plus-aosp
* commit 'cabb147ce57bdcbb6baa08686415ce03f97028d7':
Improve running services info.
2009-09-29 18:15:38 -07:00
Dianne Hackborn
cabb147ce5
Improve running services info.
...
Change-Id: I797c76f322b9be7f25a1b695b0332b45bc7e9d4c
2009-09-29 18:04:36 -07:00
Michael Chan
95f6af7b78
am 26917f1d
: am e1089ad3
: b/2142065 Added Bluetooth API to allow developer to request the user\'s permission to enable discovery mode.
...
Merge commit '26917f1ddd052534c4a6e1577b79570d9bbbdd10'
* commit '26917f1ddd052534c4a6e1577b79570d9bbbdd10':
b/2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.
2009-09-29 11:13:37 -07:00
Roy West
441a157a3a
am dcd813ea
: am c63742c8
: Merge change I87d7f224 into eclair
...
Merge commit 'dcd813eac8678afaedc35f0271d79f1617cd810d'
* commit 'dcd813eac8678afaedc35f0271d79f1617cd810d':
Correct "on-screen" to "onscreen"; fix tts screen title
2009-09-29 11:08:05 -07:00
Suchi Amalapurapu
f6cfb537ad
am b20be6e2
: am 5a201b78
: Merge change 27473 into eclair
...
Merge commit 'b20be6e24a7b546e413a00c51f8079fa7233651b'
* commit 'b20be6e24a7b546e413a00c51f8079fa7233651b':
Rename empty view so that the standard list view implementation
2009-09-29 11:07:12 -07:00
Mike Cleron
31794fa979
am 69c51fea
: New icons
...
Merge commit '69c51fea86c1c29b801c2c369ba1a0ce68dfbaf6' into eclair-plus-aosp
* commit '69c51fea86c1c29b801c2c369ba1a0ce68dfbaf6':
New icons
2009-09-29 00:51:39 -07:00
Mike Cleron
69c51fea86
New icons
2009-09-29 00:30:34 -07:00
Michael Chan
26917f1ddd
am e1089ad3
: b/2142065 Added Bluetooth API to allow developer to request the user\'s permission to enable discovery mode.
...
Merge commit 'e1089ad33896f4fe5b75e773813367d700773b6f' into eclair-plus-aosp
* commit 'e1089ad33896f4fe5b75e773813367d700773b6f':
b/2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.
2009-09-28 17:39:14 -07:00
Michael Chan
e1089ad338
b/2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.
...
Change-Id: I6da1598661ad05b4cfd2b7cc81e05d3053df5777
2009-09-28 17:16:23 -07:00
Roy West
dcd813eac8
am c63742c8
: Merge change I87d7f224 into eclair
...
Merge commit 'c63742c8fa533b6fc879f12ccecc2a51c1aca23b' into eclair-plus-aosp
* commit 'c63742c8fa533b6fc879f12ccecc2a51c1aca23b':
Correct "on-screen" to "onscreen"; fix tts screen title
2009-09-28 13:44:51 -07:00
Android (Google) Code Review
c63742c8fa
Merge change I87d7f224 into eclair
...
* changes:
Correct "on-screen" to "onscreen"; fix tts screen title
2009-09-28 16:37:00 -04:00
Suchi Amalapurapu
b20be6e24a
am 5a201b78
: Merge change 27473 into eclair
...
Merge commit '5a201b787233a7e2b9b4bf6f84ab14b2cd3eec74' into eclair-plus-aosp
* commit '5a201b787233a7e2b9b4bf6f84ab14b2cd3eec74':
Rename empty view so that the standard list view implementation
2009-09-28 13:19:01 -07:00