Svetoslav Ganov
b0ebc84fa6
Merge "Settings are restored in alphabetical order rather in order of dependency." into ics-factoryrom
2011-09-21 19:06:26 -07:00
Jaikumar Ganesh
4317643963
am 90fb9aa9: Merge "Make Bluetooth Health constant public." into ics-factoryrom
...
* commit '90fb9aa93a350d5571a378923c2566f48e44ad3e':
Make Bluetooth Health constant public.
2011-09-21 18:57:00 -07:00
Kenny Root
e20a7f206c
am 9c711282: Merge "Unhide new PackageManager APIs for API 14" into ics-factoryrom
...
* commit '9c711282ad234e104c34eb4408d85fc1bb149ded':
Unhide new PackageManager APIs for API 14
2011-09-21 18:56:52 -07:00
Justin Ho
2d4c24e6b5
am 22aa7805: Merge "Thinner clock font" into ics-factoryrom
...
* commit '22aa7805dd0d9bf1c31b5cff526fda793477d8a7':
Thinner clock font
2011-09-21 18:56:50 -07:00
John Wang
6f01e62c40
am 6588bba3: Merge "Notify the sim state after callback registration." into ics-factoryrom
...
* commit '6588bba33fbf2756253d19764022a743e13573e9':
Notify the sim state after callback registration.
2011-09-21 18:56:49 -07:00
John Wang
b156ea7fc6
am 27b402ab: Merge "Set enable_puk_unlock_screen true by default." into ics-factoryrom
...
* commit '27b402abe5c24a3e21a39458541001ea91465b8f':
Set enable_puk_unlock_screen true by default.
2011-09-21 18:56:47 -07:00
Adam Powell
a229a38557
Merge "Fix bug 5300621 - Share menu disappears in gallery"
2011-09-21 18:26:13 -07:00
Jaikumar Ganesh
d35be08d9c
Merge "Make Bluetooth Health constant public." into ics-factoryrom
2011-09-21 17:44:32 -07:00
Kenny Root
668b223c42
Merge "Unhide new PackageManager APIs for API 14" into ics-factoryrom
2011-09-21 16:35:52 -07:00
Dianne Hackborn
29e6fa1343
Merge "Fix issue #5253941 : ICS ignoring provider's android:process flag"
2011-09-21 16:19:45 -07:00
Dianne Hackborn
75d83f7a2e
Merge "Improvements to power manager turning on screen."
2011-09-21 16:18:38 -07:00
Justin Ho
839aa345f8
Merge "Thinner clock font" into ics-factoryrom
2011-09-21 15:38:56 -07:00
John Wang
cebaafdc8f
Merge "Notify the sim state after callback registration." into ics-factoryrom
2011-09-21 15:34:28 -07:00
John Wang
def0f98acf
Merge "Set enable_puk_unlock_screen true by default." into ics-factoryrom
2011-09-21 15:32:39 -07:00
Mangesh Ghiware
7eaca5a4bb
Merge "Use overview scale when restored scale is 0."
2011-09-21 15:20:03 -07:00
Dianne Hackborn
83275c74cb
Merge "Keyguard sound needs to hold wake lock."
2011-09-21 15:15:18 -07:00
Wink Saville
dbc190ed30
am 4aa8d943: Merge "Reduce connectivity logging" into ics-factoryrom
...
* commit '4aa8d943a970008915b703758743b107927d96fa':
Reduce connectivity logging
2011-09-21 14:14:28 -07:00
Wink Saville
b5b4e66b27
Merge "Reduce connectivity logging" into ics-factoryrom
2011-09-21 14:12:42 -07:00
Adam Powell
5529f11591
Merge "Fix bug 5341804 - Unable to type into the find on page CAB"
2011-09-21 14:06:41 -07:00
Andreas Huber
7e40a5a614
Merge "Support some .avi files containing H.264 video, log warnings if audio/video unsupported"
2011-09-21 13:56:09 -07:00
Jack Palevich
994384ddbb
Merge "Avoid allocating temporary memory for Matrix operations."
2011-09-21 12:40:41 -07:00
Adam Cohen
b06cf7bd70
am 41298971: Merge "Fixing disappearing lock screen, issue 5319246" into ics-factoryrom
...
* commit '41298971c774a336257fff4a97ed5d5505bbfb60':
Fixing disappearing lock screen, issue 5319246
2011-09-21 11:19:36 -07:00
Adam Cohen
ed3b8048fa
Merge "Fixing disappearing lock screen, issue 5319246" into ics-factoryrom
2011-09-21 11:17:19 -07:00
Glenn Kasten
e51e742373
Merge "Bug 5234242 audio continues after discontinuity"
2011-09-21 10:51:43 -07:00
Jean-Michel Trivi
ebf2b8b631
am 9c43016b: Merge "Bug 5045498 Keep track of RemoteControlClient play state change time" into ics-factoryrom
...
* commit '9c43016b52afa855156aac2dc81a2bbe1e4ab436':
Bug 5045498 Keep track of RemoteControlClient play state change time
2011-09-21 09:36:56 -07:00
Jean-Michel Trivi
0b95000116
Merge "Bug 5045498 Keep track of RemoteControlClient play state change time" into ics-factoryrom
2011-09-21 09:34:59 -07:00
Justin Ho
73d6c0d7bf
am 7a2063b1: Merge "New sync icon for Phone stat_sys area Bug: 5076774" into ics-factoryrom
...
* commit '7a2063b1d59dd6d7575dc91b6dd93b4a8d462b16':
New sync icon for Phone stat_sys area Bug: 5076774
2011-09-21 09:17:41 -07:00
Justin Ho
c267c413a1
Merge "New sync icon for Phone stat_sys area Bug: 5076774" into ics-factoryrom
2011-09-21 09:15:53 -07:00
Jason Sams
58d76cc886
Merge "Cleanup RS logs Reduce the startup/shutdown info and format the logs in a consistent manner."
2011-09-21 08:53:10 -07:00
Marco Nelissen
bdc35c7562
Merge "MediaScanner: To query row ids of music files when handling playlists."
2011-09-21 08:48:46 -07:00
Justin Ho
e09c903f7f
am 9d48b578: Merge "Fixing low battery dialog" into ics-factoryrom
...
* commit '9d48b578096a14441e2063c0e54dbba4340fa178':
Fixing low battery dialog
2011-09-21 08:01:18 -07:00
Justin Ho
9f0a388b90
Merge "Fixing low battery dialog" into ics-factoryrom
2011-09-21 07:59:32 -07:00
The Android Automerger
e9f9ee70e6
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-21 06:29:27 -07:00
The Android Open Source Project
f56afcc681
Reconcile with ics-factoryrom-release
...
Change-Id: I401a78a2216c8c4042f6f48b4e882035cbccfc82
2011-09-21 06:19:16 -07:00
Chih-Chung Chang
74222e4f4a
Merge "Fix 5229466: don't consume pointer events outside the window"
2011-09-21 02:26:08 -07:00
Wu-cheng Li
4f382d020f
am 5f0ef5fb: Fix jpeg callback is lost if setPreviewCallbackWithBuffer has been called.
...
* commit '5f0ef5fb0c2e65ca3d0aa4fcd2b300d4cd0a2b4b':
Fix jpeg callback is lost if setPreviewCallbackWithBuffer has been called.
2011-09-21 02:21:26 -07:00
The Android Automerger
7b57fda608
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-20 20:43:04 -07:00
Justin Ho
1efd861647
am a2520fc1: Merge "Ensure all clock fonts match Bug: 5340112" into ics-factoryrom
...
* commit 'a2520fc13652126227e8b602af4566849c216f28':
Ensure all clock fonts match Bug: 5340112
2011-09-20 18:54:05 -07:00
Justin Ho
7d70033886
Merge "Ensure all clock fonts match Bug: 5340112" into ics-factoryrom
2011-09-20 18:52:38 -07:00
Justin Ho
4f63f61e0b
am 3c3fa0b9: Merge "Updated stat_ icons" into ics-factoryrom
...
* commit '3c3fa0b9aaeed8d707df2221822a8d324e95037b':
Updated stat_ icons
2011-09-20 18:40:58 -07:00
Justin Ho
5fc041ba98
Merge "Updated stat_ icons" into ics-factoryrom
2011-09-20 18:38:54 -07:00
Mathias Agopian
c33e13e8d4
am 6db5b55f: Merge changes I3f0e01b0,I946cbc78,I9d3ad801 into ics-factoryrom
...
* commit '6db5b55f7c9242ff0d780351192c317d4c1d4768':
fix transition from full overlays to fb
rename mInvalidRegion to mSwapRegion
improve hwc dumpsys
2011-09-20 18:28:12 -07:00
Mathias Agopian
ce8a44457e
Merge changes I3f0e01b0,I946cbc78,I9d3ad801 into ics-factoryrom
...
* changes:
fix transition from full overlays to fb
rename mInvalidRegion to mSwapRegion
improve hwc dumpsys
2011-09-20 18:26:05 -07:00
Amith Yamasani
446ce3f0a7
am 9fdba999: Merge "If "Pulse notification light" is off, don\'t flash the LED even once." into ics-factoryrom
...
* commit '9fdba9997df17d2ae6d7ddc44513f67f12f81c88':
If "Pulse notification light" is off, don't flash the LED even once.
2011-09-20 18:07:50 -07:00
Amith Yamasani
b76f8fd9aa
Merge "If "Pulse notification light" is off, don't flash the LED even once." into ics-factoryrom
2011-09-20 18:06:15 -07:00
Gilles Debunne
4ee09060f9
Merge "Bug 5248215: Even though I turned off the Spelling correction, it still shows up"
2011-09-20 18:02:45 -07:00
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
8bfdda9ab3
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:57:55 -07:00
Mathias Agopian
56eb3fc695
rename mInvalidRegion to mSwapRegion
...
Change-Id: I946cbc782c0c84645843ea44c3d8b04a0a2fe658
2011-09-20 17:57:27 -07:00
Mathias Agopian
670a8990e8
improve hwc dumpsys
...
we now log the buffer's format
Change-Id: I9d3ad8018e884240a153de3baefb6331cb014d0f
2011-09-20 17:57:15 -07:00