ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
23,755 Commits 2 Branches 0 Tags 54 MiB
e6bb73a1cd
Commit Graph

23755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
53f291e55f Tweak log messages a bit. 
Change-Id: Ifadf78c1ab8db49106216c70086f98860795c65f
 2010-10-25 17:37:46 -07:00
Jean-Baptiste Queru
205e2b9bd2 Merge "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-10-25 17:28:29 -07:00
Jean-Baptiste Queru
5c8eb900ab resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp 
Change-Id: I9d4e2649375d9262efe8aaade0778f638d04afa8
 2010-10-25 17:27:16 -07:00
Justin Ho
380022fac8 am 41d21efd: (-s ours) am 044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread 
Merge commit '41d21efd61157c9a4c49b2f7a6580ae0cbb58397'

* commit '41d21efd61157c9a4c49b2f7a6580ae0cbb58397':
  DO NOT MERGE - Updated ringtone assets for crespo
 2010-10-25 17:25:02 -07:00
Scott Main
376fd3f8de am 3d40cd50: am c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items 
Merge commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4' into gingerbread-plus-aosp

* commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4':
  update featured videos
 2010-10-25 17:23:10 -07:00
Scott Main
3ab66217c8 am c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items 
Merge commit 'c9ac1079696b93a294f504c6561397ef731a46f9' into gingerbread

* commit 'c9ac1079696b93a294f504c6561397ef731a46f9':
  update featured videos
 2010-10-25 17:15:50 -07:00
Jaikumar Ganesh
d6d41befe0 Merge "Fix docs builds." 2010-10-25 17:09:16 -07:00
Mathias Agopian
367dc0bd5f Updade Surface (ANativeWindow) format based on its buffers format 
this is to allow applications to change the format of a surface's
buffer, and have it reflected in EGL; which is needed for
EGLConfig validation.

Change-Id: Iee074c30ad765881e2409c1d37450b05e561c44d
 2010-10-25 17:08:37 -07:00
Gloria Wang
7bece1a662 resolved conflicts for merge of 965f960e to master 
Change-Id: I63cec8ffb3593216da1de03428134d89e75b9338
 2010-10-25 16:56:49 -07:00
Justin Ho
d6a3b3885f am 044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread 
Merge commit '044df235c86ac69bb0e56cb4387e111ec276276e' into gingerbread-plus-aosp

* commit '044df235c86ac69bb0e56cb4387e111ec276276e':
  DO NOT MERGE - Updated ringtone assets for crespo
 2010-10-25 16:50:34 -07:00
Justin Ho
a988e8dd60 Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread 2010-10-25 16:44:01 -07:00
Jaikumar Ganesh
5488aceda2 Merge "Expose Vendor Specific Headset Event Intent." 2010-10-25 16:43:41 -07:00
Gloria Wang
8fcb004423 Merge "resolved conflicts for merge of 9084631d to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-10-25 16:39:12 -07:00
Jaikumar Ganesh
4464292363 Merge "Make setting the adapter properties asynchronous." 2010-10-25 16:38:48 -07:00
Joe Malin
789d160add am 96bdc500: am 5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread 
Merge commit '96bdc500104c3e162495a9bfcf90799467e45c3d'

* commit '96bdc500104c3e162495a9bfcf90799467e45c3d':
  Doc Change: Revert NotePad sample test package
 2010-10-25 16:27:15 -07:00
Eric Fischer
e1c462eeba am b2ddeee2: (-s ours) am 3d1ce9ec: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit 'b2ddeee2d2a4151210a1a3b3cc8af90477fbee2b'

* commit 'b2ddeee2d2a4151210a1a3b3cc8af90477fbee2b':
  Import revised translations.  DO NOT MERGE
 2010-10-25 16:26:58 -07:00
Joe Malin
a9c0f059d3 am 5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread 
Merge commit '5016df1cface59b04ad59d0fef29ea32dcad8d60' into gingerbread-plus-aosp

* commit '5016df1cface59b04ad59d0fef29ea32dcad8d60':
  Doc Change: Revert NotePad sample test package
 2010-10-25 16:22:46 -07:00
Eric Fischer
98e7c51115 am 3d1ce9ec: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b' into gingerbread-plus-aosp

