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

28714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
18dd95f451 am 05b20c03: Merge "bootanimation: Don\'t open non-existing bootanimation.zip" 
Merge commit '05b20c034d5a1ffe64c15d155dd8511b77b8989b' into gingerbread-plus-aosp

* commit '05b20c034d5a1ffe64c15d155dd8511b77b8989b':
  bootanimation: Don't open non-existing bootanimation.zip
 2010-08-17 07:48:26 -07:00
Jean-Baptiste Queru
a542f8cd0e am 1a0b19b3: resolved conflicts for merge of bcbb5845 to gingerbread-plus-aosp 
Merge commit '1a0b19b324eb6631333dcc51d9b92c3b1ead2eac'

* commit '1a0b19b324eb6631333dcc51d9b92c3b1ead2eac':
  frameworks/base/opengl: Add NULL check
 2010-08-17 07:46:40 -07:00
Jean-Baptiste Queru
1a0b19b324 resolved conflicts for merge of bcbb5845 to gingerbread-plus-aosp 
Change-Id: I04fb94c91958bcba3e587a8bf523c551d964f761
 2010-08-17 07:41:59 -07:00
Jean-Baptiste Queru
209e651805 Merge "Make the LED colors when charging customizable by the vendor" 2010-08-17 07:35:08 -07:00
Mike Lockwood
64d078425a am 26434836: am b6ef8bad: Merge "GPS: Initialize XTRA support when GPS is enabled" into gingerbread 
Merge commit '264348361e0660948a09fe516a535b7c60998def'

* commit '264348361e0660948a09fe516a535b7c60998def':
  GPS: Initialize XTRA support when GPS is enabled
 2010-08-17 04:56:32 -07:00
Mike Lockwood
264348361e am b6ef8bad: Merge "GPS: Initialize XTRA support when GPS is enabled" into gingerbread 
Merge commit 'b6ef8bad8a48fdc28770cf34d0c9efefc7fdd815' into gingerbread-plus-aosp

* commit 'b6ef8bad8a48fdc28770cf34d0c9efefc7fdd815':
  GPS: Initialize XTRA support when GPS is enabled
 2010-08-17 04:49:52 -07:00
Mike Lockwood
b6ef8bad8a Merge "GPS: Initialize XTRA support when GPS is enabled" into gingerbread 2010-08-17 04:46:29 -07:00
Mike Lockwood
1a1cd3a878 GPS: Initialize XTRA support when GPS is enabled 
BUG: 2923148

Change-Id: If9a643e385c6c567b30f47d4caa35fa812a2ba43
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-17 07:45:47 -04:00
Joseph Wen
1b10d3d235 am 81dcea60: am f1f48bc7: Do JPEG tile-based decoding. 
Merge commit '81dcea6093dfcdadd52982505249a5eacf47a81b'

* commit '81dcea6093dfcdadd52982505249a5eacf47a81b':
  Do JPEG tile-based decoding.
 2010-08-17 00:35:06 -07:00
Joseph Wen
81dcea6093 am f1f48bc7: Do JPEG tile-based decoding. 
Merge commit 'f1f48bc7f200f54c76b22d845d8ba8419879b375' into gingerbread-plus-aosp

* commit 'f1f48bc7f200f54c76b22d845d8ba8419879b375':
  Do JPEG tile-based decoding.
 2010-08-17 00:31:34 -07:00
Joseph Wen
f1f48bc7f2 Do JPEG tile-based decoding. 
Change-Id: I5c1b4ac3c02eb4350ef0ba9a7877b22cfd730cfb
 2010-08-17 14:34:02 +08:00
Romain Guy
0a41749953 Cleanup, better code reuse. 
Change-Id: Ib86a7309ae579cce3b7cf464782c34e70a74c616
 2010-08-16 20:26:20 -07:00
