ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
37,902 Commits 2 Branches 0 Tags 54 MiB
191e44f6bf
Commit Graph

37902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Ho
f4c3ea09b1 Merge "Updated scrubber_control assets, adding pressed state Bug: 5076695" 2011-08-11 14:39:03 -07:00
Justin Ho
83395998bb Merge "Updated progressbar_indeterminate and scrollbar_handle Bug: 5076695" 2011-08-11 14:14:48 -07:00
Justin Ho
7e6cf4bdbe Merge "Updated textfields Bug: 5076695" 2011-08-11 14:08:38 -07:00
Jean-Baptiste Queru
dbd5be5408 Merge "Add missing include" 2011-08-11 13:46:09 -07:00
Jean-Baptiste Queru
2327ffac7d Add missing include 
Change-Id: I00181029e80a2ba75320550c14e950fadbab8a64
 2011-08-11 13:36:04 -07:00
Kenny Root
36e0adda45 Merge "Better errors from copyResource" 2011-08-11 13:27:10 -07:00
Amith Yamasani
23f1724cf7 am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback" 
* commit '5f07406717db34927f5095de3829b1e74ebd7c16':
  VolumePreference.onActivityStop only stops playback
 2011-08-11 12:46:25 -07:00
Amith Yamasani
49934b48b3 am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback" 
* commit '712a8cca1f9e438af224f93c3a4644853331af2e':
  VolumePreference.onActivityStop only stops playback
 2011-08-11 12:43:44 -07:00
Amith Yamasani
431d7beafe Merge "VolumePreference.onActivityStop only stops playback" 2011-08-11 12:29:34 -07:00
Jean-Baptiste Queru
65adf39c38 am 44874c23: am c962512c: Merge "added stub for getting buffer from surface texture" 
* commit '44874c236de282b0d898f179fc9fdafa84aae40d':
  added stub for getting buffer from surface texture
 2011-08-11 12:24:51 -07:00
Jean-Baptiste Queru
9f3a33a671 am c962512c: Merge "added stub for getting buffer from surface texture" 
* commit 'c962512cac19e2bb1103c0c1a5f739d40d4d7740':
  added stub for getting buffer from surface texture
 2011-08-11 12:19:44 -07:00
Debashish Chatterjee
c45d869f96 Merge "Added FETCH_VOICEMAIL intent definition in VoicemailContract." 2011-08-11 12:19:01 -07:00
Chet Haase
a7552198ae Merge "Fix behavior of custom animations for LayoutTransition." 2011-08-11 12:16:41 -07:00
Jean-Baptiste Queru
cff1acf568 Merge "added stub for getting buffer from surface texture" 2011-08-11 12:08:04 -07:00
Chris Craik
f81c168a7a added stub for getting buffer from surface texture 
Change-Id: If61153cacdd8027848f40f8d9035f7c4aead0a98
 2011-08-11 11:56:59 -07:00
Romain Guy
8035c2f06f Merge "Document threading limitations on various View methods Bug #5150923" 2011-08-11 11:44:11 -07:00
Matthew Xie
6457b58140 Merge "Revert "Implement switchConnectable with Powered property setting instead of scan modes"" 2011-08-11 11:42:09 -07:00
Dianne Hackborn
63638f4dbc Merge "Fix issue #5016544: IME keyboard hides folder rename text field." 2011-08-11 11:38:32 -07:00
Dianne Hackborn
4968f28b84 Merge "New broadcast telling when an app is fully removed." 2011-08-11 11:35:07 -07:00
Marco Nelissen
5160988bf6 Merge "Add Bluetooth SCO test app" 2011-08-11 11:10:44 -07:00
Chet Haase
33aecb24c1 Merge "Fix Recent Apps jumping artifact" 2011-08-11 11:10:32 -07:00
Ben Murdoch
fb95d403d0 Merge "Allow fractional and signed input for number fields." 2011-08-11 10:29:56 -07:00
Robert Greenwalt
a36ac5b02c Merge "Remove default routes for non-default networks." 2011-08-11 09:55:08 -07:00
Dave Burke
544ea69c90 Merge "Revert "error out when SurfaceTexture APIs are called while not connected"" 2011-08-11 07:21:19 -07:00
Dave Burke
4925ee11f9 Revert "error out when SurfaceTexture APIs are called while not connected" 
This reverts commit a04cda9986366ab480ad8008c4d923271b05d78e.

Conflicts:

	include/gui/SurfaceTexture.h
	libs/gui/SurfaceTexture.cpp

Change-Id: Ib655016462c496ee2a27f7cb33a6e8b18cfe684a
 2011-08-11 15:13:19 +01:00
