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

23739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 speciļ¬ed
  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
Adam Powell
71ff5d15b9 Merge "Fix ratingBarStyleSmall style in Holo theme." 2010-10-25 10:28:53 -07:00
Nick Pelly
894549908c am 4c8fda62: am 79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into gingerbread 
Merge commit '4c8fda62e1bf21318d22f4b85aaa1c729da976cf'

* commit '4c8fda62e1bf21318d22f4b85aaa1c729da976cf':
  Fixed NdefTag parcelable conversion methods.
 2010-10-25 09:24:41 -07:00
Wu-cheng Li
c51ff97014 am b877a54a: (-s ours) am 89821204: Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread 
Merge commit 'b877a54a27d5f8a4ccbde9ae548f8c416e4317e5'

* commit 'b877a54a27d5f8a4ccbde9ae548f8c416e4317e5':
  Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
 2010-10-25 09:24:33 -07:00
Nick Pelly
a6194e9111 am 79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into gingerbread 
Merge commit '79e76f52a6235c01aec64a978e33b89cbb9e1c2e' into gingerbread-plus-aosp

* commit '79e76f52a6235c01aec64a978e33b89cbb9e1c2e':
  Fixed NdefTag parcelable conversion methods.
 2010-10-25 09:09:37 -07:00
Wu-cheng Li
98da7c8078 am 89821204: Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread 
Merge commit '89821204379816f6bee6902c4f132c014700c3b0' into gingerbread-plus-aosp

* commit '89821204379816f6bee6902c4f132c014700c3b0':
  Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
 2010-10-25 09:09:26 -07:00
Nick Pelly
3fa1a714a9 Merge "Fixed NdefTag parcelable conversion methods." into gingerbread 2010-10-25 08:58:00 -07:00
Wu-cheng Li
e22a282c45 Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread 2010-10-25 08:55:54 -07:00
Leon Scroggins
b229afdc21 Merge "Provide strings for text selection options in WebView." 2010-10-25 06:25:24 -07:00
Steve Block
e51388dfbd Merge "Add a JNI method to determine which HTTP stack is in use" 2010-10-25 04:44:41 -07:00
Nick Pelly
20679c3398 am d6abaf32: am 145550a0: Merge "Document getPollBytes() and getActivationBytes()." into gingerbread 
Merge commit 'd6abaf326ba4e0ff342cf28a828b75a334beba69'

* commit 'd6abaf326ba4e0ff342cf28a828b75a334beba69':
  Document getPollBytes() and getActivationBytes().
 2010-10-24 22:16:39 -07:00
Nick Pelly
bbefc88e86 am 145550a0: Merge "Document getPollBytes() and getActivationBytes()." into gingerbread 
Merge commit '145550a00ea59ff20133acc95315e463628e16db' into gingerbread-plus-aosp

* commit '145550a00ea59ff20133acc95315e463628e16db':
  Document getPollBytes() and getActivationBytes().
 2010-10-24 22:11:52 -07:00
Nick Pelly
58b8f2ff51 Merge "Document getPollBytes() and getActivationBytes()." into gingerbread 2010-10-24 22:06:15 -07:00
Adam Powell
e22e25fe80 Merge "Fix bug 2964954 - Lists blow up if their adapter changes while detached." 2010-10-24 19:31:23 -07:00
Mathias Agopian
d3caac954c fix [3123221] Video sticks playing back upside down following orientation switch 
the overlay wasn't reconfigured when the screen-orientation changed. It was
only done when a parameter of the surface itself changed.

Change-Id: I0ca0925bf58ded4c91ab89d12cb1fe4d1477c96c
 2010-10-24 19:03:58 -07:00
Dianne Hackborn
7838968782 am c2f78020: am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s native method" into gingerbread 
Merge commit 'c2f78020d3887539fc90230d96465e4b1dc84d8e'

* commit 'c2f78020d3887539fc90230d96465e4b1dc84d8e':
  Fix issue #3126018: No way to specify NativeActivity's native method
 2010-10-24 18:42:12 -07:00
Dianne Hackborn
a207bdf4bc am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s native method" into gingerbread 
Merge commit '236568999411214ef440cabc6d12e3bf5f19d8f4' into gingerbread-plus-aosp

* commit '236568999411214ef440cabc6d12e3bf5f19d8f4':
  Fix issue #3126018: No way to specify NativeActivity's native method
 2010-10-24 18:38:11 -07:00