Mathias Agopian
3adbec281e
Merge "Fix an issue with VSYNC"
2012-01-12 10:36:39 -08:00
Glenn Kasten
1c66547ba2
Merge "Use audio_format_t consistently"
2012-01-12 10:30:28 -08:00
Robert Greenwalt
cc9858049d
am 1800ccfa: am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1
...
* commit '1800ccfa647cca6e9c051759312d6af12f134f5a':
Disable wimax when mobile data is in Settings
2012-01-12 09:29:30 -08:00
Robert Greenwalt
1800ccfa64
am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1
...
* commit '4b1261f17ae2a0180be09b1c987ec7e70b2b46a7':
Disable wimax when mobile data is in Settings
2012-01-12 09:26:48 -08:00
Robert Greenwalt
140d0158c4
Merge "Ignore case on apn type strings."
2012-01-12 09:25:25 -08:00
Robert Greenwalt
4b1261f17a
Merge "Disable wimax when mobile data is in Settings" into ics-mr1
2012-01-12 09:24:45 -08:00
The Android Open Source Project
357987c7a5
am ce77af47: Reconcile with ics-mr1-release
...
* commit 'ce77af47e979d365155e4003ca2943b639600e73':
2012-01-12 09:00:21 -08:00
The Android Open Source Project
ce77af47e9
Reconcile with ics-mr1-release
...
Change-Id: Ie242914fa4cfdf35675bbd2777f0817186860526
2012-01-12 08:56:17 -08:00
Marco Nelissen
3fbc0b2062
Merge "MediaScanner: Disable bulk insert for settings"
2012-01-12 07:49:23 -08:00
Michael Jurka
5db89d806b
Merge "Speeding up System UI pressed anim"
2012-01-12 07:35:43 -08:00
Danielle Millett
29833523cc
am 63faf6c6: (-s ours) am 2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
...
* commit '63faf6c66ff129da9e431dbafd1170a14aedb259':
DO NOT MERGE - Cherry picking from master to MR1
2012-01-12 07:33:47 -08:00
Danielle Millett
63faf6c66f
am 2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
...
* commit '2931d8ace9118bafe08090cd41e235048b6c2eb2':
DO NOT MERGE - Cherry picking from master to MR1
2012-01-12 07:31:37 -08:00
Danielle Millett
2931d8ace9
Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
2012-01-12 07:28:24 -08:00
Michael Jurka
0b6586649f
Speeding up System UI pressed anim
...
No longer saving a layer in KeyButtonView.onDraw,
which prevents a framebuffer readback on some
drivers and cuts ~3ms from render time per frame
(on some frames, up to ~10ms)
Change-Id: I5df56c20098f35c8ae6c25e76c67d81e9b72d1f7
2012-01-12 07:09:40 -08:00
Michael Jurka
b144bd75b8
Fix NPE in Recent Apps
...
Change-Id: I936e053a806a1cbf9ac98fb5707d34924c94ff60
2012-01-12 06:56:39 -08:00
Brian Colonna
d5842b21d8
am 2cd0a0e5: (-s ours) am 8a1131d7: Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
...
* commit '2cd0a0e58e5da20405d1f16c65c7f9729de57c9a':
DO NOT MERGE cherry-picked FU framework tablet commits
2012-01-12 06:37:14 -08:00
Brian Colonna
2cd0a0e58e
am 8a1131d7: Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
...
* commit '8a1131d78925756835561c3e19cddd2ddf9dbd99':
DO NOT MERGE cherry-picked FU framework tablet commits
2012-01-12 06:35:27 -08:00
Brian Colonna
8a1131d789
Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
2012-01-12 06:33:49 -08:00
Mathias Agopian
0db7590ed2
remove dead/usnused code
...
Change-Id: I6fa2bc6ee01790abd2c1533f043d61a5e5c8d26e
2012-01-11 22:03:41 -08:00
Mathias Agopian
7e9a3706d9
Fix an issue with VSYNC
...
one-shot VSYNC listeners could miss a VSYNC event if
scheduled while in waitForVsync().
Change-Id: I720485784aecfea6cc7a23c77081d7af3c9c71db
2012-01-11 22:03:40 -08:00
satok
e00274a5ab
Merge "Make public SpellChecker utilities"
2012-01-11 21:14:23 -08:00
satok
11299b1b8c
Make public SpellChecker utilities
...
Bug: 5639238
Change-Id: Id7dd2263a6305cc6ba0cf8f4d8ad8fb0d39a48ff
2012-01-12 13:54:53 +09:00
Irfan Sheriff
14eb3701c2
Merge "Sync up state with supplicant at start"
2012-01-11 20:33:11 -08:00
Xia Wang
4acb784630
am 87badc20: am 4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1
...
* commit '87badc20c7d5462ee27f13adf50acaf6a3232884':
Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922
2012-01-11 17:57:16 -08:00
Xia Wang
e328d6b0a6
am b18a7c3e: am 1446c7b2: Merge "Get average value for image processing test bug#: 5566079" into ics-mr1
...
* commit 'b18a7c3ef1ff92ee2b8407743ffc4d7fd8b8ba70':
Get average value for image processing test bug#: 5566079
2012-01-11 17:57:14 -08:00
Xia Wang
87badc20c7
am 4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1
...
* commit '4ac4ab4ef046eed4d1ada7bbb1d54ee0a244d454':
Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922
2012-01-11 17:53:38 -08:00
Xia Wang
b18a7c3ef1
am 1446c7b2: Merge "Get average value for image processing test bug#: 5566079" into ics-mr1
...
* commit '1446c7b2ed41f718afef86787b3ffd3f7b4ee9d7':
Get average value for image processing test bug#: 5566079
2012-01-11 17:53:36 -08:00
Xia Wang
4ac4ab4ef0
Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1
2012-01-11 17:52:06 -08:00
Xia Wang
1446c7b2ed
Merge "Get average value for image processing test bug#: 5566079" into ics-mr1
2012-01-11 17:51:48 -08:00
Scott Main
d4eb682b5f
docs: further clarify the behavior of targetSdkVersion
...
bug: 5854083
Change-Id: I913a245b754604165b4570447f797f7cc66af5f9
2012-01-11 17:23:06 -08:00
Irfan Sheriff
576db76106
Sync up state with supplicant at start
...
Bug: 5534039
Change-Id: I70b3e03b3039877b3c64167d0d246346f9131fc6
2012-01-11 17:04:30 -08:00
Robert Greenwalt
bcf1276830
Ignore case on apn type strings.
...
Found that if the type were not lowercase it wouldn't match.
That's silly. Do case-insensitive compares.
bug:5525764
Change-Id: Ibfe6be6c34116e00931594ec317fe192e1756ade
2012-01-11 17:01:50 -08:00
Katie McCormick
6efe5b5615
am 3808f8cc: am 6a52c632: Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
...
* commit '3808f8ccec18f7b04ef983d553fb10f3e2983216':
Doc change: Adding Bluetooth HDP info.
2012-01-11 16:45:00 -08:00
Katie McCormick
3808f8ccec
am 6a52c632: Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
...
* commit '6a52c632530fa39de570c9a6630264178c20e58e':
Doc change: Adding Bluetooth HDP info.
2012-01-11 16:42:29 -08:00
Katie McCormick
6a52c63253
Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
2012-01-11 16:40:37 -08:00
John Reck
b123e96059
Merge "Initial NavCache removal support"
2012-01-11 16:34:26 -08:00
The Android Automerger
1dfa4aaa48
merge in ics-mr1-release history after reset to ics-mr1
2012-01-11 16:29:04 -08:00
Katie McCormick
2e32a78ead
Doc change: Adding Bluetooth HDP info.
...
Change-Id: Icdc19ed9ea09422ac2ea01c03b4a569d8ae94121
2012-01-11 16:18:50 -08:00
John Wang
1f7b23dda2
am 70205788: am 6ad68ba9: Adjust the mapping of LTE signal bars.
...
* commit '70205788fa39968b8331085597e3d3b61e271fbe':
Adjust the mapping of LTE signal bars.
2012-01-11 16:05:14 -08:00
Selim Gurun
dbc361df8b
am 0265a4a0: (-s ours) am 51938e26: Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1
...
* commit '0265a4a0e02db98b85bd7f9be8b866d3fb9889d2':
Do Not Merge. Move ssl callbacks to webcore thread.
2012-01-11 16:04:55 -08:00
John Wang
70205788fa
am 6ad68ba9: Adjust the mapping of LTE signal bars.
...
* commit '6ad68ba9d99d48cc5c189dc7e32e577f56ce51fd':
Adjust the mapping of LTE signal bars.
2012-01-11 15:36:00 -08:00
John Wang
6ad68ba9d9
Adjust the mapping of LTE signal bars.
...
bug:5640958
Change-Id: I91efc5a81b505aae59dac9b1d69314efaffda6b6
2012-01-11 14:47:19 -08:00
Matthew Xie
f3171fb60c
Set Bluetooth adapter to PowerOff mode when turnoff with airplane on
...
Currently, when airplane mode was on and BT was on, turning BT off
moved BT to hotoff state. This fix moves BT all the way to Poweroff
state to have better power performance.
bug 5854282
Change-Id: I7ba41797a46a81ddb3a576453f2a8303b5eed525
2012-01-11 14:46:13 -08:00
Chia-chi Yeh
50fe709995
VPN: silence VPN notifications.
...
Bug: 5852859
Change-Id: I269d8de298a1fd69a8d777150ae97927537a5424
2012-01-11 14:26:24 -08:00
Selim Gurun
0265a4a0e0
am 51938e26: Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1
...
* commit '51938e26913a98aa8de0292e9be8ea9d9ebc67c3':
Do Not Merge. Move ssl callbacks to webcore thread.
2012-01-11 14:20:32 -08:00
Selim Gurun
51938e2691
Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1
2012-01-11 14:18:14 -08:00
John Reck
4eda105cdb
Initial NavCache removal support
...
Change-Id: I927005093b620a1b1b60703bc8a58de539bdf3c8
2012-01-11 13:59:41 -08:00
Daniel Sandler
5962fd5ec9
Clean up wifi/mobile indicators in the expanded panel.
...
We now have two separate RSSI icons, one for wifi and one
for mobile data, as originally proposed in bug 5544770.
Each has an accompanying label showing the appropriate
network description string (PLMN or SSID or "No internet
connection"); these will be truncated as necessary to avoid
clobbering other UI elements in the panel.
Bug: 5543495
Bug: 5621224
Change-Id: I8fc322f8471fc94000e7230de359d3f1fe561b1e
2012-01-11 16:57:51 -05:00
Glenn Kasten
a9830d430a
Merge "Fix build warnings"
2012-01-11 13:42:47 -08:00
Glenn Kasten
129e19cb37
Fix build warnings
...
Change-Id: I334e0a6e018bb1067c90e050cf3583c1057aacd9
2012-01-11 13:40:05 -08:00