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

19754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
c6655ffd8a am 11dba787: Merge "Fix build (broken documentation link)" 
* commit '11dba787e10ff5ddc27e834db42acefa33cd35be':
  Fix build (broken documentation link)
 2010-11-17 17:56:00 -08:00
Jean-Baptiste Queru
5f17185a76 Merge "Fix build (broken documentation link)" 2010-11-17 17:41:22 -08:00
Jean-Baptiste Queru
af10976583 am a15e4886: Merge "Framebuffer: Support variable number of framebuffers in the UI" 
* commit 'a15e4886de8f75f3cb137f51743d330414c910e8':
  Framebuffer: Support variable number of framebuffers in the UI
 2010-11-17 17:29:48 -08:00
Jean-Baptiste Queru
d5b427b709 am 09e50cdb: Merge "Reorder lock acquision vs try." 
* commit '09e50cdbc62938b178f4c9a66b3cec8a466daaa8':
  Reorder lock acquision vs try.
 2010-11-17 17:16:06 -08:00
Jean-Baptiste Queru
90ea001a09 Merge "Framebuffer: Support variable number of framebuffers in the UI" 2010-11-17 17:15:42 -08:00
Jean-Baptiste Queru
a7011da1f7 Merge "Reorder lock acquision vs try." 2010-11-17 17:03:10 -08:00
Jean-Baptiste Queru
a7dda98df7 Merge "resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-11-17 16:52:56 -08:00
Jean-Baptiste Queru
8ff8a2d029 resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp 
Change-Id: I938c0a66ad4271b33626d6b12406a2f6c6d1b6d8
 2010-11-17 16:47:59 -08:00
Dirk Dougherty
a25a6835e7 am fc1f5e24: doc change: update uses-feature for gingerbread. 
* commit 'fc1f5e24bcd678a08221c8c01a364807edca6daf':
  doc change: update uses-feature for gingerbread.
 2010-11-17 16:20:59 -08:00
Jean-Baptiste Queru
3bffa0529c Merge "Added buildQuery and buildUnionSubQuery methods without misleading selectionArgs parameter." 2010-11-17 15:10:05 -08:00
Dianne Hackborn
ae1f9dce70 am 05434e9f: Final API 9. Really! Honestly! I hope. 
* commit '05434e9fa7a6ec844611bbd154c4a3eceafec538':
  Final API 9.  Really!  Honestly!  I hope.
 2010-11-16 17:49:07 -08:00
Brad Fitzpatrick
ce3408965f am 383e95e2: Merge "DropBox: Read until the end of stream has been reached" 
* commit '383e95e245ceb87a2a6ad6422404ce641f0e08eb':
  DropBox: Read until the end of stream has been reached
 2010-11-16 09:37:56 -08:00
Brad Fitzpatrick
4a8dad92bb Merge "DropBox: Read until the end of stream has been reached" 2010-11-16 09:22:31 -08:00
Xia Wang
4f5ba34a57 am d0a8f54a: Merge "Add Wi-Fi connection functional tests." into gingerbread 
* commit 'd0a8f54a5bcd6a10eaaa88d888c3cbb83869532c':
  Add Wi-Fi connection functional tests.
 2010-11-16 09:16:54 -08:00
Xia Wang
7da37c0bdd Merge "Add Wi-Fi connection functional tests." into gingerbread 2010-11-16 09:14:46 -08:00
Mathias Agopian
83da32bb74 am 305bc0fe: Merge "Fix a race condition in sensormanager" into gingerbread 
* commit '305bc0fe977f6197bfae847dbaf58916cf8980ba':
  Fix a race condition in sensormanager
 2010-11-15 13:19:46 -08:00
Mathias Agopian
fc2aa31e63 am 9e291a4b: Merge "Revert "allow all 4 orientations"" into gingerbread 
* commit '9e291a4b9922719165145434217e100e2118860d':
  Revert "allow all 4 orientations"
 2010-11-15 13:19:43 -08:00
Mathias Agopian
038d998774 Merge "Fix a race condition in sensormanager" into gingerbread 2010-11-15 13:14:59 -08:00
Mathias Agopian
ce6ef64c5b Merge "Revert "allow all 4 orientations"" into gingerbread 2010-11-15 13:14:50 -08:00
Justin Ho
623d4d5251 am 868889fb: Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread 
* commit '868889fb4175979ef9aa505fc746bf616f54ed10':
  DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware.
 2010-11-15 09:13:16 -08:00
Justin Ho
d7c7bb65e7 Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread 2010-11-15 09:10:33 -08:00
Justin Ho
71dd0387c2 am a5c4aeba: Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread 
* commit 'a5c4aeba1cb53775bdb5622569ffe53641f4728d':
  DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)
 2010-11-15 08:53:56 -08:00
Justin Ho
793bd745e3 Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread 2010-11-15 08:50:19 -08:00
Megha Joshi
561c3ae486 am e2ef2c10: Fixing build (DO NOT MERGE) 
* commit 'e2ef2c10e76a4648a27ce4c392eb7b9b3589b9f7':
  Fixing build (DO NOT MERGE)
 2010-11-12 19:13:35 -08:00
Megha Joshi
602ae138da am 48c698fc: Adding NFC sample resources (DO NOT MERGE) 
* commit '48c698fc1497a01743f9ce5ab6fb8f6700847259':
  Adding NFC sample resources (DO NOT MERGE)
 2010-11-12 18:46:38 -08:00