Daniel Sandler
7332e8202b Merge "Remove logspew." 2011-08-11 05:17:14 -07:00
Daniel Sandler
298b779f41 Merge "Remove obsolete assets." 2011-08-11 05:17:09 -07:00
Daniel Sandler
a133d64206 Merge "Clean up some effects in the phone notification panel." 2011-08-11 05:17:03 -07:00
Daniel Sandler
a1987fa263 Merge "Fix fullScreenAlert test." 2011-08-11 05:16:53 -07:00
Kristian Monsen
45e323c87d Merge "Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2" 2011-08-11 03:02:29 -07:00
Adam Powell
6ccc095fd6 Merge "Fix bug 5122319 - When action bar tabs run out of space they should collapse in to a spinner." 2011-08-10 23:29:57 -07:00
Mathias Agopian
3477588d13 Merge "Read leftover parcel data when a parceled Surface is found in the cache." 2011-08-10 19:45:34 -07:00
Mathias Agopian
f440f670a4 Merge changes I5174a6ec,I1f8538b6,Idb71fdcf 
* changes:
  fix a crasher in SurfaceTexture::updateTexImage()
  rework dequeueBuffer()'s main loop.
  error out when SurfaceTexture APIs are called while not connected
 2011-08-10 19:40:48 -07:00
Mathias Agopian
b2928c9068 Merge "Fix typos and use new HAL_PRIORITY_URGENT_DISPLAY constant" 2011-08-10 19:40:15 -07:00
Daniel Sandler
8cc43181c6 Merge "Subtract the navigation bar from DisplayMetrics." 2011-08-10 18:54:20 -07:00
Chia-chi Yeh
0b5a003b83 Merge "Unhide APIs for user space VPN." 2011-08-10 17:42:45 -07:00
Chia-chi Yeh
1f9930ed6d Merge "VPN: remove unused protected intent." 2011-08-10 17:42:30 -07:00
Bjorn Bringert
83788a04ef Merge "Add PendingIntent extra for WEB_SEARCH intents" 2011-08-10 17:39:08 -07:00
Mathias Agopian
8e19c2e97e fix a crasher in SurfaceTexture::updateTexImage() 
we now make sure to drain the buffer queue on disconnect.
this happens only when in synchrnous mode. in async mode
we clear all buffers except the head of the queue.

for extra safety we also catch the null pointer
in updateTexImage (which should  never happen) and return
an error.

Bug: 5111008

Change-Id: I5174a6ecbb0de641c6510ef56a611cbb4e9e1f59
 2011-08-10 17:35:52 -07:00
Mathias Agopian
2560d14ce8 rework dequeueBuffer()'s main loop. 
this simplifies the code a bit and also makes sure
we reevaluate mAbandoned and mConnectedApi each time
we come back from waiting on mDequeueCondition

Change-Id: I1f8538b62ad321b51ed79d953b700036daba796d
 2011-08-10 17:35:26 -07:00
Mathias Agopian
ef51b99219 error out when SurfaceTexture APIs are called while not connected 
- also log a warning when freeAllBuffers is called with a non empty buffer queue
- rename freeAllBuffers to freeAllBuffersLocked

Change-Id: Idb71fdcf233b9ccae62d5a2a7c3c4bad2501d877
 2011-08-10 17:33:46 -07:00
Jeff Brown
94b7c1b511 Merge "Add input system to Watchdog. Bug: 5094994" 2011-08-10 17:28:15 -07:00
Jeff Brown
78a8a5b31f Merge "Fix getSwitchState and others to check bitmasks. Bug: 5149443" 2011-08-10 17:28:09 -07:00
Jeff Brown
cc0692b3ee Merge "Use BTN_TOUCH or BTN_TOOL_* to determine if touch active. Bug: 5064702" 2011-08-10 17:28:05 -07:00
Jeff Brown
dc67136bd5 Merge "Update keymaps. Bug: 5069142" 2011-08-10 17:27:59 -07:00
Amith Yamasani
8294646593 Merge "Pass in the title of the preference as a title for the ringtone picker dialog." 2011-08-10 17:12:05 -07:00
Winson Chung
41a16ef2a1 Merge "Fixing screenshot timestamp (5147168)" 2011-08-10 16:23:52 -07:00
Amith Yamasani
3b9b18477b Merge "Accessibility and silent mode changes to Volume Panel." 2011-08-10 16:17:03 -07:00
Irfan Sheriff
9dcf98f4da Merge "Ensure interface down before wpa_supplicant start" 2011-08-10 16:04:50 -07:00
Marco Nelissen
df53b72c2b Merge "Check pids instead of IBinders" 2011-08-10 15:48:53 -07:00