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

18249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
164fa377d1 am 4fd41688: am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 
Merge commit '4fd416880e53c172bac4a51b2eafea699b58badf'

* commit '4fd416880e53c172bac4a51b2eafea699b58badf':
  docs: lots of additions to the resources docs
 2010-07-15 11:54:15 -07:00
James Dong
015fdae70f am b068b47c: am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread 
Merge commit 'b068b47c6d0214256116a0c661740bddf7acc18c'

* commit 'b068b47c6d0214256116a0c661740bddf7acc18c':
  Support user-supplied timescales for authoring
 2010-07-15 11:54:10 -07:00
Joe Onorato
815fe39328 am 92a47ea3: am 562124e8: Merge "Clean up some style in the makefiles." into gingerbread 
Merge commit '92a47ea3a7b82708e46c9d1710355f5e5fdd4f07'

* commit '92a47ea3a7b82708e46c9d1710355f5e5fdd4f07':
  Clean up some style in the makefiles.
 2010-07-15 11:54:00 -07:00
Joe Onorato
4894277c72 am a6be4e01: am 3a053db2: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread 
Merge commit 'a6be4e01b23610cbcc27c6f26cfa390beabfa1fe'

* commit 'a6be4e01b23610cbcc27c6f26cfa390beabfa1fe':
  The ICU data is no longer compiled directly into the shared library.
 2010-07-15 11:53:51 -07:00
Scott Main
69c3a5cddf am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 
Merge commit '5352d2378d2f92ebe0657e4caedb4498492fc404' into gingerbread-plus-aosp

* commit '5352d2378d2f92ebe0657e4caedb4498492fc404':
  docs: lots of additions to the resources docs
 2010-07-15 11:23:08 -07:00
Scott Main
5e22cd7219 am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 
Merge commit '38137d7a27b037611c70a9d900aa53b4c15563bf' into gingerbread

* commit '38137d7a27b037611c70a9d900aa53b4c15563bf':
  docs: lots of additions to the resources docs
 2010-07-15 11:20:32 -07:00
James Dong
f0ff0aa6b7 am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread 
Merge commit 'd6a85a21418338a7797bff731fa7a551f62a9e86' into gingerbread-plus-aosp

* commit 'd6a85a21418338a7797bff731fa7a551f62a9e86':
  Support user-supplied timescales for authoring
 2010-07-15 11:18:53 -07:00
Scott Main
a4e25ab1f3 Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 2010-07-15 11:16:32 -07:00
James Dong
13bea64393 Merge "Support user-supplied timescales for authoring" into gingerbread 2010-07-15 11:16:08 -07:00
Joe Onorato
87d49d86d8 am 562124e8: Merge "Clean up some style in the makefiles." into gingerbread 
Merge commit '562124e84d8ae63b614b14ba257680571091ef1f' into gingerbread-plus-aosp

* commit '562124e84d8ae63b614b14ba257680571091ef1f':
  Clean up some style in the makefiles.
 2010-07-15 11:12:57 -07:00
Joe Onorato
3efa627241 am 3a053db2: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread 
Merge commit '3a053db28451858162f3dd84f18fae2f245b07f1' into gingerbread-plus-aosp

* commit '3a053db28451858162f3dd84f18fae2f245b07f1':
  The ICU data is no longer compiled directly into the shared library.
 2010-07-15 11:12:53 -07:00
Joe Onorato
3736a71e56 Merge "checkpoint tablet status bar" 2010-07-15 11:09:04 -07:00
Joe Onorato
51b23cda38 Merge "Clean up some style in the makefiles." into gingerbread 2010-07-15 11:08:39 -07:00
Joe Onorato
72f26b73d2 Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread 2010-07-15 11:08:34 -07:00
Romain Guy
a812513c65 Merge "Added method getPreferredHttpHost" 2010-07-15 10:49:47 -07:00
Mike Lockwood
bec2b8a48b Merge "Remove our copy of the f_mtp.h kernel header, now that it is in bionic." 2010-07-15 10:41:17 -07:00
Jeff Brown
a903001e3c am d1313da5: am eb6e0df1: Don\'t build framework tests for simulator target. 
Merge commit 'd1313da5999e06be16e52527cfba443f66b333a1'

* commit 'd1313da5999e06be16e52527cfba443f66b333a1':
  Don't build framework tests for simulator target.
 2010-07-15 10:24:10 -07:00
Fabrice Di Meglio
b916f6f17f Merge "Fix bug #2793828 (Sync/visible setting on the phone should not affect what's visible on the web.)" 2010-07-15 10:23:31 -07:00
Jeff Brown
015b8a66db am eb6e0df1: Don\'t build framework tests for simulator target. 
Merge commit 'eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3' into gingerbread-plus-aosp

