drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,894 Commits 1 Branch 0 Tags
Commit Graph

34894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Nelissen
760a5b7b8f 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
6db925001e Merge "increase sql statement printed in finalier warnings from 100 to 1000" 2010-10-25 12:08:46 -07:00
Vasu Nori
ba42fb3a25 Merge "when printing cache-full warning, print the sql statements in cache" 2010-10-25 12:07:57 -07:00
Marco Nelissen
a6face4d40 Plumb KEYCODE_MEDIA_PAUSE and KEYCODE_MEDIA_PLAY up through the framework. 
b/2764237

Change-Id: I9a20974fa0b7527230258f7d0bf829a031673a9d
 2010-10-25 12:07:07 -07:00
Daniel Sandler
23f2243088 Merge "Fix drags from the shirt pocket" 2010-10-25 12:00:40 -07:00
Vasu Nori
b73cf1cc39 increase sql statement printed in finalier warnings from 100 to 1000 
100 for sql statement seems too small for some apps (gmail is one example)

Change-Id: I4d29bffc0da5a854ca650d083b81df8769b35b77
 2010-10-25 11:55:56 -07:00
Vasu Nori
74fb2685e2 when printing cache-full warning, print the sql statements in cache 
this should help debug developers in idetifying the sql statements
taking up cache slots

Change-Id: Ibc0140c273adc5c8d58ab359d2c4d4ce14b6b63b
 2010-10-25 11:50:56 -07:00
Scott Main
dc28be1095 resolved conflicts for merge of 177b05d6 to master 
Change-Id: I21072a31a28d0e0ea242d1d4f81e5f5f657e6364
 2010-10-25 11:37:08 -07:00
Scott Main
177b05d614 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
abb50f1528 Merge "docs: fix a couple api links" into gingerbread 2010-10-25 11:18:28 -07:00
Adam Powell
f0a896b353 Merge "Fix ratingBarStyleSmall style in Holo theme." 2010-10-25 10:28:53 -07:00
Nick Pelly
98ce4a43a4 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
8262c7856e 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
4c8fda62e1 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
b877a54a27 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
79e76f52a6 Merge "Fixed NdefTag parcelable conversion methods." into gingerbread 2010-10-25 08:58:00 -07:00
Mathew Inwood
3986b4c2ad Fix ratingBarStyleSmall style in Holo theme. 
Bug: 3123746
Change-Id: Icbfd5e2fcae7c1668e243c1b03a62ab31f42126b
 2010-10-25 16:56:06 +01:00
Wu-cheng Li
8982120437 Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread 2010-10-25 08:55:54 -07:00
Sylvain Fonteneau
e2e4ea9ea8 Fixed NdefTag parcelable conversion methods. 
Also removed call to obsolete openTagConnection() method which was crashing.

Change-Id: Iffd46bd5cad877bb3a82ede298e65ae98322dca9
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-25 08:55:36 -07:00
Leon Scroggins
a8dc004aed Merge "Provide strings for text selection options in WebView." 2010-10-25 06:25:24 -07:00
Steve Block
16b7a1b967 Merge "Add a JNI method to determine which HTTP stack is in use" 2010-10-25 04:44:41 -07:00
Wu-cheng Li
d55f7e56b9 Mirror the camera preview if the camera is front-facing. 
bug:3095272
Change-Id: Ib1c1d1edc06a33e9d4d2dcb42bc1dd2c25b1310c
 2010-10-25 15:02:44 +08:00
Wu-cheng Li
994c02bbfe Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge 
Now overlay does flip before rotation.
bug:3114236
Change-Id: I1780e56154566435a0ceeb2f101de7ed0a0613cb
 2010-10-25 14:56:22 +08:00
Nick Pelly
197eee425c 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
d6abaf326b 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
145550a00e Merge "Document getPollBytes() and getActivationBytes()." into gingerbread 2010-10-24 22:06:15 -07:00
Nick Pelly
416d72f4b6 Document getPollBytes() and getActivationBytes(). 
No code change.

Change-Id: Ideb427b2684b9f9296abefb7c97eabc52db73ee0
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-24 22:03:04 -07:00
Adam Powell
b3b113a8be Merge "Fix bug 2964954 - Lists blow up if their adapter changes while detached." 2010-10-24 19:31:23 -07:00
Adam Powell
6a0d09944b Fix bug 2964954 - Lists blow up if their adapter changes while detached. 
If a list adapter's content changes while the ListView is detached
from a window, the data change is not registered and the next
layoutChildren call causes the ListView to detect a bad change that
the adapter did not notify ListView about. Any time a ListView becomes
attached to a window, has a valid adapter, and no attached data set
observer, treat it as a data set changed event.

Change-Id: Ic00c05a1a0d063399dc78d5d877e3d5f9b1bee16
 2010-10-24 19:30:18 -07:00