* commit '3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b':
  Import revised translations.  DO NOT MERGE
 2010-10-25 16:19:42 -07:00
Joe Malin
df6da5671f Merge "Doc Change: Revert NotePad sample test package" into gingerbread 2010-10-25 16:19:18 -07:00
Eric Fischer
e8eb0f2551 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-25 16:14:47 -07:00
Gloria Wang
172abbb311 resolved conflicts for merge of 9084631d to gingerbread-plus-aosp 
Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
 2010-10-25 16:11:18 -07:00
Mathias Agopian
639716736f fix eglChooseConfig() for special attributes. 
affects software renderer (emu) only.

per EGL spec:
  If EGL_MAX_PBUFFER_WIDTH, EGL_MAX_PBUFFER_HEIGHT,
  EGL_MAX_PBUFFER_PIXELS, or EGL_NATIVE_VISUAL_ID are specified
  in attrib list, then they are ignored

Change-Id: I3d5214ce896986da2f11d2eb1889afc41731eaa6
 2010-10-25 15:51:24 -07:00
Romain Guy
8b2c12dc47 Merge "Don't initialize the hw renderer without a valid surface. Bug #3054952" 2010-10-25 15:36:18 -07:00
Jean-Baptiste Queru
5ed12f734c Merge "frameworks/base: Handle null from topRunningNonDelayedActivityLocked" 2010-10-25 15:32:12 -07:00
Jeff Hamilton
66f2ffe158 am fecc5f06: am 106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbread 
Merge commit 'fecc5f066d7aa84ce3474912f1137a10bd77bb8e'

* commit 'fecc5f066d7aa84ce3474912f1137a10bd77bb8e':
  Add a RHS status bar slot for NFC.
 2010-10-25 14:56:34 -07:00
Jeff Hamilton
6c51bba99b am 106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbread 
Merge commit '106165b5102be226eb8049d2f7f62d7e26034e8a' into gingerbread-plus-aosp

* commit '106165b5102be226eb8049d2f7f62d7e26034e8a':
  Add a RHS status bar slot for NFC.
 2010-10-25 14:49:07 -07:00
Jeff Hamilton
0da22df98e Merge "Add a RHS status bar slot for NFC." into gingerbread 2010-10-25 14:46:45 -07:00
Adam Cohen
b4ebd7f1ea Merge "-> Fixing a bug where AdapterViewAnimator doesn't refresh correctly -> Reduced swipe threshold for StackView Change-Id: I0f04f45dade57f29581fe03fb195a6db5f12adb1" 2010-10-25 14:11:00 -07:00
Mike Lockwood
9ba289b492 am 6c8d8d89: am 8c32bddf: Merge "GPS: Disable verbose logging" into gingerbread 
Merge commit '6c8d8d8927373fdb9ad1c853396b5dbc8295f996'

* commit '6c8d8d8927373fdb9ad1c853396b5dbc8295f996':
  GPS: Disable verbose logging
 2010-10-25 14:00:38 -07:00
Mike Lockwood
aa4a1546de am 8c32bddf: Merge "GPS: Disable verbose logging" into gingerbread 
Merge commit '8c32bddfac259543f4ed87341fce42bc5ed60506' into gingerbread-plus-aosp

* commit '8c32bddfac259543f4ed87341fce42bc5ed60506':
  GPS: Disable verbose logging
 2010-10-25 13:55:27 -07:00
Mathias Agopian
d4a36d5102 am e1ca532d: am 457bed2b: Merge "fix [3123221] Video sticks playing back upside down following orientation switch" into gingerbread 
Merge commit 'e1ca532d72cbfacdce794f8bb4d439e609ec9871'

* commit 'e1ca532d72cbfacdce794f8bb4d439e609ec9871':
  fix [3123221] Video sticks playing back upside down following orientation switch
 2010-10-25 13:53:33 -07:00
Mathias Agopian
bb35a6322e am b4645353: am ce4d36ad: Merge "fix [3118445] Transform * Transform does not work as expected" into gingerbread 
Merge commit 'b4645353090f1bdd5cc1d4ab98feac7ccf966368'

* commit 'b4645353090f1bdd5cc1d4ab98feac7ccf966368':
  fix [3118445] Transform * Transform does not work as expected
 2010-10-25 13:53:26 -07:00