* commit 'eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3':
  Don't build framework tests for simulator target.
 2010-07-15 10:21:18 -07:00
Romain Guy
efa6e7060a Merge "Allow ListPreference summary to use entry" 2010-07-15 09:40:34 -07:00
Romain Guy
923b231245 Merge "Make HTTP Header class handle multiple cache-control fields." 2010-07-15 09:39:42 -07:00
Romain Guy
012a3c2908 Merge "Makes PhoneNumberUtils support international numbers after a CLIR command." 2010-07-15 09:39:19 -07:00
Mike Lockwood
98c133922f Merge "SQLiteDatabase: Add mechanism for registering custom sqlite3 functions" 2010-07-15 08:38:18 -07:00
Andrew Stadler
15b7c6ec30 am 521e9aa7: am c98e4311: am 468c82e4: Merge "Skip hostname verification when using insecure factory" into froyo 
Merge commit '521e9aa7523220c3dc48f6abd32fad6b76eea114'

* commit '521e9aa7523220c3dc48f6abd32fad6b76eea114':
  Skip hostname verification when using insecure factory
 2010-07-14 23:16:25 -07:00
Jeff Brown
a50ee3ecb3 Don't build framework tests for simulator target. 
Change-Id: I70f29c7eb307e4f3ec5702f4eb9d97b4342e2f36
 2010-07-14 22:55:02 -07:00
Andrew Stadler
d14dbcf75e am c98e4311: am 468c82e4: Merge "Skip hostname verification when using insecure factory" into froyo 
Merge commit 'c98e431119867dbc4ae3da52d5c374607c0f67b9' into gingerbread-plus-aosp

* commit 'c98e431119867dbc4ae3da52d5c374607c0f67b9':
  Skip hostname verification when using insecure factory
 2010-07-14 22:39:19 -07:00
Andrew Stadler
bce6e1736e am 468c82e4: Merge "Skip hostname verification when using insecure factory" into froyo 
Merge commit '468c82e4be0630de04a50d88602cd8c6bc745962' into gingerbread

* commit '468c82e4be0630de04a50d88602cd8c6bc745962':
  Skip hostname verification when using insecure factory
 2010-07-14 22:33:42 -07:00
Andrew Stadler
26582158a4 Merge "Skip hostname verification when using insecure factory" into froyo 2010-07-14 22:26:56 -07:00
Mathias Agopian
9382d111bb am c74034b6: am 24651682: added BinderService<> template to help creating native binder services 
Merge commit 'c74034b6bf0940dc80c4d4efa1e677ad0d2dfd6c'

* commit 'c74034b6bf0940dc80c4d4efa1e677ad0d2dfd6c':
  added BinderService<> template to help creating native binder services
 2010-07-14 20:18:50 -07:00
Mathias Agopian
a2d3f064be am 24651682: added BinderService<> template to help creating native binder services 
Merge commit '24651682edaf71e8a826f23a7ea09bc97c8072c4' into gingerbread-plus-aosp

* commit '24651682edaf71e8a826f23a7ea09bc97c8072c4':
  added BinderService<> template to help creating native binder services
 2010-07-14 20:16:27 -07:00
Mathias Agopian
0204112e94 am 78983a91: am 4055b780: Merge "move native services under services/" into gingerbread 
Merge commit '78983a9133d3dd3f08b1ec462a7e2f9e7bfa9e2f'

* commit '78983a9133d3dd3f08b1ec462a7e2f9e7bfa9e2f':
  move native services under services/
 2010-07-14 18:48:58 -07:00
Mathias Agopian
76648df37d am 4055b780: Merge "move native services under services/" into gingerbread 
Merge commit '4055b780bb7e85abcf4754b84e50bf407c45bec8' into gingerbread-plus-aosp

* commit '4055b780bb7e85abcf4754b84e50bf407c45bec8':
  move native services under services/
 2010-07-14 18:45:56 -07:00
Mathias Agopian
a1e6bc864f added BinderService<> template to help creating native binder services 
Change-Id: Id980899d2647b56479f8a27c89eaa949f9209dfe
 2010-07-14 18:43:19 -07:00
Mathias Agopian
ada17246d3 Merge "move native services under services/" into gingerbread 2010-07-14 18:42:54 -07:00
Guang Zhu
20866e9982 Merge "add a paramter to control page-load-termination-on-JS-error" 2010-07-14 18:15:46 -07:00
Mathias Agopian
81bac09fa6 move native services under services/ 
moved surfaceflinger, audioflinger, cameraservice

all native services should now reside in this location.

Change-Id: Iee42b83dd2a94c3bf5107ab0895fe2dfcd5337a8
 2010-07-14 17:59:35 -07:00