Adam Powell
931831dcb8 Merge "Prevent starting an action mode from within an actionbar/mode UI." 2010-08-16 20:04:32 -07:00
Jeff Brown
5c9609f136 am 637df045: am 1ce4394c: Merge "Throttle userActivity calls from input dispatcher." into gingerbread 
Merge commit '637df0456f71e8af69122ae7c3f5decf4c8dd1f8'

* commit '637df0456f71e8af69122ae7c3f5decf4c8dd1f8':
  Throttle userActivity calls from input dispatcher.
 2010-08-16 20:02:47 -07:00
Jeff Brown
637df0456f am 1ce4394c: Merge "Throttle userActivity calls from input dispatcher." into gingerbread 
Merge commit '1ce4394c779be5e67e37bbb995da13865b36c573' into gingerbread-plus-aosp

* commit '1ce4394c779be5e67e37bbb995da13865b36c573':
  Throttle userActivity calls from input dispatcher.
 2010-08-16 20:00:29 -07:00
Jeff Brown
1ce4394c77 Merge "Throttle userActivity calls from input dispatcher." into gingerbread 2010-08-16 19:59:03 -07:00
Adam Powell
9146ac7062 Prevent starting an action mode from within an actionbar/mode UI. 
Don't let a View start an ActionMode if it would be obscured or destroyed
by the ActionMode UI.

Change-Id: Ifdb28f1d6704ede550a89903d3823a09b103fcd5
 2010-08-16 18:57:17 -07:00
Jeff Brown
90291577a0 Throttle userActivity calls from input dispatcher. 
Results in an approximately 60% reduction in InputDispatcher thread CPU time.
(Went from 3% to 1% when measured with CPU frequency scaling disabled.)

Change-Id: Ia6e6087a719ee518fe37b428a871c7240bd4143f
 2010-08-16 18:33:50 -07:00
Romain Guy
4e50c8c4ce Merge "Fix possible ClassCastException in StackView." 2010-08-16 18:25:14 -07:00
Romain Guy
5b53f9186e Fix possible ClassCastException in StackView. 
Also do some cleanup (unused arguments, unnecessary casts, etc.)

Change-Id: If1f8cc173ca6fee33c54f4437bc5dcdbc75e5947
 2010-08-16 18:24:33 -07:00
Adam Powell
219f123168 Merge "Fix bug 2923440 - ActionMode buttons show as action by default" 2010-08-16 18:05:31 -07:00
Adam Powell
fbb72fdbe5 Fix bug 2923440 - ActionMode buttons show as action by default 
The MenuInflater returned by ActionModes will set the default
showAsAction value to "ifRoom" if not otherwise specified.

Change-Id: I86045dc4e877a97a3464a1a5f44d8d1e2120b086
 2010-08-16 18:02:58 -07:00
Alex Sakhartchouk
fe0c474c21 Merge "Added frustum plane extraction and sphere culling code." 2010-08-16 17:43:32 -07:00
Adam Powell
6236d61400 Merge "Fix some ActionBar bugs." 2010-08-16 17:41:07 -07:00
Alex Sakhartchouk
cbed7524ea Added frustum plane extraction and sphere culling code. 
Change-Id: I9d55baecddc962f8973f0269f2f9977f1d4ce008
 2010-08-16 17:40:10 -07:00
Adam Powell
266b1008cf Fix some ActionBar bugs. 
* Fix a bug where the options panel would not open on non-xlarge
  screens to show overflow menu items.

* Fix a bug where ActionBarView would try to add a custom nav view
  twice.

* Fix a bug where ActionBarView would expand too far in wrap_content mode

Change-Id: I433ea56524aad885d813ae8743fe2fcefa9649fa
 2010-08-16 17:26:11 -07:00
Mathias Agopian
0ab1d7f552 am 98a94989: am 833533c9: Improve Display javadoc slightly 
Merge commit '98a94989dd5fbf3da61329d0232a84a0e2dfcb74'

* commit '98a94989dd5fbf3da61329d0232a84a0e2dfcb74':
  Improve Display javadoc slightly
 2010-08-16 16:58:14 -07:00