Daniel Sandler
7031fe2370 Merge "Swipe up to open the settings panel. Tap anywhere to close." 2010-10-25 13:52:42 -07:00
Mike Lockwood
c0c9d38170 Merge "GPS: Disable verbose logging" into gingerbread 2010-10-25 13:49:13 -07:00
Mathias Agopian
a7a8f05d8c am 457bed2b: Merge "fix [3123221] Video sticks playing back upside down following orientation switch" into gingerbread 
Merge commit '457bed2bc6561dd67429dde238453fee8602fa9b' into gingerbread-plus-aosp

* commit '457bed2bc6561dd67429dde238453fee8602fa9b':
  fix [3123221] Video sticks playing back upside down following orientation switch
 2010-10-25 13:38:15 -07:00
Mathias Agopian
46135ee9a3 am ce4d36ad: Merge "fix [3118445] Transform * Transform does not work as expected" into gingerbread 
Merge commit 'ce4d36ad729f83253d4c5ec9906148f45cc00f8e' into gingerbread-plus-aosp

* commit 'ce4d36ad729f83253d4c5ec9906148f45cc00f8e':
  fix [3118445] Transform * Transform does not work as expected
 2010-10-25 13:38:11 -07:00
Mathias Agopian
38e5c8ef89 Merge "fix [3123221] Video sticks playing back upside down following orientation switch" into gingerbread 2010-10-25 13:31:11 -07:00
Mathias Agopian
24b59dd299 Merge "fix [3118445] Transform * Transform does not work as expected" into gingerbread 2010-10-25 13:31:03 -07:00
Andreas Huber
c20fba51a0 Merge "We don't have access to the md5 implementation on the simulator, let's disable digest authentication in rtsp for simulator targets." 2010-10-25 13:13:04 -07:00
Gloria Wang
5a03d37295 Merge "DRM framework support: - add a sniffer for DRM files - add DRMSource and DRMExtractor for es_based DRM - add pread in FileSource.cpp for container_based DRM - add native DRM framework API calls in the player for DRM audio/video playback" 2010-10-25 12:23:35 -07:00
Adam Powell
d3abf6a4aa am 67bb6741: (-s ours) am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread 
Merge commit '67bb6741965c0b9f3bf6b4caf2647efc564e287e'

* commit '67bb6741965c0b9f3bf6b4caf2647efc564e287e':
  DO NOT MERGE Fix bug 3124899 - timeout in CTS test
 2010-10-25 12:13:56 -07:00
Marco Nelissen
92d5f0b191 Merge "Plumb KEYCODE_MEDIA_PAUSE and KEYCODE_MEDIA_PLAY up through the framework. b/2764237" 2010-10-25 12:10:01 -07:00
Vasu Nori
f11bd21294 Merge "increase sql statement printed in finalier warnings from 100 to 1000" 2010-10-25 12:08:46 -07:00
Vasu Nori
851876694b Merge "when printing cache-full warning, print the sql statements in cache" 2010-10-25 12:07:57 -07:00
Adam Powell
0b3b01a609 am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread 
Merge commit '17efcde161cbcbc0d98bf809036c5e640497f001' into gingerbread-plus-aosp

* commit '17efcde161cbcbc0d98bf809036c5e640497f001':
  DO NOT MERGE Fix bug 3124899 - timeout in CTS test
 2010-10-25 12:07:51 -07:00
Daniel Sandler
dc254d2d08 Merge "Fix drags from the shirt pocket" 2010-10-25 12:00:40 -07:00
Adam Powell
6ec561d0d9 Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread 2010-10-25 11:43:03 -07:00
Scott Main
909e507227 resolved conflicts for merge of 177b05d6 to master 
Change-Id: I21072a31a28d0e0ea242d1d4f81e5f5f657e6364
 2010-10-25 11:37:08 -07:00
Scott Main
e1da11ce8c am abb50f15: Merge "docs: fix a couple api links" into gingerbread 
Merge commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd' into gingerbread-plus-aosp

* commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd':
  docs: fix a couple api links
 2010-10-25 11:27:55 -07:00
Scott Main
9623583194 Merge "docs: fix a couple api links" into gingerbread 2010-10-25 11:18:28 -07:00