Jeff Sharkey
178e3a3945
am 006efb24: Merge "Proactively disable data when over policy limit."
...
* commit '006efb24706378293a2faa137c7c7ca34a2e15cd':
Proactively disable data when over policy limit.
2011-08-25 11:31:30 -07:00
Mathias Agopian
a27eecb783
am 96daa0ef: Merge "Minor cleanup"
...
* commit '96daa0ef4088b0e123a7dce20f572238ec42575b':
Minor cleanup
2011-08-25 11:31:13 -07:00
Jeff Brown
431080e0f7
am aaee52cf: Merge "Clean up InputDispatcher debugging."
...
* commit 'aaee52cfa8bb1d0070b69cd4087be63dd2c0fee9':
Clean up InputDispatcher debugging.
2011-08-25 11:30:53 -07:00
Jeff Brown
9bd23e2568
am a2bc2d25: Merge "Support BTN_TOOL_*TAP as synonyms for BTN_TOOL_FINGER. Bug: 5205301"
...
* commit 'a2bc2d2569e52dccb8df8fa73b9557e465113aab':
Support BTN_TOOL_*TAP as synonyms for BTN_TOOL_FINGER. Bug: 5205301
2011-08-25 11:29:51 -07:00
Adam Powell
aa8e509ba2
Fix bug 5091886 - action bar measurement
...
Change the measurement order of elements in the action bar. Custom
views are now deemed more important and may truncate title/subtitle.
Change-Id: I150862f8e48b36bcbd892f49d78c2962c5001ab1
2011-08-25 11:23:44 -07:00
Daniel Lehmann
0d8627be88
Merge "Add Contact ID to StreamItem-Fields"
2011-08-25 11:23:08 -07:00
Erik Gilling
b524d3419a
Merge "systemui: enable GL rendering of launch background"
2011-08-25 11:19:49 -07:00
Jeff Sharkey
ed191e1fae
Merge "Data usage buckets active time, parsing ISE."
2011-08-25 11:13:38 -07:00
Jeff Sharkey
235c47ff3e
Merge "Register for kernel global data usage alerts."
2011-08-25 11:13:32 -07:00
Justin Ho
53ad53a4a3
Merge "Fix 5213837"
2011-08-25 11:08:35 -07:00
Irfan Sheriff
ea5b16ac57
Update p2p state machine and API
...
- Simplify the API with minimal needed functionality
- Fix responses for all async messages from the framework
- Fix state machine handling of connection setup and supplicant communication
Change-Id: I2724c83760b2aaa2068f9cd81ca0754753f83220
2011-08-25 11:02:25 -07:00
Erik Gilling
881fb2092b
systemui: enable GL rendering of launch background
...
Only affect high end devices
Change-Id: I5fa2b646c2c4d4350fb4fc1042741c981ebb30bb
Signed-off-by: Erik Gilling <konkers@android.com>
2011-08-25 10:57:51 -07:00
Gloria Wang
5837dfaf65
Merge "Set mSeekNotificationSent as false for RTSP seeking. Fix for bug 5208736."
2011-08-25 10:28:50 -07:00
Gloria Wang
051f8908a3
Set mSeekNotificationSent as false for RTSP seeking.
...
Fix for bug 5208736.
Change-Id: Ib1d74608ec289509082d8dcad080769f48098853
2011-08-25 10:09:34 -07:00
Jason Simmons
df6bb0a7ee
resolved conflicts for merge of 33264596 to ics-aah
...
Change-Id: I1b0b2c3a63d97d49940666ceec71293bdbab4e2e
2011-08-25 09:57:48 -07:00
Daniel Sandler
a4f2f3e614
Fix 5213837
...
Change-Id: I55d9bde628f501947821d96c25a463a6c642607e
2011-08-25 09:55:09 -07:00
Svetoslav Ganov
12bde60b39
Merge "Intra-process view hierarchy interrogation does not work."
2011-08-25 08:54:29 -07:00
Justin Ho
8799b4bf67
Merge "Updated alarm clock notification icon, adding xhdpi Bug: 5076695"
2011-08-25 08:52:27 -07:00
Justin Ho
a32b9af718
Updated alarm clock notification icon, adding xhdpi
...
Bug: 5076695
Change-Id: I772ae48a95e1b5b6388aaf7bfdfcc8f13e8ef4b5
2011-08-25 08:43:43 -07:00
James Dong
b335a5a4e0
Merge "When Camera is launched by media recording framework, stagefright controls the stop and release."
2011-08-25 08:12:11 -07:00
Daniel Sandler
a81fe3bbcc
Merge "Only show wifi indicator when wifi is connected."
2011-08-25 07:57:06 -07:00
Daniel Sandler
07800a5039
Merge "Put the status bar and navigation bar in HW when advisable."
2011-08-25 07:56:26 -07:00
Jesse Wilson
f9f046147f
Merge "New preloaded classes for ICS."
2011-08-25 06:19:15 -07:00
Narayan Kamath
978ed4693b
Merge "Deprecate old TTS settings that are no longer in use."
2011-08-25 02:37:30 -07:00
satok
1e3fac8bc6
Merge "Add functions to enable / disable spell checker"
2011-08-25 01:21:05 -07:00
Michael Chan
7420f13394
Added new extra for creating an all-day event by default
...
bug:2891538
Change-Id: Ifbd835535a8b6f6f46b0a366023d77e9662639a1
2011-08-25 01:11:37 -07:00
satok
a33c4fc5be
Add functions to enable / disable spell checker
...
Bug: 5057977
Change-Id: I2b27bd5f55feb305368034d7e95f83257ac4b3e6
2011-08-25 17:08:19 +09:00
Chet Haase
c93fcdce22
Merge "Fix issue with views becoming visible with stale content."
2011-08-25 00:54:14 -07:00
satok
47d0e48197
Merge "Dismiss the ime switch notification properly"
2011-08-25 00:36:35 -07:00
satok
dbf2950781
Dismiss the ime switch notification properly
...
Bug: 5159818
Change-Id: I606294dd453d3cc105714c62b945fcf1fa11164d
2011-08-25 15:29:48 +09:00
Justin Ho
b944c2186d
Removing a ringtone from Tuna
...
Change-Id: Ia511fc716730084454a057452ff0078110e01f53
2011-08-24 23:11:51 -07:00
Justin Ho
ee4fa05390
Merge "Updated spinners (again) Bug: 5076695, 5165156"
2011-08-24 22:52:41 -07:00
Justin Ho
1582af9609
Merge "Updated Roboto font Bug: 5173136"
2011-08-24 22:52:16 -07:00
Guang Zhu
cd6ec7801f
Merge "Revert "Warn only if we're tearing down "live" DeathRecipient content""
2011-08-24 22:00:47 -07:00
Guang Zhu
055fa08abf
Revert "Warn only if we're tearing down "live" DeathRecipient content"
...
This reverts commit 2611f89ab4f1119b96123edb2cd6d8d8139c03c4
2011-08-24 21:58:46 -07:00
Chet Haase
4324eadc89
Fix issue with views becoming visible with stale content.
...
An earlier fix nooop'd invalidate calls on non-visible views. This
caused an issue where changes to the view while it was not visible
(such as changing the text of a TextView) would not get picked up
by the invalidation process.
The fix is to automatically invalidate() a view when it becomes
visible, to account for any changes that may have occurred to its
content while it was not visible.
Change-Id: Ia0f8fb42ca627b5a38f08761fa622b23f2dfa38b
2011-08-24 21:31:03 -07:00
Dianne Hackborn
6ff0037792
Merge "Fix to show the correct HW accel background in the preview window."
2011-08-24 20:56:05 -07:00
Dianne Hackborn
07213e6d88
Fix to show the correct HW accel background in the preview window.
...
Also tweak wallpaper service to do a cleaner transition to a
static wallpaper.
Change-Id: I876a32091f92dd5a529d7fd809d3b8e730bb7d2a
2011-08-24 20:05:39 -07:00
Dianne Hackborn
1fc756da43
Merge "New API to determine if device has lots of RAM."
2011-08-24 19:57:52 -07:00
James Dong
831227816b
When Camera is launched by media recording framework, stagefright controls the stop and release.
...
Change-Id: Ic79a60dad0f617a845211d3fbe146c1648a71da3
related-to-bug: 5205804
2011-08-24 19:50:36 -07:00
Brett Chabot
b26db260ae
Merge "Disable package verification by default."
2011-08-24 19:45:51 -07:00
Jean-Michel Trivi
e9816475a6
Merge "Fix deadlock in AudioService"
2011-08-24 19:22:52 -07:00
Scott Main
9a10bf0386
fix sample code typo
...
issue 5190961
Change-Id: I15f10bc97b46f0e5f5e31ff5b38d6c3a938ddedf
2011-08-24 19:09:48 -07:00
Jean-Michel Trivi
3094d955b8
Fix deadlock in AudioService
...
Locks related to audio focus and remote control should always be
taken in the following order:
1/ audio focus lock
2/ remote control stack
3/ current remote control client generation
Change-Id: If8be11bfef92849957e692b2bd52adbd67a2ef0b
2011-08-24 19:08:48 -07:00
Chih-Chung Chang
7096c4a0e2
Merge "Port setting change should happen before receiving any filled frame."
2011-08-24 18:57:35 -07:00
Katherine Kuan
2382c3a92f
Merge "Add DATA_SET value to Entity from EntityIterator cursor"
2011-08-24 18:56:06 -07:00
Mathias Agopian
7345d36fd0
Merge changes I6b6f7537,I18e5b72d
...
* changes:
Fix a few style issues and remove LOG spam
More error checks to avoid div by zero.
2011-08-24 18:45:01 -07:00
Mathias Agopian
3a3fca3dce
Fix a few style issues and remove LOG spam
...
Change-Id: I6b6f75373f4ac28f98dea6a6f1c2567a6aa02243
2011-08-24 18:40:33 -07:00
Brett Chabot
ae05e8655d
Disable package verification by default.
...
Change-Id: I0e02cd177dbb99fc97e964ac87251a900d915b95
2011-08-24 18:38:26 -07:00
Mike J. Chen
cbb8b45088
Add the ability to pass float extras to AM.
...
Merged from master-tungsten:
commit 43a2825a283e29c0f70100146394957af0598b0e
Author: John Grossman <johngro@google.com>
Date: Wed Apr 27 09:03:53 2011 -0700
Add the ability to pass float extras to AM.
Change-Id: I970ad3f76a65bd781099204019095c73ed8c09db
Change-Id: I4ab21f20da4529069479bc822ed20aa05d161357
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
2011-08-24 18:37:50 -07:00