Svetoslav Ganov
f53ee3ee65
Merge "System not checking if enabled services are installed when disabling accessibility."
2011-09-20 18:00:26 -07:00
Mathias Agopian
6960b38915
Merge "fix transition from full overlays to fb"
2011-09-20 17:55:24 -07:00
Mathias Agopian
61b313d184
Merge "rename mInvalidRegion to mSwapRegion"
2011-09-20 17:55:03 -07:00
Mathias Agopian
30908ac6ae
Merge "improve hwc dumpsys"
2011-09-20 17:54:56 -07:00
Peter Ng
21fc681a44
Merge "Slightly transparent notification header to match visuals of the dropdown handle"
2011-09-20 17:53:50 -07:00
Mathias Agopian
9c6e297271
fix transition from full overlays to fb
...
we need to clear the whole framebuffer in that situation because
we can't trust the content of the FB when partial (fb preserving)
updates are used.
Bug: 5318492
Change-Id: I3f0e01b0fb665a34e44d88ad9f0f54a5d990060b
2011-09-20 17:53:33 -07:00
Mathias Agopian
0656a68380
rename mInvalidRegion to mSwapRegion
...
Change-Id: I946cbc782c0c84645843ea44c3d8b04a0a2fe658
2011-09-20 17:53:33 -07:00
Mathias Agopian
fb4d5d5726
improve hwc dumpsys
...
we now log the buffer's format
Change-Id: I9d3ad8018e884240a153de3baefb6331cb014d0f
2011-09-20 17:53:33 -07:00
Justin Ho
efc4aae67c
am 474a2784: Merge "Adding missing cleanspec for audio file cleanup" into ics-factoryrom
...
* commit '474a27843d0aca41a8dc428af0888c28195c96ef':
Adding missing cleanspec for audio file cleanup
2011-09-20 17:53:03 -07:00
Justin Ho
60318654d5
Merge "Adding missing cleanspec for audio file cleanup" into ics-factoryrom
2011-09-20 17:51:55 -07:00
Justin Ho
cccf11153f
am b8b10834: Merge "Updated Prime sounds" into ics-factoryrom
...
* commit 'b8b108348648cd4e2f30e8d46a7b70a2b0ce0d36':
Updated Prime sounds
2011-09-20 17:46:59 -07:00
Justin Ho
8a11bbcacd
Merge "Updated Prime sounds" into ics-factoryrom
2011-09-20 17:45:15 -07:00
Svetoslav Ganov
d99f35d898
Merge "ActivityChooserView not showing highest ranked target if default action not shown."
2011-09-20 17:41:59 -07:00
Tsu Chiang Chuang
5786fed3b7
Merge "point upload to the correct url."
2011-09-20 17:29:12 -07:00
Colin Cross
4bd0dea445
am 5965ba30: dumpstate: add uptime to top of bugreports
...
* commit '5965ba30d3ac8f9504681ac2e7ea8ac84aa0c5a7':
dumpstate: add uptime to top of bugreports
2011-09-20 17:21:27 -07:00
Justin Ho
65f877e87c
Merge "updated stat_ in frameworks"
2011-09-20 16:56:31 -07:00
Irfan Sheriff
61d5a26beb
Merge "Change hostname format to conform to specification"
2011-09-20 16:02:42 -07:00
Eric Fischer
458da1ac2a
am 01ad2a3f: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
...
* commit '01ad2a3fa75902638f49b5bd3258c354f780892e':
Import revised translations. DO NOT MERGE
2011-09-20 15:38:29 -07:00
Eric Fischer
c2e07c6f0e
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
2011-09-20 15:35:23 -07:00
Svetoslav Ganov
97632a9be9
Merge "TextView not adding text to accessibility events."
2011-09-20 14:57:57 -07:00
Adam Powell
6fa8569c69
am 6724872b: Merge "Fix bug 5336495 - Silent mode icon on power dialog is wrong" into ics-factoryrom
...
* commit '6724872b166d84f640dfa3213e917ecd37333484':
Fix bug 5336495 - Silent mode icon on power dialog is wrong
2011-09-20 14:36:09 -07:00
John Huang
7374d229a3
am edc8029b: Merge "Retain signal level even when data is offline." into ics-factoryrom
...
* commit 'edc8029b8b9ac9233e4dc73f05415265bac712de':
Retain signal level even when data is offline.
2011-09-20 14:36:08 -07:00
Adam Powell
885f78607e
Merge "Fix bug 5336495 - Silent mode icon on power dialog is wrong" into ics-factoryrom
2011-09-20 14:34:28 -07:00
John Huang
13f6b902e7
Merge "Retain signal level even when data is offline." into ics-factoryrom
2011-09-20 14:34:07 -07:00
Matthew Xie
e24b316c31
am 778eccf4: Merge "Check null of pidPair to skip the case the service record has been removed" into ics-factoryrom
...
* commit '778eccf4923571c77f158e92b2f5f0f7dfd21875':
Check null of pidPair to skip the case the service record has been removed
2011-09-20 14:14:29 -07:00
Justin Ho
89312d7d39
am aff24a52: Merge "Updated lockscreen camera assets Bug: 5296921" into ics-factoryrom
...
* commit 'aff24a52d20a26a8cd374ea6dd284eee16e4ffc0':
Updated lockscreen camera assets Bug: 5296921
2011-09-20 14:14:16 -07:00
Daniel Sandler
f9d70c28e6
am d1d07432: Merge "More debug logs for RSSI updates." into ics-factoryrom
...
* commit 'd1d074326d81b6a92cff5a5fc279b8c9177cc7aa':
More debug logs for RSSI updates.
2011-09-20 14:14:15 -07:00
RoboErik
8c4d16ec6b
am bbb11b80: Merge "Add a warning to changing colors in the docs" into ics-factoryrom
...
* commit 'bbb11b80106c8687f2833c3d4b538029fc0805e6':
Add a warning to changing colors in the docs
2011-09-20 14:14:11 -07:00
Michael Jurka
a576c0c7c6
am 2d69cff8: Merge "Fix crash in recent apps" into ics-factoryrom
...
* commit '2d69cff88e262569ac1284e2048f2a6c3aca6639':
Fix crash in recent apps
2011-09-20 14:13:53 -07:00
Daniel Sandler
5a18ef1352
am 38cfcfbc: (-s ours) Merge "Fix MENU icon weirdness. (DO NOT MERGE)" into ics-factoryrom
...
* commit '38cfcfbc327c7d9fb65ac6dcb1074927e445ce29':
Fix MENU icon weirdness. (DO NOT MERGE)
2011-09-20 14:13:51 -07:00
Daniel Sandler
f2aef6f83f
am ee0835b9: (-s ours) Merge changes Ib49af35a,Iaa20454c into ics-factoryrom
...
* commit 'ee0835b95de225fdc34d45b777b4595d01727a40':
Stop clobbering the systemUiVisibility on navbar touch. (DO NOT MERGE)
Fix disappearing nav icons. (DO NOT MERGE)
2011-09-20 14:13:48 -07:00
JP Abgrall
14aa36d209
am 20e93c05: dumpstate: collect /proc/net/dev and /proc/net/xt_qtaguid/iface_stat_all
...
* commit '20e93c0507b66e697d23c58c138484d652a1b810':
dumpstate: collect /proc/net/dev and /proc/net/xt_qtaguid/iface_stat_all
2011-09-20 14:13:36 -07:00
Mathias Agopian
5745a92c33
Merge "Make sure Region handles invalid rectangles"
2011-09-20 14:02:53 -07:00
Mathias Agopian
9f30332325
Merge "fix the float Rect in OpenGLRenderer to handle NANs"
2011-09-20 14:02:44 -07:00
Matthew Xie
f97c073fbc
Merge "Check null of pidPair to skip the case the service record has been removed" into ics-factoryrom
2011-09-20 13:55:48 -07:00
Dianne Hackborn
ca1b51e6ad
Merge "Fix issue #5312624 : Lock screen very flickery"
2011-09-20 12:37:10 -07:00
Justin Ho
80e31fe5c9
Merge "Updated lockscreen camera assets Bug: 5296921" into ics-factoryrom
2011-09-20 12:09:13 -07:00
Daniel Sandler
ff61cc2469
Merge "More debug logs for RSSI updates." into ics-factoryrom
2011-09-20 11:47:50 -07:00
RoboErik
b61a6b5db8
Merge "Add a warning to changing colors in the docs" into ics-factoryrom
2011-09-20 11:34:20 -07:00
Eric Fischer
b8469d1de7
Merge "Import revised translations."
2011-09-20 10:54:52 -07:00
Michael Jurka
765c925130
Merge "Fix crash in recent apps" into ics-factoryrom
2011-09-20 10:49:48 -07:00
Daniel Sandler
689ce3638d
Merge "Fix MENU icon weirdness. (DO NOT MERGE)" into ics-factoryrom
2011-09-20 10:44:07 -07:00
Ben Murdoch
d3c6207372
Merge "Cleanup for bug 5278763"
2011-09-20 10:32:28 -07:00
Daniel Sandler
15d259fb02
Merge changes Ib49af35a,Iaa20454c into ics-factoryrom
...
* changes:
Stop clobbering the systemUiVisibility on navbar touch. (DO NOT MERGE)
Fix disappearing nav icons. (DO NOT MERGE)
2011-09-20 10:25:11 -07:00
Justin Ho
59968ec09b
Merge "Reversal of indeterminate progressbar"
2011-09-20 09:57:48 -07:00
Chih-Chung Chang
2c685cfd2f
Merge "Fix 5224359: Add width and height to media store."
2011-09-20 09:23:34 -07:00
Daniel Sandler
8ecad74cfa
Merge "Fix disappearing nav icons."
2011-09-20 07:47:45 -07:00
Daniel Sandler
433cef7ed2
Merge "Stop clobbering the systemUiVisibility on navbar touch."
2011-09-20 07:47:40 -07:00
The Android Open Source Project
35cfc07d4a
Reconcile with ics-factoryrom-release
...
Change-Id: I8bb64c1b31c7158d931fd9f7be8a9e5b317c5252
2011-09-20 07:43:10 -07:00
The Android Automerger
52040fe26c
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-20 06:28:15 -07:00