Dianne Hackborn
8b155caed4 am 0a48a1f3: am ed86eaa7: Merge "Argh oops I didn\'t mean to delete this." into gingerbread 
Merge commit '0a48a1f31dcfb152c166ff5621942c950f8cca72'

* commit '0a48a1f31dcfb152c166ff5621942c950f8cca72':
  Argh oops I didn't mean to delete this.
 2010-07-14 17:42:52 -07:00
Jim Miller
c80df295a5 resolved conflicts for merge of e03952c0 to master 
Change-Id: I414d934101d452a2c2500e539f0b0aff1e1b3ff0
 2010-07-14 17:21:00 -07:00
Dianne Hackborn
fddb4b4caa am ed86eaa7: Merge "Argh oops I didn\'t mean to delete this." into gingerbread 
Merge commit 'ed86eaa7301d5509bce38dffce3f8ef11e4e4cd0' into gingerbread-plus-aosp

* commit 'ed86eaa7301d5509bce38dffce3f8ef11e4e4cd0':
  Argh oops I didn't mean to delete this.
 2010-07-14 17:04:58 -07:00
Dianne Hackborn
134d67be4d Merge "Argh oops I didn't mean to delete this." into gingerbread 2010-07-14 17:02:49 -07:00
Jim Miller
0fc236e135 am 9d42c7f7: Merge "Fix 2797185: Re-enable thumbnail generation in framework" into gingerbread 
Merge commit '9d42c7f75cfd7544d6e3f253cedf9ac983fdc6b2' into gingerbread-plus-aosp

* commit '9d42c7f75cfd7544d6e3f253cedf9ac983fdc6b2':
  Fix 2797185: Re-enable thumbnail generation in framework
 2010-07-14 17:02:36 -07:00
Jim Miller
e69032ffc6 Merge "Fix 2797185: Re-enable thumbnail generation in framework" into gingerbread 2010-07-14 16:59:52 -07:00
Dianne Hackborn
9cc52fe9e4 am 7417ae93: am ccc77328: Merge "Remove old glue code." into gingerbread 
Merge commit '7417ae9354e10971c0b5d41dc9194fab17b80ea1'

* commit '7417ae9354e10971c0b5d41dc9194fab17b80ea1':
  Remove old glue code.
 2010-07-14 16:51:33 -07:00
Dianne Hackborn
d30f245680 am ccc77328: Merge "Remove old glue code." into gingerbread 
Merge commit 'ccc77328da66436010f3bca000c4b4665270500a' into gingerbread-plus-aosp

* commit 'ccc77328da66436010f3bca000c4b4665270500a':
  Remove old glue code.
 2010-07-14 16:49:05 -07:00
Dianne Hackborn
55bee1541a Merge "Remove old glue code." into gingerbread 2010-07-14 16:46:37 -07:00
Mathias Agopian
d10f9fbc39 am db386f2c: am c9a11088: Merge "first step at implementing the native sensor support" into gingerbread 
Merge commit 'db386f2c263c6e9e4b825d4c9a320849f8f2c916'

* commit 'db386f2c263c6e9e4b825d4c9a320849f8f2c916':
  first step at implementing the native sensor support
 2010-07-14 16:39:55 -07:00
Mathias Agopian
58736b5a19 am 98704f14: am 38eea8bf: Merge "Remove the YV16 format for simplicity\'s sake." into gingerbread 
Merge commit '98704f14eaeef6c9bcb73fea162f4941dd9bbd87'

* commit '98704f14eaeef6c9bcb73fea162f4941dd9bbd87':
  Remove the YV16 format for simplicity's sake.
 2010-07-14 16:39:42 -07:00
Adam Powell
e4bb6d2692 Merge "Bug 2841148 - Add accessors for action bar context mode state." 2010-07-14 16:39:04 -07:00
Mathias Agopian
5078529ef0 am c9a11088: Merge "first step at implementing the native sensor support" into gingerbread 
Merge commit 'c9a11088e503b9e3ae52a3f671b2d21f5cd54f06' into gingerbread-plus-aosp

* commit 'c9a11088e503b9e3ae52a3f671b2d21f5cd54f06':
  first step at implementing the native sensor support
 2010-07-14 16:36:19 -07:00
Mathias Agopian
c649fb1cc1 am 38eea8bf: Merge "Remove the YV16 format for simplicity\'s sake." into gingerbread 
Merge commit '38eea8bf990540360b45b963195a7766c30b55d2' into gingerbread-plus-aosp

* commit '38eea8bf990540360b45b963195a7766c30b55d2':
  Remove the YV16 format for simplicity's sake.
 2010-07-14 16:35:55 -07:00