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

33333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Fitzpatrick
38051bc018 am 6a15f0d7: am 6275dbbe: Merge "Quiet unnecessary debug logging." into gingerbread 
Merge commit '6a15f0d7c7ed74e086f4d3a7014ed724a2b18023'

* commit '6a15f0d7c7ed74e086f4d3a7014ed724a2b18023':
  Quiet unnecessary debug logging.
 2010-10-10 11:16:16 -07:00
Andreas Huber
72662b1abe am 45bd1159: am 02654f01: Merge "On this particular device the hardware video decoder spits out buffers that don\'t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread 
Merge commit '45bd1159fa34b51ba077e0cde760d171ca092552'

* commit '45bd1159fa34b51ba077e0cde760d171ca092552':
  On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
 2010-10-10 11:16:01 -07:00
Kenny Root
7a2eff1fc7 am c0c2076e: am e0c5ae7b: Merge "Eliminate MCS_GIVE_UP state" into gingerbread 
Merge commit 'c0c2076e9a4dfd3b30b988d4ddd78abf9ed83166'

* commit 'c0c2076e9a4dfd3b30b988d4ddd78abf9ed83166':
  Eliminate MCS_GIVE_UP state
 2010-10-10 11:15:44 -07:00
Gilles Debunne
441d198023 am 5e3329b5: am e86a6b2a: Merge "Removed unused and broken screen_progress" into gingerbread 
Merge commit '5e3329b5fac117ed49c9c3ca2919a4b1533612c4'

* commit '5e3329b5fac117ed49c9c3ca2919a4b1533612c4':
  Removed unused and broken screen_progress
 2010-10-10 11:15:28 -07:00
Brad Fitzpatrick
71ce18b0b7 am b8d40d26: am 30f5c8fe: More DropBoxManager javadoc love. 
Merge commit 'b8d40d263bc18d1defc1e6980e8f922df8f8f321'

* commit 'b8d40d263bc18d1defc1e6980e8f922df8f8f321':
  More DropBoxManager javadoc love.
 2010-10-10 11:15:12 -07:00
Brad Fitzpatrick
ceda3a972c am 992a9e50: am fd124570: Merge "DropBox.Entry javadoc syntax fix" into gingerbread 
Merge commit '992a9e507fb1f8da7358b4d805c034d934eb1810'

* commit '992a9e507fb1f8da7358b4d805c034d934eb1810':
  DropBox.Entry javadoc syntax fix
 2010-10-10 11:14:56 -07:00
Kenny Root
3aa837cc0f am c296f22e: am 0145e36c: Revert "Only allow 8 OBBs to be mounted by a UID" 
Merge commit 'c296f22e713257271f95c2115df9e13d05d5687a'

* commit 'c296f22e713257271f95c2115df9e13d05d5687a':
  Revert "Only allow 8 OBBs to be mounted by a UID"
 2010-10-10 11:14:31 -07:00
Jean-Baptiste Queru
264c2cfe4d resolved conflicts for merge of 5df4b5a7 to master 
Change-Id: Ib1ed63f79c4a094b1d4ba8ba74ee2bd68a35bfd2
 2010-10-10 11:09:45 -07:00
James Dong
6fcd10bf4c Merge "0-memcpy video recording framework" 2010-10-10 10:01:31 -07:00
Eric Rowe
d206c874cf am 82aacdde: (-s ours) am f8d2acdc: Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread 
Merge commit '82aacddef99e5cfc399d02702f2a336af8fbd59f'

* commit '82aacddef99e5cfc399d02702f2a336af8fbd59f':
  DO NOT MERGE Initialize bluetooth profiles in BT stress tests
 2010-10-10 09:09:20 -07:00
Wink Saville
3201b398d1 am 2e99245e: am bbc80d34: Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread 
Merge commit '2e99245e0e0d64ba6ab9227154c7fad132559c01'

* commit '2e99245e0e0d64ba6ab9227154c7fad132559c01':
  Changed handling of onQueryCompelete to not use mimeType.
 2010-10-10 09:08:55 -07:00
James Dong
997eaa2c7c 0-memcpy video recording framework 
Part III: Move startRecording() call earlier, asking camera hal
to allocate video buffers before CameraSource.start() is called.

Change-Id: I3f1d7d5636ca2644fe52af61f297d48c6b1ce89d
 2010-10-09 01:21:20 -07:00
Stephen Hines
4c0c81a307 Merge "Remove pragma for RS export variables." 2010-10-09 00:21:56 -07:00
Romain Guy
c4e43d80b3 Merge "Move GenerationCache to the utils directory." 2010-10-08 18:47:45 -07:00
Romain Guy
21b028a44f Move GenerationCache to the utils directory. 
Change-Id: I210ffa8f1d76a102bb7d971c649c20a74d03fbe6
 2010-10-08 18:44:56 -07:00
