ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
20,013 Commits 2 Branches 0 Tags 54 MiB
392f707d3f
Commit Graph

20013 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cary Clark
392f707d3f am 3a6bfd4c: (-s ours) am ed101933: Merge "DO NOT MERGE -- copy on tapping outside of selected text in gmail" into gingerbread 
Merge commit '3a6bfd4cbf35343f5a784d9f970962becdeb0633'

* commit '3a6bfd4cbf35343f5a784d9f970962becdeb0633':
  DO NOT MERGE -- copy on tapping outside of selected text in gmail
 2010-08-26 15:52:24 -07:00
Joe Onorato
0e5eb83567 am 03b3de0f: am 00d1772d: am 797e688b: Continue trying to make the turn off quickly after call feature work. 
Merge commit '03b3de0faf7fe6b8e4bfbf828793767ac3e77a37'

* commit '03b3de0faf7fe6b8e4bfbf828793767ac3e77a37':
  Continue trying to make the turn off quickly after call feature work.
 2010-08-26 15:52:13 -07:00
Joe Onorato
fcdbed13ef am 8f0f1b1e: am 274ad982: Merge "Just disable widgets that come from apps on sd cards, because they don\'t work anyway." into gingerbread 
Merge commit '8f0f1b1e9defc61c2831e8856b18f2e00cfd789d'

* commit '8f0f1b1e9defc61c2831e8856b18f2e00cfd789d':
  Just disable widgets that come from apps on sd cards, because they don't work anyway.
 2010-08-26 15:52:07 -07:00
Joe Onorato
13472a3017 am 32982c70: am cc45381e: Merge "Fix typo that makes apps on sd work better with app widgets." into gingerbread 
Merge commit '32982c701cee6f73262200468419b80343a0bea7'

* commit '32982c701cee6f73262200468419b80343a0bea7':
  Fix typo that makes apps on sd work better with app widgets.
 2010-08-26 15:52:01 -07:00
Gilles Debunne
69f610ef09 am b318ef79: am 62dbd82a: Fix for IndexOutOfBounds in TextView getWordLimitsAt. 
Merge commit 'b318ef79d5018fdf492ba254438e2d9f1c0fff4c'

* commit 'b318ef79d5018fdf492ba254438e2d9f1c0fff4c':
  Fix for IndexOutOfBounds in TextView getWordLimitsAt.
 2010-08-26 15:51:56 -07:00
Eric Laurent
ccaf4e1ece am d0faf5a2: am c6d7a895: Merge "Changed type of reverb presets from int to short" into gingerbread 
Merge commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05'

* commit 'd0faf5a2dd892228bbfbf1e43aba95f60c6bca05':
  Changed type of reverb presets from int to short
 2010-08-26 15:51:37 -07:00
Adam Cohen
c7f89b0712 Merge "-> Added the ability to specify an AdapterView's empty view through RemoteViews. An empty view is the view that appears in lieu of the collection when the collection is empty. -> Made StackViews start at their last item" 2010-08-26 15:41:59 -07:00
Ben Dodson
3c502cd56d Merge "Updated documentation for upcoming fix for @code tags" 2010-08-26 15:27:15 -07:00
Andreas Huber
0143f6b61d Merge "Disable all the hardware decoders except for h.264 video decode, since the software decoders are faster." 2010-08-26 15:20:31 -07:00
Gilles Debunne
7e3f56abd8 Merge "resolved conflicts for merge of f309c7a8 to master" 2010-08-26 15:07:27 -07:00
Gilles Debunne
96ed8973b9 resolved conflicts for merge of f309c7a8 to master 
Change-Id: I80dfe8a0b142fa95fa83d46f3b60223c2991fce3
 2010-08-26 14:48:48 -07:00
Irfan Sheriff
830227f9b8 Merge "Add WifiStateMachine details for dump" 2010-08-26 14:43:49 -07:00
Jim Miller
e6b86d0c79 Merge "Fix 2797185: Integrate 3D RecentApps View into system." 2010-08-26 14:24:44 -07:00
Chet Haase
39c1357f8d Merge "Fix problems with early ending of Sequencer" 2010-08-26 14:20:01 -07:00
Guang Zhu
5b6547cde9 am fe8eaf3b: am 1c045003: Merge "add mouse up/down/click support in DumpRenderTree" into gingerbread 
Merge commit 'fe8eaf3b5dc52cecaf15ccabe9a8717cce701f6c'

* commit 'fe8eaf3b5dc52cecaf15ccabe9a8717cce701f6c':
  add mouse up/down/click support in DumpRenderTree
 2010-08-26 13:15:29 -07:00
Dianne Hackborn
cde9a8ab24 am efd05ea6: am 0a7f5fc4: Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 
Merge commit 'efd05ea69a53d73d2dacacd74f6a420cac8ef97b'

* commit 'efd05ea69a53d73d2dacacd74f6a420cac8ef97b':
  Fix issue #2951784: Launcher crashes on startup
 2010-08-26 13:15:21 -07:00