Scott Main
e7d586668c am d6b9d078: Merge "docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;" into gingerbread 
* commit 'd6b9d078ecf1b4d7cc57375830cf2ce390fc893c':
  docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;
 2010-11-11 17:02:54 -08:00
Scott Main
20fd8e71ab Merge "docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;" into gingerbread 2010-11-11 16:56:19 -08:00
Eric Fischer
5cd36d686e am 3082e5fe: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '3082e5fed04c42301c89de8df36e9d62f0937dec':
  Import revised translations.  DO NOT MERGE
 2010-11-11 15:49:03 -08:00
Eric Fischer
ed89fde066 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-11-11 15:44:04 -08:00
Mathias Agopian
0a06765508 am fcab475c: Merge "record the last event received regardless of having clients or not" into gingerbread 
* commit 'fcab475c906da5c159bc56a32c2610f6f55eafd9':
  record the last event received regardless of having clients or not
 2010-11-11 14:49:35 -08:00
Mathias Agopian
4732dee8a8 Merge "record the last event received regardless of having clients or not" into gingerbread 2010-11-11 14:44:08 -08:00
Scott Main
28ab211dab am dfb12218: docs: revise adding components with info about platform-tools 
* commit 'dfb122180c7028764136ac3a4fa07104f601de84':
  docs: revise adding components with info about platform-tools
 2010-11-11 11:00:44 -08:00
Amith Yamasani
b92039e82b am db65907a: Merge "Adding pan behavior on preference dialog." 
* commit 'db65907a2148f053e51f941979f0f7694acd5923':
  Adding pan behavior on preference dialog.
 2010-11-11 09:06:02 -08:00
Amith Yamasani
2d79e36cd1 Merge "Adding pan behavior on preference dialog." 2010-11-11 08:50:52 -08:00
John Wang
6e3ab4c9c4 am fac4a689: Merge "Fix the audio mode glitch during hangup." into gingerbread 
* commit 'fac4a689f86b0d46a2c76cec0a6ce2f4bac2a22a':
  Fix the audio mode glitch during hangup.
 2010-11-10 19:28:31 -08:00
John Wang
b629c885d0 Merge "Fix the audio mode glitch during hangup." into gingerbread 2010-11-10 19:11:20 -08:00
Dianne Hackborn
543ccefc88 am 34594e75: Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread 
* commit '34594e75e4a7962840f34c0b57116ecf1497f118':
  Fix issue #3177284: Account for wake lock power usage on Crespo
 2010-11-10 18:01:21 -08:00
Dianne Hackborn
bb356a2721 Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread 2010-11-10 17:58:28 -08:00
Jeff Brown
86ec841f92 am 00e5dd44: Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread 
* commit '00e5dd44f6d014fff8c65b9c718f5641f5eae4bb':
  Fix JNI reference leak in NativeActivity. (DO NOT MERGE)
 2010-11-10 16:04:13 -08:00
Jeff Brown
82a517475a Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread 2010-11-10 16:00:37 -08:00
Scott Main
bbea7710b7 am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread 
* commit '77f5c9542e159cb9f2f2908227212d4add8ce74c':
  docs: remove "new" tags from sample apps
 2010-11-10 14:55:48 -08:00
Scott Main
ee6ceed44a resolved conflicts for merge of 5a726729 to gingerbread 
Change-Id: I6060f31c45d49dfe4dbda52836150311b8992b15
 2010-11-10 14:46:44 -08:00
Mathias Agopian
a8422af09e am 17fd21fc: Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread 
* commit '17fd21fc0638d8734867b6f189efbabb227f3ae1':
  DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions
 2010-11-10 14:15:57 -08:00
Mathias Agopian
70745094cc Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread 2010-11-10 14:09:17 -08:00
Brad Fitzpatrick
3c978c6f67 am 9de93424: Merge "Without SD card the shutdown sequence was delayed" 
* commit '9de93424cc05446e3a216f406c55a3937c028416':
  Without SD card the shutdown sequence was delayed
 2010-11-10 11:07:18 -08:00
Scott Main
badf9397e3 am f4724cdd: Merge "docs: update eclipse guide for eclipse 3.6 also update system requirements" into gingerbread 
* commit 'f4724cdd0b39eddb14a686ecaec05ff44258a7f7':
  docs: update eclipse guide for eclipse 3.6 also update system requirements
 2010-11-10 10:59:45 -08:00
Brad Fitzpatrick
dfa88ec75b Merge "Without SD card the shutdown sequence was delayed" 2010-11-10 10:58:50 -08:00
Scott Main
cfc1ecf6da Merge "docs: update eclipse guide for eclipse 3.6 also update system requirements" into gingerbread 2010-11-10 10:46:36 -08:00
Owen Lin
110d8738e5 am 45ca778d: Merge "Make sure the controller will get repositioned after size changing." into gingerbread 
* commit '45ca778d8ed90aff3f72fc85f806cedbd4121cc1':
  Make sure the controller will get repositioned after size changing.
 2010-11-10 08:25:02 -08:00
Owen Lin
409a974bdd Merge "Make sure the controller will get repositioned after size changing." into gingerbread 2010-11-09 19:02:23 -08:00