Ying Wang
0a1fdd7d50
Fix uses of all-subdir-makefiles
...
We should use all-makefiles-under instead.
all-subdir-makefiles can be used only before any "include" statement.
Before this change, both subdirs were actually not included.
Change-Id: I6bf35d07f294a5012c9322096f999ac26e37432f
2011-07-27 16:59:08 -07:00
Daniel Sandler
b99514a8cf
Merge "New phone statusbar handle."
2011-07-26 10:34:28 -07:00
Daniel Sandler
cd4276cd89
Merge "New stacked RSSI icons."
2011-07-26 10:34:21 -07:00
Daniel Sandler
3be06885f8
Merge "Play the low-battery sound only at certain discharge events."
2011-07-26 10:21:24 -07:00
Daniel Sandler
9afdbca65b
Merge "Update large icon in changed status bar notifications."
2011-07-26 10:13:04 -07:00
Mike Lockwood
315940c270
Merge "MediaScanner: Fix problem with duplicate directory entries in the database"
2011-07-26 10:10:28 -07:00
Jean-Michel Trivi
d44905c076
Merge "Fix bug 4319552 Java to native channel mask translation"
2011-07-26 09:27:53 -07:00
Makoto Onuki
abbc0b0047
Merge "Add new contacts intent action for the "invite" feature"
2011-07-26 09:24:06 -07:00
Mathias Agopian
e4a8ac1019
Merge "fix a typo that prevented preserveRects() to work properly"
2011-07-25 19:51:31 -07:00
Chih-Chung Chang
024b79a9e1
Merge "Add filename and line number in the debug messages."
2011-07-25 18:36:57 -07:00
Kenny Root
24f8411904
Merge "Throw NullPointerException on args to Time#compare"
2011-07-25 18:26:59 -07:00
satok
dfe1a12251
Merge "[step9] Add logging code for text services"
2011-07-25 18:02:46 -07:00
Dianne Hackborn
a8e04608f6
Merge "Fix issue #5063010 : Loaders don't seem to be properly..."
2011-07-25 17:28:51 -07:00
Robert Greenwalt
f67dc6c552
am 8ba16551: Merge "Fix build." into honeycomb-plus-aosp
...
* commit '8ba16551bc11379e7c1b1815612909e2515d0cb2':
Fix build.
2011-07-25 17:25:30 -07:00
Dianne Hackborn
71736c1908
am 1b20abd3: am 20bf46af: am b0878223: am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
...
* commit '1b20abd30c2757132b7a2d319ae73f420b864ed4':
frameworks/base: Cap the number of toasts that a package can post.
2011-07-25 17:25:09 -07:00
Dianne Hackborn
7179d44150
am 6d21aee8: am 9ce1ecdf: am 1a2fcea1: am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
...
* commit '6d21aee882215e8a17408f6ae1fbfba5cf8e440f':
frameworks/base: unlink death notifications of Vibrate requests
2011-07-25 17:25:00 -07:00
Xavier Ducrohet
3bbeaa0bf1
am ed07215e: am 55775e5f: am e70b2b8f: am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public."
...
* commit 'ed07215e482cae1ffedbba707284821b3afc310f':
Layoutlib_create flag -p: don't change all accesses to public.
2011-07-25 17:24:56 -07:00
Kenny Root
395dcd07f1
am 64ed1059: am e612c881: am 4f3a8db6: am 3cf03987: Merge "Continue idmap generation even if name lookup fails."
...
* commit '64ed105957098a900d58e7c2598e060cb37755ce':
Continue idmap generation even if name lookup fails.
2011-07-25 17:24:52 -07:00
Winson Chung
8b9340b9e8
Merge "Using the filename as the media title for screenshots and changing filename format."
2011-07-25 17:20:19 -07:00
Robert Greenwalt
502c194ef0
Merge "resolved conflicts for merge of a7f68230 to master"
2011-07-25 17:12:22 -07:00
Romain Guy
66e3e1275f
Merge "Improve rendering performance on some GPUs"
2011-07-25 16:38:13 -07:00
Gloria Wang
b914592fde
Merge "Fix for bug 4371230. - Generate unique ID for each DrmManagerClient in native side - Fix the bug where multiple clients could use the same ID - Return the correct unique ID back to Java - Add a flag in the unique ID to separate native client and Java client"
2011-07-25 16:36:20 -07:00
Robert Greenwalt
8166de6037
resolved conflicts for merge of a7f68230 to master
...
Change-Id: I9e8faaa94f9b251a9c003dc6b9a3e2a97c4564a9
2011-07-25 16:06:25 -07:00
Svetoslav Ganov
9e4b115478
Merge "Set initial bounds offset to (0,0) so that in-screen bounds reported by AccessibilityNodeInfo are correct"
2011-07-25 16:03:23 -07:00
Pannag Sanketi
11ff41d5c1
Merge "Adding Metadata mode to SurfaceMediaSource"
2011-07-25 15:00:16 -07:00
Jason Sams
9518334225
Merge "Add size param to rsForEach bug 5074640"
2011-07-25 14:54:49 -07:00
Romain Guy
c58fdb194d
Merge "Add debug flag to print out the EGL configuration used by libhwui"
2011-07-25 14:44:05 -07:00
Romain Guy
b52a5f9ac1
Merge "Add ELG config debugging to HardwareRenderer"
2011-07-25 14:43:56 -07:00
Eric Laurent
d5f525fce0
Merge "Added APIs for audio preprocessing"
2011-07-25 14:43:05 -07:00
James Dong
be7104a57a
Merge "Do not support still image capture mode for timelapse video recording"
2011-07-25 14:21:14 -07:00
Robert Greenwalt
7bec2ec07d
Merge "Fix build." into honeycomb-plus-aosp
2011-07-25 14:05:23 -07:00
Mathias Agopian
ab7c13f96a
fix a typo that prevented preserveRects() to work properly
...
this caused drawing artifacts during the screen rotation
animation of SurfaceView.
Change-Id: Idcc996b6ca2e346135dd2264959670c0b086d4cb
2011-07-25 13:57:16 -07:00
Adam Cohen
774d46707a
Merge "Fixing old bug with AdapterViewFlipper"
2011-07-25 13:54:02 -07:00
Philip Milne
eb0461c6a9
Merge "Fix for http://b/issue?id=5064532 "
2011-07-25 13:43:09 -07:00
Michael Jurka
c1626dcb7f
Merge "Unifying swipe behavior for Recents and Notifications"
2011-07-25 13:38:48 -07:00
Kenny Root
7b63107ff2
Merge "Change user 0 directory back for compatibility"
2011-07-25 12:32:10 -07:00
Kenny Root
9de029a21b
Merge "Stop using charAt for Signatures"
2011-07-25 12:32:01 -07:00
Dianne Hackborn
b52318eecc
am 20bf46af: am b0878223: am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
...
* commit '20bf46af14130314ae1aeb1e5482c38556c8f0f8':
frameworks/base: Cap the number of toasts that a package can post.
2011-07-25 12:21:32 -07:00
Dianne Hackborn
8ba02b7ee8
am 9ce1ecdf: am 1a2fcea1: am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
...
* commit '9ce1ecdfde98c7b5b5ec346b883df0a50d9722e1':
frameworks/base: unlink death notifications of Vibrate requests
2011-07-25 12:21:29 -07:00
Xavier Ducrohet
9ab8104b9c
am 55775e5f: am e70b2b8f: am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public."
...
* commit '55775e5f34af8d7c22ab3212c253b3a7d34a6f8a':
Layoutlib_create flag -p: don't change all accesses to public.
2011-07-25 12:21:17 -07:00
Kenny Root
66a2eec564
am e612c881: am 4f3a8db6: am 3cf03987: Merge "Continue idmap generation even if name lookup fails."
...
* commit 'e612c881ecf74770098aa9c07d4f0611ac982038':
Continue idmap generation even if name lookup fails.
2011-07-25 12:21:06 -07:00
Eric Laurent
90e4ab18cd
Merge "AudioFlinger: add dump of audio pre processing."
2011-07-25 12:20:23 -07:00
Svetoslav Ganov
fc9b3f36e0
Merge "TouchExplorer long press not working and activation tap not respecting distance slop."
2011-07-25 12:10:46 -07:00
Robert Greenwalt
476ceb890a
resolved conflicts for merge of 26ecc31f to honeycomb-plus-aosp
...
Change-Id: I23f42e247884f0c9d5ae4d3466213592dd3433d9
2011-07-25 12:08:19 -07:00
Svetoslav Ganov
554f497d82
Merge "Touch exploration state set to clients asynchronously and depended on talking service being enabled."
2011-07-25 12:08:08 -07:00
Amith Yamasani
b0fbd5c150
Merge "Implement CollapsibleActionView on SearchView."
2011-07-25 12:07:32 -07:00
Winson Chung
7fb78d3bf3
Merge "Preventing screenshots when waking from sleep."
2011-07-25 11:47:43 -07:00
Jamie Gennis
fa1e002cec
Merge "SurfaceTexture: enable RGB external textures"
2011-07-25 11:46:51 -07:00
Svetoslav Ganov
d8d737a6d2
Merge "Switch state text not added to accessibility events."
2011-07-25 11:23:56 -07:00
Matthew Xie
0b91030f19
Merge "Keep Bluetooth module hot to quickly swith it on/off"
2011-07-25 11:14:25 -07:00