Dianne Hackborn
6ab84eeb0f 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
c2f78020d3 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
Dianne Hackborn
2365689994 Merge "Fix issue #3126018: No way to specify NativeActivity's native method" into gingerbread 2010-10-24 18:33:36 -07:00
Adam Powell
aa6110d840 Merge "Fix bug 3005359 - onListItemClick and ActionMode conflict" 2010-10-24 16:57:21 -07:00
Adam Powell
bf5f2b3ffe Fix bug 3005359 - onListItemClick and ActionMode conflict 
CHOICE_MODE_MULTIPLE_MODAL should not dispatch item click events
when in selection mode.

Change-Id: I664fdd01e5c5691ea6ad071bc36a9497fd97ce4d
 2010-10-24 16:47:34 -07:00
Adam Cohen
f333d22e4e Merge "Fixing the case of less than or equal to 5 items in StackView" 2010-10-24 15:35:23 -07:00
Jeff Brown
7631cbbed4 Add test stubs for newly added methods. 
Change-Id: I44139adebbbed1358f613fbcbfcddac6617ef5bd
 2010-10-24 15:25:53 -07:00
Dianne Hackborn
e21d91c694 Fix issue #3126018: No way to specify NativeActivity's native method 
Change-Id: I59de6a543e7f7f45d963a905829a3f56f32bf8cf
 2010-10-24 14:56:38 -07:00
Jeff Brown
3ae4ac8538 am 2ef36763: am 860c2df4: Merge "Add unit tests for native input and fix bugs identified." into gingerbread 
Merge commit '2ef36763700eff5679d6012e7f078c57f1a4c465'

* commit '2ef36763700eff5679d6012e7f078c57f1a4c465':
  Add unit tests for native input and fix bugs identified.
 2010-10-24 14:36:23 -07:00
Jeff Brown
2ef3676370 am 860c2df4: Merge "Add unit tests for native input and fix bugs identified." into gingerbread 
Merge commit '860c2df4132a2a0be9bcb0e91bfb7e79588c000f' into gingerbread-plus-aosp

* commit '860c2df4132a2a0be9bcb0e91bfb7e79588c000f':
  Add unit tests for native input and fix bugs identified.
 2010-10-24 14:31:41 -07:00
Joe Onorato
4761b176ed Merge "make the back (previous track) button into a cancel button." 2010-10-24 14:31:22 -07:00
Joe Onorato
bd5dba3571 make the back (previous track) button into a cancel button. 
Change-Id: Iab93a7d8bd722536fcc5a12ed3274bda3e92aaf6
 2010-10-24 14:29:01 -07:00
Jeff Brown
860c2df413 Merge "Add unit tests for native input and fix bugs identified." into gingerbread 2010-10-24 14:18:19 -07:00
Adam Cohen
96d8d56302 Fixing the case of less than or equal to 5 items in StackView 
Change-Id: I9226fe8343902e06e2f4b04837e232f1744786a8
 2010-10-24 14:15:14 -07:00
Adam Powell
a8cbdb9a9c Merge "Fix list dividers for holo" 2010-10-24 13:18:27 -07:00
Adam Powell
f876cc72c0 Fix list dividers for holo 
Change-Id: I7d5a8e735887d3c278dd8a559d9c85fb26f4eba5
 2010-10-24 13:17:15 -07:00
Chet Haase
715a89ebbf Merge "Fix Caches singleton to avoid resource leaks" 2010-10-24 12:35:07 -07:00
Chet Haase
dd78ccacff Fix Caches singleton to avoid resource leaks 
The declaration of Singleton objects must be in CPP files (not header
files) to avoid creating separate instances of what is supposedly a
single object.

Change-Id: Ie903384824a458b5572f3ce5b6cfb359c18a9c44
 2010-10-24 12:27:22 -07:00
Adam Powell
50ae1dc3a4 New assets for lists and buttons 
Change-Id: I289f2326cb9e21df963edfd7a6e8f951bdead732
 2010-10-24 12:08:22 -07:00
Joe Onorato
a2a764b9fa am b34fe2f0: am 60607a90: Make sure that when the screen is off, we don\'t try to turn the buttons on too. 
Merge commit 'b34fe2f0258eb1ed512b682206b7fe65116f1dbd'

* commit 'b34fe2f0258eb1ed512b682206b7fe65116f1dbd':
  Make sure that when the screen is off, we don't try to turn the buttons on too.
 2010-10-24 09:30:05 -07:00
Joe Onorato
b34fe2f025 am 60607a90: Make sure that when the screen is off, we don\'t try to turn the buttons on too. 
Merge commit '60607a9012c9b7d39bef8fcf0284772f1b061efc' into gingerbread-plus-aosp

* commit '60607a9012c9b7d39bef8fcf0284772f1b061efc':
  Make sure that when the screen is off, we don't try to turn the buttons on too.
 2010-10-24 09:25:49 -07:00