James Dong
7ea6ebe73a Merge "Move Camera specific logic out from StagefrightRecorder to CameraSource" 2010-10-08 18:39:13 -07:00
Romain Guy
b154dfe757 Merge "Don't update 9patches on every frame." 2010-10-08 18:39:04 -07:00
Romain Guy
2728f96161 Don't update 9patches on every frame. 
Change-Id: I7ffb2365f83e0453e7d0a0cdcb3fc9308b305238
 2010-10-08 18:36:57 -07:00
James Dong
0c128b67f0 Move Camera specific logic out from StagefrightRecorder to CameraSource 
o updated comments and streamlined the logic in
  checkVideoSize() and checkFrameRate() as suggested

Change-Id: I49d04ac7998d4a215997aa63555dfb6e814e38d3
 2010-10-08 18:32:43 -07:00
Wu-cheng Li
e1199e382f am 9df14085: am 29332971: Merge "Add javadoc for display orientation." into gingerbread 
Merge commit '9df140851375a977ad99390d71edf8b4a8382fd4'

* commit '9df140851375a977ad99390d71edf8b4a8382fd4':
  Add javadoc for display orientation.
 2010-10-08 18:28:38 -07:00
Hung-ying Tyan
c7e4b2d5bb am 841d6ff9: am 62ec9834: Merge "Make SipService broadcast SIP_SERVICE_UP when it\'s up." into gingerbread 
Merge commit '841d6ff9e05daccbc60daa1618a27e9db3a4fb32'

* commit '841d6ff9e05daccbc60daa1618a27e9db3a4fb32':
  Make SipService broadcast SIP_SERVICE_UP when it's up.
 2010-10-08 18:28:20 -07:00
Adam Powell
d856b1ce92 resolved conflicts for merge of 86b50028 to master 
Change-Id: I3468e67ac17f861c5491717337c27cd49bd5287e
 2010-10-08 18:23:49 -07:00
Stephen Hines
5a6d7ac2bd Remove pragma for RS export variables. 
Change-Id: Icfd958e8212843f4f1a6b64dd43ce63e09d00d7c
 2010-10-08 18:12:51 -07:00
Dianne Hackborn
ca33268ef8 am 18e225b4: am bfba7cab: Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback 
Merge commit '18e225b42b77c48efa63f245a4137c5f74302e26'

* commit '18e225b42b77c48efa63f245a4137c5f74302e26':
  Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback
 2010-10-08 17:59:52 -07:00
Eric Fischer
c400cbb45d am 7778173a: (-s ours) am 70f1a3b8: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '7778173a32edcfccdcc31407169d2ec40916ca2f'

* commit '7778173a32edcfccdcc31407169d2ec40916ca2f':
  Import revised translations.  DO NOT MERGE
 2010-10-08 17:59:33 -07:00
Xavier Ducrohet
79d433dd87 am 556866a2: am 656d2165: Merge "Parser is optional in obtainStyledAttributes." into gingerbread 
Merge commit '556866a2ea1f4758a79fe4f207153b71815ed400'

* commit '556866a2ea1f4758a79fe4f207153b71815ed400':
  Parser is optional in obtainStyledAttributes.
 2010-10-08 17:59:13 -07:00
Hung-ying Tyan
1d8db8a0a8 am 909a974f: am 16c29bd7: Merge "SIP: Fix busy authentication loop." into gingerbread 
Merge commit '909a974f8e5df4b6fc2cf8de6c64633406095c6e'

* commit '909a974f8e5df4b6fc2cf8de6c64633406095c6e':
  SIP: Fix busy authentication loop.
 2010-10-08 17:58:55 -07:00
Dianne Hackborn
d7dccd2611 am 55f1b0b8: am 9d6824cd: Merge "Make Activity.removeDialog() less strict." into gingerbread 
Merge commit '55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f'

* commit '55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f':
  Make Activity.removeDialog() less strict.
 2010-10-08 17:58:35 -07:00
Kenny Root
682d143dec am 6ed0cfd3: am 5919ac6b: OBB: track binder death observers 
Merge commit '6ed0cfd3e798e3014c9f1099631249463d25140c'

* commit '6ed0cfd3e798e3014c9f1099631249463d25140c':
  OBB: track binder death observers
 2010-10-08 17:58:15 -07:00
Kenny Root
06f89ca9b1 am 36455d03: am a3ee5c03: Merge "Add MountService tests and fix a bug it found" into gingerbread 
Merge commit '36455d03256024981b1bf21557722a010b5e092a'

* commit '36455d03256024981b1bf21557722a010b5e092a':
  Add MountService tests and fix a bug it found
 2010-10-08 17:57:55 -07:00
Dianne Hackborn
fa9921e4bc am e89bf502: am ef083ec0: Merge "Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread 
Merge commit 'e89bf50261902bf263887923bf95595ec8eae069'