Mathias Agopian
98a94989dd am 833533c9: Improve Display javadoc slightly 
Merge commit '833533c9292f860e4dfc060a4eba6429cd259ed4' into gingerbread-plus-aosp

* commit '833533c9292f860e4dfc060a4eba6429cd259ed4':
  Improve Display javadoc slightly
 2010-08-16 16:54:49 -07:00
Daniel Sandler
5ecbbbfeae am e03e6d30: am 80810f86: Merge "Fix crash in status bar ticker." into gingerbread 
Merge commit 'e03e6d3072592b2a49ee4a43c5977e7462bf9fd0'

* commit 'e03e6d3072592b2a49ee4a43c5977e7462bf9fd0':
  Fix crash in status bar ticker.
 2010-08-16 15:19:33 -07:00
James Dong
8ef786bf56 am f54da15b: am eff30e3d: Change the default time scale for audio/video track during recording and reduce rounding errors in calculating the sample duration 
Merge commit 'f54da15b7c3fa55268451c485544e831832fdf15'

* commit 'f54da15b7c3fa55268451c485544e831832fdf15':
  Change the default time scale for audio/video track during recording
 2010-08-16 15:19:29 -07:00
Doug Zongker
4961e4793f am bb33d6fd: am 997dc32b: Merge "add an api for getting a device serial number" into gingerbread 
Merge commit 'bb33d6fd987727c24372d7b7109ec5d1db82efe2'

* commit 'bb33d6fd987727c24372d7b7109ec5d1db82efe2':
  add an api for getting a device serial number
 2010-08-16 15:19:21 -07:00
Chung-yih Wang
8f1cf851cd am 4a054c1a: am cfd15dd3: Fix the IN_CALL mode issue. 
Merge commit '4a054c1a5d7ee2db6c738ede002a35145b226588'

* commit '4a054c1a5d7ee2db6c738ede002a35145b226588':
  Fix the IN_CALL mode issue.
 2010-08-16 15:18:48 -07:00
Dianne Hackborn
a10382b67d am 2e47052f: am 567722ee: Merge "Fix problems with determining when to kill apps for wake usage." into gingerbread 
Merge commit '2e47052fc4ad3439adc2322fd953fd58a85d457c'

* commit '2e47052fc4ad3439adc2322fd953fd58a85d457c':
  Fix problems with determining when to kill apps for wake usage.
 2010-08-16 15:18:27 -07:00
Irfan Sheriff
36fae8f7cb am 6f620395: (-s ours) am f76a05e9: Merge "DO NOT MERGE Fix wifi status icon" into gingerbread 
Merge commit '6f6203950d782c53193b5e96be7fb9fa4fab339c'

* commit '6f6203950d782c53193b5e96be7fb9fa4fab339c':
  DO NOT MERGE Fix wifi status icon
 2010-08-16 15:18:23 -07:00
James Dong
4ad5c707fa am 4fc2c928: am b7208196: Use audio clock as the reference media clock 
Merge commit '4fc2c9280c5262c835a4eb78961241de105313c1'

* commit '4fc2c9280c5262c835a4eb78961241de105313c1':
  Use audio clock as the reference media clock
 2010-08-16 15:18:13 -07:00
Mathias Agopian
2565c5b6ef am b2c315eb: am 6a73368b: Merge "fix a typo that prevented glTexImage2D codepath to work" into gingerbread 
Merge commit 'b2c315ebe79359fa443533f9ab55e9b730938e41'

* commit 'b2c315ebe79359fa443533f9ab55e9b730938e41':
  fix a typo that prevented glTexImage2D codepath to work
 2010-08-16 15:17:59 -07:00
Robert Greenwalt
fb5d9e7c2a am 993f85f3: (-s ours) am e300b8c1: Merge "DO NOT MERGE Always set/remove default routes." into gingerbread 
Merge commit '993f85f3194000d0eb212f361431c9319548b144'

* commit '993f85f3194000d0eb212f361431c9319548b144':
  DO NOT MERGE Always set/remove default routes.
 2010-08-16 15:17:54 -07:00