Eric Laurent
e071349af8 am 2db73305: am dfded35b: Merge "Added automated tests for reverb audio effect." into gingerbread 
Merge commit '2db7330578c1ac4466f4cbbf0f7723df6c2da305'

* commit '2db7330578c1ac4466f4cbbf0f7723df6c2da305':
  Added automated tests for reverb audio effect.
 2010-08-26 13:15:09 -07:00
James Dong
6187f4c307 am 9509a0ce: am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread 
Merge commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1'

* commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1':
  Make sure that timestamp does not go backward in MP4 file writer
 2010-08-26 13:15:00 -07:00
Banavathu, Srinivas Naik
132a019214 am eb182d78: am f3ee6f87: Telephony: Remove references to mExitECMRunnable object. 
Merge commit 'eb182d789df75be7a778a6264e658972af73800c'

* commit 'eb182d789df75be7a778a6264e658972af73800c':
  Telephony: Remove references to mExitECMRunnable object.
 2010-08-26 13:14:49 -07:00
Robert Greenwalt
dd3b909c7a am 4ea54f44: (-s ours) Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" into gingerbread-plus-aosp 
Merge commit '4ea54f442e6e5c0932bc0a1da8c932bb1c9ccb0b'

* commit '4ea54f442e6e5c0932bc0a1da8c932bb1c9ccb0b':
  Add an API to request route to an IPv6 host.
 2010-08-26 13:14:17 -07:00
Cary Clark
338d568a63 am ed101933: Merge "DO NOT MERGE -- copy on tapping outside of selected text in gmail" into gingerbread 
Merge commit 'ed101933ab7506d841d6eaa7bebda4b674c38088' into gingerbread-plus-aosp

* commit 'ed101933ab7506d841d6eaa7bebda4b674c38088':
  DO NOT MERGE -- copy on tapping outside of selected text in gmail
 2010-08-26 12:08:05 -07:00
Joe Onorato
acd9302e28 am 00d1772d: am 797e688b: Continue trying to make the turn off quickly after call feature work. 
Merge commit '00d1772d8cfb94066b757034055ac38897d161da' into gingerbread-plus-aosp

* commit '00d1772d8cfb94066b757034055ac38897d161da':
  Continue trying to make the turn off quickly after call feature work.
 2010-08-26 12:05:54 -07:00
Cary Clark
404860ee66 Merge "DO NOT MERGE -- copy on tapping outside of selected text in gmail" into gingerbread 2010-08-26 12:04:51 -07:00
Joe Onorato
059e073d52 am 797e688b: Continue trying to make the turn off quickly after call feature work. 
Merge commit '797e688b3bebbf1f50a8ad08528740b064f79153' into gingerbread

* commit '797e688b3bebbf1f50a8ad08528740b064f79153':
  Continue trying to make the turn off quickly after call feature work.
 2010-08-26 12:02:51 -07:00
Joe Onorato
4fdd5857bf am 274ad982: Merge "Just disable widgets that come from apps on sd cards, because they don\'t work anyway." into gingerbread 
Merge commit '274ad9824a20b61dfbb785621567fd0414a965a4' into gingerbread-plus-aosp

* commit '274ad9824a20b61dfbb785621567fd0414a965a4':
  Just disable widgets that come from apps on sd cards, because they don't work anyway.
 2010-08-26 11:55:10 -07:00
Joe Onorato
f3553da915 am cc45381e: Merge "Fix typo that makes apps on sd work better with app widgets." into gingerbread 
Merge commit 'cc45381e596c6d2b351d2c5e9d07f4113e1d58b6' into gingerbread-plus-aosp

* commit 'cc45381e596c6d2b351d2c5e9d07f4113e1d58b6':
  Fix typo that makes apps on sd work better with app widgets.
 2010-08-26 11:54:59 -07:00
Gilles Debunne
e0275057a4 am 62dbd82a: Fix for IndexOutOfBounds in TextView getWordLimitsAt. 
Merge commit '62dbd82aad0f84c88212566321e3fb370affaf7c' into gingerbread-plus-aosp

* commit '62dbd82aad0f84c88212566321e3fb370affaf7c':
  Fix for IndexOutOfBounds in TextView getWordLimitsAt.
 2010-08-26 11:52:44 -07:00
Joe Onorato
0b2976f5c6 Merge "Just disable widgets that come from apps on sd cards, because they don't work anyway." into gingerbread 2010-08-26 11:50:31 -07:00
Joe Onorato
0b97a51b75 Merge "Fix typo that makes apps on sd work better with app widgets." into gingerbread 2010-08-26 11:50:28 -07:00
Shimeng (Simon) Wang
b24337953c Merge "Restore zoom level when browser is restored." 2010-08-26 11:05:48 -07:00
Eric Laurent
71bf6ae80d am c6d7a895: Merge "Changed type of reverb presets from int to short" into gingerbread 
Merge commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d' into gingerbread-plus-aosp

* commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d':
  Changed type of reverb presets from int to short
 2010-08-26 11:04:01 -07:00
Gilles Debunne
198d280985 am 1b400c77: Merge "Fix for NPE in TextView." into gingerbread 
Merge commit '1b400c7763e63505bafd496953764c3e97c2be5b' into gingerbread-plus-aosp

* commit '1b400c7763e63505bafd496953764c3e97c2be5b':
  Fix for NPE in TextView.
 2010-08-26 11:01:34 -07:00
Eric Laurent
0e2410cb38 Merge "Changed type of reverb presets from int to short" into gingerbread 2010-08-26 11:01:06 -07:00
Gilles Debunne
26c7992743 Merge "Fix for NPE in TextView." into gingerbread 2010-08-26 10:58:58 -07:00
Guang Zhu
8e7d6be788 am 1c045003: Merge "add mouse up/down/click support in DumpRenderTree" into gingerbread 
Merge commit '1c045003788725b40af5489149ac0fc8bfebb1ea' into gingerbread-plus-aosp

* commit '1c045003788725b40af5489149ac0fc8bfebb1ea':
  add mouse up/down/click support in DumpRenderTree
 2010-08-26 10:52:27 -07:00
Dianne Hackborn
015125608b am 0a7f5fc4: Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 
Merge commit '0a7f5fc474182c58b478d8f9017209dcf8d0ca0b' into gingerbread-plus-aosp

* commit '0a7f5fc474182c58b478d8f9017209dcf8d0ca0b':
  Fix issue #2951784: Launcher crashes on startup
 2010-08-26 10:50:11 -07:00
Guang Zhu
0d6c2a6f01 Merge "add mouse up/down/click support in DumpRenderTree" into gingerbread 2010-08-26 10:49:19 -07:00
Dianne Hackborn
3d66e77ef3 Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 2010-08-26 10:47:48 -07:00
Eric Laurent
4fb3a6e0f1 am dfded35b: Merge "Added automated tests for reverb audio effect." into gingerbread 
Merge commit 'dfded35b3a5cb8eb57d47b750f3a4b0085fd3c0a' into gingerbread-plus-aosp

* commit 'dfded35b3a5cb8eb57d47b750f3a4b0085fd3c0a':
  Added automated tests for reverb audio effect.
 2010-08-26 10:19:23 -07:00
Eric Laurent
66f0eb4c10 Merge "Added automated tests for reverb audio effect." into gingerbread 2010-08-26 10:16:26 -07:00
James Dong
e1d522cc10 am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread 
Merge commit '318a759e3c24dd741f8959e2a433150ae88fb8d6' into gingerbread-plus-aosp

* commit '318a759e3c24dd741f8959e2a433150ae88fb8d6':
  Make sure that timestamp does not go backward in MP4 file writer
 2010-08-26 09:53:30 -07:00
James Dong
e4295dc132 Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread 2010-08-26 09:47:12 -07:00
Maksymilian Osowski
e5376223c9 Merge "Tweaked the logging + some minor style fixes." 2010-08-26 09:12:09 -07:00
Banavathu, Srinivas Naik
07048a6c5d am f3ee6f87: Telephony: Remove references to mExitECMRunnable object. 
Merge commit 'f3ee6f87a344b185d8bde12c77440c9020378510' into gingerbread-plus-aosp

* commit 'f3ee6f87a344b185d8bde12c77440c9020378510':
  Telephony: Remove references to mExitECMRunnable object.
 2010-08-26 09:02:33 -07:00
Robert Greenwalt
39729d08a2 Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-08-26 08:29:10 -07:00
Maksymilian Osowski
5ab48d53a3 Merge "Updated the script to include access log." 2010-08-26 08:01:58 -07:00
satok
4de0e77490 am 15edaceb: (-s ours) am 913a8925: DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread 
Merge commit '15edaceb2d46f18c32fb20a3d3dae556c1078bb6'

* commit '15edaceb2d46f18c32fb20a3d3dae556c1078bb6':
  DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
 2010-08-26 07:08:55 -07:00
satok
4b1d46ad79 am 913a8925: DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread 
Merge commit '913a8925c07e854a80bf5df87561f290d3a56d61' into gingerbread-plus-aosp

* commit '913a8925c07e854a80bf5df87561f290d3a56d61':
  DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
 2010-08-26 07:01:28 -07:00
Maksymilian Osowski
a7c533dc9f Merge "Added forwarding service." 2010-08-26 06:21:58 -07:00
Chung-yih Wang
2853a5fcf8 am cfc3e71e: am 0858806f: Add Wifi High Perf. mode during a call. 
Merge commit 'cfc3e71eae0c7f4f1b824b00d64cf268e646f702'

* commit 'cfc3e71eae0c7f4f1b824b00d64cf268e646f702':
  Add Wifi High Perf. mode during a call.
 2010-08-26 00:26:47 -07:00