* commit 'e89bf50261902bf263887923bf95595ec8eae069':
  Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
 2010-10-08 17:57:35 -07:00
Gilles Debunne
82c52ee738 am f960718c: (-s ours) am 1ae32bfe: New assets for buttons and notification 
Merge commit 'f960718c1c02186746873ec4a669028bb8ea9d94'

* commit 'f960718c1c02186746873ec4a669028bb8ea9d94':
  New assets for buttons and notification
 2010-10-08 17:57:16 -07:00
Dianne Hackborn
13d31e0162 am cef38339: am 6d44456d: Merge "Make USB mass storage hide keyguard when shown." into gingerbread 
Merge commit 'cef38339e7d0af61783ad6d35793e2496f5a2b37'

* commit 'cef38339e7d0af61783ad6d35793e2496f5a2b37':
  Make USB mass storage hide keyguard when shown.
 2010-10-08 17:45:08 -07:00
Adam Powell
54ca811b29 Merge "Fix alert dialog layout size in landscape" 2010-10-08 17:10:24 -07:00
Chung-yih Wang
7ff6f97f84 resolved conflicts for merge of 4790a2e2 to master 
Change-Id: I659ccd9a51e24f217f715178a98eaf6592c258d7
 2010-10-09 08:07:55 +08:00
Adam Powell
4fb17b0490 Fix alert dialog layout size in landscape 
Change-Id: Iff5c388655c357e78c0c0e98d718fb7601c2d543
 2010-10-08 17:04:39 -07:00
Jason Chen
39b4867d48 Revert "Merge "Allow notifications to not specify a contentIntent."" 
This reverts commit 8885321046622d6a8c0a4214af98dc27eecd48a0, reversing
changes made to 61b8aaadd742f0be708cd37971d2c9e822bf778a.
 2010-10-08 16:22:53 -07:00
Romain Guy
1cb9465372 Merge "Better cache for layers, reduce memory usage and increase framerate." 2010-10-08 15:52:02 -07:00
Romain Guy
8550c4c7b5 Better cache for layers, reduce memory usage and increase framerate. 
Change-Id: I5ff864a361db4791bd5ff6be716f7ce692ef572d
 2010-10-08 15:49:53 -07:00
Amith Yamasani
0594476ffa SearchView: Add some more listeners, IME dismiss improvements and focus control. 
Addresses following bugs:
3067611 : Submit button incorrectly displayed
3064371 : Callback to report suggestion click
3008580 : Setting initial focus

The SearchView will take initial focus now, reverting an earlier change. If
you don't want it to take initial focus, then you must requestFocus on a
different view on launching the activity, since the initial focus is desirable
in other cases. This is normal behavior for all EditText widgets and SearchView
shouldn't have a different behavior.
 2010-10-08 15:49:37 -07:00
Mike Dodd
9568a5ab2e Merge "HardwareRenderer: When throwing an exception because of an EGL error, include the specific error." 2010-10-08 15:33:45 -07:00
Joe Onorato
8885321046 Merge "Allow notifications to not specify a contentIntent." 2010-10-08 15:16:14 -07:00
Alex Sakhartchouk
61b8aaadd7 Merge "Removing fixed size arrays." 2010-10-08 15:04:29 -07:00
Alex Sakhartchouk
6f91cb6af7 Removing fixed size arrays. 
Change-Id: I5c65b29a197013de2517cfb6dbe7abb9e24a688b
 2010-10-08 15:00:05 -07:00
Joe Onorato
80a752c537 Allow notifications to not specify a contentIntent. 
If they don't, the click events will be passed through to the individual
views in the notification view, which may have their own PendingIntents
attached.

Previously, it was against the UX spec to allow this, but now we are
changing that and will have buttons in there.

Change-Id: Ie3b2e96c6a1c4449fa86ed571f3ad0f047320d31
 2010-10-08 17:57:18 -04:00
Gil Dobjanschi
bced934da0 Merge "Hide project media by creating the .nomedia file" 2010-10-08 14:57:05 -07:00
Vasu Nori
ee7e28e20d Merge "when printing requery on UI warning, include additional info" 2010-10-08 14:50:59 -07:00
Vasu Nori
f0808f810e when printing requery on UI warning, include additional info 
this hsould help figure out which module is doing query on UI thread.

Change-Id: If3062a35fa1fb50063b678c3c9311d6b1504fa9b
 2010-10-08 14:48:48 -07:00
Gil Dobjanschi
ce52d1ff76 Hide project media by creating the .nomedia file 
Change-Id: I4ef1f16ceaa211b7f614cb3dfffa5beb4ae3e8de
 2010-10-08 14:44:36 -07:00
Mike Dodd
5d3e2ea6f3 HardwareRenderer: When throwing an exception because of an EGL 
error, include the specific error.

Change-Id: I8e4b0cdbc207824df4f4bb55c3b379b0ee4aeec2
 2010-10-08 14:43:16 -07:00