Dianne Hackborn
0a56fdc140 am 66b0343e: am a8d9291d: Merge "Various battery info things:" into gingerbread 
Merge commit '66b0343e9e32203cdd39b854852cf575ca2fcd6b'

* commit '66b0343e9e32203cdd39b854852cf575ca2fcd6b':
  Various battery info things:
 2010-08-16 15:17:46 -07:00
Ying Wang
af4798d9c3 am 8cfd3c01: am e05184f2: Merge "Output proguard keep flags for fragment classes." into gingerbread 
Merge commit '8cfd3c01e4582a587765588c02234527e7808ca0'

* commit '8cfd3c01e4582a587765588c02234527e7808ca0':
  Output proguard keep flags for fragment classes.
 2010-08-16 15:16:52 -07:00
Jake Hamby
a774f5817b resolved conflicts for merge of 31202b1a to master 
Change-Id: Ia8ae32c5ebcd13843ed9cc82c80bf551b38e586f
 2010-08-16 14:42:01 -07:00
Steve Howard
33bbd12a05 New download manager error code when we can't resume. 
Adding DownloadManager.ERROR_CANNOT_RESUME for when we can't resume an
interrupted download (because the server didn't provide an ETag or
doesn't support range requests), as well as the necessary private
status code in Downloads.Impl.

Change-Id: I5a66f1e1964198552ab2216aa6d3cc0db2254e21
 2010-08-16 14:28:17 -07:00
Mathias Agopian
833533c929 Improve Display javadoc slightly 
Change-Id: Iaa7d599e11d42d4aaf50e87b141f9b8d04ba445e
 2010-08-16 13:30:20 -07:00
Daniel Sandler
e03e6d3072 am 80810f86: Merge "Fix crash in status bar ticker." into gingerbread 
Merge commit '80810f86e93866674f3a4ca61f84887e7717aa63' into gingerbread-plus-aosp

* commit '80810f86e93866674f3a4ca61f84887e7717aa63':
  Fix crash in status bar ticker.
 2010-08-16 13:20:19 -07:00
James Dong
f54da15b7c am eff30e3d: Change the default time scale for audio/video track during recording and reduce rounding errors in calculating the sample duration 
Merge commit 'eff30e3d1b005fd0696390d1dd47ec4ff0c52784' into gingerbread-plus-aosp

* commit 'eff30e3d1b005fd0696390d1dd47ec4ff0c52784':
  Change the default time scale for audio/video track during recording
 2010-08-16 13:20:15 -07:00
Doug Zongker
bb33d6fd98 am 997dc32b: Merge "add an api for getting a device serial number" into gingerbread 
Merge commit '997dc32b6bef1c9cc8ac6d4d598698507b2c4934' into gingerbread-plus-aosp

* commit '997dc32b6bef1c9cc8ac6d4d598698507b2c4934':
  add an api for getting a device serial number
 2010-08-16 13:20:05 -07:00
Jason Sams
43c31421b4 Remove extra float<>int conversions in ImageProcessing. 
Remove or shrink test bitmaps for Fountain and ModelViewer.

Change-Id: Ieeb530375aebb6b953aa564788fc5b5ef21a362e
 2010-08-16 12:56:08 -07:00
Jason Sams
02f62aa7d1 Support reference operations in RS scripts. 
Change-Id: I9cb5f3cb71823ab24ca51bf0167a0f52cf0691f9
 2010-08-16 12:41:48 -07:00
Daniel Sandler
80810f86e9 Merge "Fix crash in status bar ticker." into gingerbread 2010-08-16 12:22:29 -07:00
Daniel Sandler
f8d5809eee Fix crash in status bar ticker. 
Bug: 2900850
Change-Id: Iaf71e093578501258a24cd43e5deaf624d28461e
 2010-08-16 15:15:41 -04:00
Jean-Baptiste Queru
c708e38356 Merge "Revert "InputMethodService: Fix ignore case in showInputMethodPickerFromClient"" 2010-08-16 12:07:26 -07:00