Conley Owens
779fa1515d
am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996
...
* commit '4a4d96e7ee682167861434cba05531f04642bf97':
Remove errant tag terminator
Normalize output of XMLtree content
2011-04-27 13:48:45 -07:00
Eric Fischer
68cb0ffad0
am 71a556f2: Import revised translations. DO NOT MERGE
...
* commit '71a556f24e2b8d489bf81b22fab6fe5e99a9eae0':
Import revised translations. DO NOT MERGE
2011-04-12 13:02:15 -07:00
Eric Fischer
71a556f24e
Import revised translations. DO NOT MERGE
...
Change-Id: Idd866750d0c53ae0665ef2dd6b64230182d185ae
2011-04-12 12:08:59 -07:00
Shachar Shemesh
0cd48ae3de
Remove errant tag terminator
...
Element android.widget.QuickContactBadge had two closing markers.
Change-Id: I0ab47e2fc999b4cf09fa10a7f5df58090816e315
2011-04-11 13:48:35 +03:00
Eric Fischer
d20023ae44
am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '8b312c6ca1c3f6dc4bec0c7d45bc9509afef4984':
Import revised translations. DO NOT MERGE
2011-04-04 12:20:38 -07:00
Jason parks
1d73362597
am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread
...
* commit 'cca2f2f987ab772a4bae3176df7259f59d6502ce':
Send out a broadcast that the system is being factory reset.
2011-04-04 12:20:33 -07:00
Eric Fischer
8b312c6ca1
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-03-30 10:41:05 -07:00
Jeff Hamilton
b98967942e
am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
...
* commit '96cf34d362a1666683e813af915e4f6e0d1b38a0':
Make STOP_APP_SWITCHES signatureOrSystem.
2011-03-30 09:30:40 -07:00
Jason parks
cca2f2f987
Merge "Send out a broadcast that the system is being factory reset." into gingerbread
2011-03-30 08:17:53 -07:00
Eric Fischer
5e110ec141
Import revised translations. DO NOT MERGE
...
Change-Id: I2d4afddb1ff99b9861647d479ef5ce2de49b684d
2011-03-29 10:54:11 -07:00
Jeff Hamilton
10de0b31df
Make STOP_APP_SWITCHES signatureOrSystem.
...
The NFC service relies on this permission
for it's dispatching mechanism and it is
no longer signed with the platform cert.
Bug: 4173610
Change-Id: I598ad2889c4af307f04433093923255fe7daedbb
2011-03-25 16:17:53 -05:00
Simon Wilson
03aa986e6b
am 1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread
...
* commit '1ba4897e89fc30042a086b26755dfdb80af258dd':
DO NOT MERGE Change WiMAX indicator display
2011-03-21 18:02:57 -07:00
TK MUN
081148dd32
DO NOT MERGE Change WiMAX indicator display
...
Change WiMAX indicator display from data to signal indication
and add a new icon set.
Change-Id: I610f186e07f3d7af9e64bcbdd750371164ac51f5
2011-03-21 16:55:00 -07:00
Eric Fischer
9ac8260608
am c0604255: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'c0604255a71c0b7114c3f011519160d4812a8100':
Import revised translations. DO NOT MERGE
2011-03-18 16:06:41 -07:00
Eric Fischer
3e3f521aed
Import revised translations. DO NOT MERGE
...
Change-Id: I48a01203c2db75bc6a1c6dc251264780d845443d
2011-03-18 15:10:32 -07:00
Jason parks
4ca74dc4c2
Send out a broadcast that the system is being
...
factory reset.
Change-Id: I339b7ce58cb3f48316103be49b582d4f7e9b63bf
2011-03-16 09:29:47 -05:00
Simon Wilson
81e1ed7eb5
am ee3f6ef2: Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread
...
* commit 'ee3f6ef2fc7bcfae9d8af8430760388f653a10c8':
DO NOT MERGE Support WiMAX Settings & ticker message
2011-03-14 13:34:18 -07:00
TK MUN
9999ad20df
DO NOT MERGE Support WiMAX Settings & ticker message
...
Change to save UI setting value
Add new Icons for ticker message
Change-Id: I3294f40c9853311f74877e197675f48bf271d468
2011-03-14 11:39:01 -07:00
Nick Pelly
38d0d5628d
am 367f41f8: Implement new NFC-EE API\'s as shared library (frameworks/base).
...
* commit '367f41f8f61126c2ab34a34cc676756a9fc23ac2':
Implement new NFC-EE API's as shared library (frameworks/base).
2011-03-10 16:32:28 -08:00
Nick Pelly
367f41f8f6
Implement new NFC-EE API's as shared library (frameworks/base).
...
Change-Id: I45c4eaf59ec78167fc236fdd59676465a5e1bcb7
2011-03-10 16:03:46 -08:00
TK MUN
c01fd043a9
am 4bdab175: DO NOT MERGE WiMAX support
...
* commit '4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7':
DO NOT MERGE WiMAX support
2011-03-09 22:54:44 -08:00
TK MUN
4bdab1751f
DO NOT MERGE WiMAX support
...
- In Connectivity service, start WiMAX service
- 4G icon display in StatusBarPolicy
- Add DHCP renew
- Add radio for WiMAX
Change-Id: Iffff012b270d80e84ec8fbd4486921a8adb847dd
Signed-off-by: TK MUN <tk.mun@samsung.com>
2011-03-09 22:37:08 -08:00
Soojung Shin
fa680a18f6
am ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding.
...
* commit 'ff5a09904fb05f2776f1bbf1dd3915f38031190c':
Added to check for supporting mms content-disposition, utf8 decoding.
2011-03-04 17:16:49 -08:00
Soojung Shin
ff5a09904f
Added to check for supporting mms content-disposition, utf8 decoding.
...
Change-Id: Ieae1bb2ac36675f569fb21285ca6ef289c367bf7
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
2011-03-04 14:32:31 -08:00
Mike Lockwood
7866be2b76
am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread
...
* commit '40bbf9295d5245d3917629ce15f7b37670aef1ac':
DO NOT MERGE: Backport USB accessory support to gingerbread
2011-03-02 15:16:32 -08:00
Mike Lockwood
40bbf9295d
DO NOT MERGE: Backport USB accessory support to gingerbread
...
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-01 23:09:12 -08:00
Samyeoul Choi
6c5d9a0622
am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
...
* commit '092238916fd5d10090c0bcad33644778a1f366e7':
Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
2011-02-25 12:08:08 -08:00
Samyeoul Choi
092238916f
Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
...
'*86' which is set now as a default at CDMAPhone.java,
is default voicemail number for Verizon.
For Sprint, we use user's own number for voicemail.
So we add codes in CDMAPhone.java to use
'config_telephony_use_own_number_for_voicemail',
and use config.xml to set this value as false.
Then we overlay Sprint's own config.xml file to
override 'config_telephony_use_own_number_for_voicemail' as a true.
Change-Id: I110914bdfa9a79aaba89d3b80edbcf044e9aabee
2011-02-25 11:28:43 -08:00
Maarten Hooft
62f40c8bcf
am 99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '99cca89f41e500f8b39fd75eb17f337422c4ac90':
Import revised translations. DO NOT MERGE
2011-02-18 15:22:48 -08:00
Maarten Hooft
99cca89f41
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-02-17 17:17:40 -08:00
Nick Pelly
8c8e9d9a7f
am 1df862a4: Minor doc update.
...
* commit '1df862a4656bb0d7a3329311b1e243fc6db32448':
Minor doc update.
2011-02-16 09:23:08 -08:00
Nick Pelly
1df862a465
Minor doc update.
...
Change-Id: I1d29adfccbdc196a145a2c2a044d63b00e5f788b
2011-02-16 09:18:34 -08:00
Eric Fischer
3537011651
Import revised translations. DO NOT MERGE
...
Change-Id: If134b2db7449d3646541fc83e8973938926fb481
2011-02-14 17:21:02 -08:00
Eric Fischer
c1c3143347
am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'be4b39d2fde3d34539752b99238ceebd97ccf580':
Import revised translations. DO NOT MERGE
2011-02-08 17:32:18 -08:00
Eric Fischer
dff2fea9b1
Import revised translations. DO NOT MERGE
...
Change-Id: I9fe35888f8aa02c559949ad8395e8e4f4dffb669
2011-02-07 13:17:26 -08:00
Gilles Debunne
2f7e9d403a
am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
...
* commit '53841df2a49bffa53ba3d1e4b0580f4f23a64dc3':
SelectAllOnFocus shows a higlighted text. DO NOT MERGE.
2011-02-04 15:49:56 -08:00
Gilles Debunne
53841df2a4
Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
2011-02-04 15:46:06 -08:00
Irfan Sheriff
ec348b4953
resolved conflicts for merge of 0a4b3fd9 to gingerbread-plus-aosp
...
Change-Id: I294e6e843ae028377d19c1180e0d5e9aef52897c
2011-02-02 14:23:10 -08:00
Irfan Sheriff
0a4b3fd93b
two digit number handling in croatia and serbia
...
If users dial 92-96, dial them normally and not treat
as USSD
Change-Id: If3b6cb37b7ec0ff99d76cb10cba53368094a0b5d
Signed-off-by: sj2202.park@samsung.com
2011-02-02 14:08:38 -08:00
Eric Fischer
3efb315313
am a019d15b: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'a019d15b667a72d7cb29afc7f153d5c517abcb76':
Import revised translations. DO NOT MERGE
2011-01-31 16:18:27 -08:00
Eric Fischer
a85afd133f
Import revised translations. DO NOT MERGE
...
Change-Id: I07d18c234d74184a6bc83894a3e874ce1ae782da
2011-01-31 12:17:36 -08:00
Eric Fischer
287fbba5b8
am 5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '5f2def8cfdad2491a646be69347444a3be6ddf84':
Import revised translations. DO NOT MERGE
2011-01-28 14:19:36 -08:00
Eric Fischer
1c3f1af182
Import revised translations. DO NOT MERGE
...
Change-Id: Id8afb303d2ecfc6270d1af1abd189c0ef0bf2314
2011-01-28 13:16:00 -08:00
Eric Fischer
e49e30cc4d
am 3d73c4d3: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '3d73c4d386e5ae66aa5c472342207728ab4fbf3a':
Import revised translations. DO NOT MERGE
2011-01-27 15:00:43 -08:00
Eric Fischer
f4323d8d6a
Import revised translations. DO NOT MERGE
...
Change-Id: I1cf12c4a061a7982666176b42ac68d6dedd207ed
2011-01-27 13:57:31 -08:00
Dianne Hackborn
ccd79399cc
am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
...
* commit '1d07b5bc9b0a9e3de4495834242548a600cae1d8':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
2011-01-26 14:08:30 -08:00
Dianne Hackborn
f5e4f208b9
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
...
Change-Id: I53a6671d5478e7dbca44b17d90f1edfa8e3420bc
2011-01-26 12:40:18 -08:00
Justin Ho
7cd1cc8319
am 28c4f69a: Updated checkbox assets
...
* commit '28c4f69a938766076c14e8f5b07951ec2a9f610d':
Updated checkbox assets
2011-01-24 13:08:54 -08:00
Justin Ho
28c4f69a93
Updated checkbox assets
...
Change-Id: I93c979816bc3310c510bf8942c273ce8c411150d
2011-01-24 13:05:06 -08:00
Jeff Brown
b26c516c03
am 41395459: Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread
...
* commit '41395459e676cf9ab4059e08446656f145662c2d':
Filter virtual keys after touches. (DO NOT MERGE)
2011-01-18 14:38:27 -08:00