28849 Commits

Author SHA1 Message Date
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
Andreas Huber
3386c38d59 Make the OggExtractor less verbose.
Change-Id: Ieea5f3fa98d93ca6ad8fa7dcd23054e1cd0b6338
2010-08-16 14:11:40 -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
Adam Powell
93af2e48a7 Merge "Add selection mode support to GridView." 2010-08-16 11:33:12 -07:00
Adam Powell
f343e1ba7e Add selection mode support to GridView.
Changed 9.xml to make update-api behave with the API change involved.
Several fields and methods moved from ListView to AbsListView. This
should not break source or binary compatibility.

Change-Id: Icad6e238522b8b7cc5bbc935ad89ac3e015572c1
2010-08-16 11:05:57 -07:00
Romain Guy
893ce24ffb Merge "Add documentation for fillViewport." 2010-08-16 10:56:14 -07:00
Romain Guy
fdbf484be1 Add documentation for fillViewport.
Change-Id: I34f5418ca33933dc5cf65f4e417d918bce83ab96
2010-08-16 10:55:49 -07:00
James Dong
eff30e3d1b Change the default time scale for audio/video track during recording
and reduce rounding errors in calculating the sample duration

- Default time scale for tracks other than audio is set to 90000.
- Audio track by default uses the audio sampling rate as the time scale.
- Default movie time scale remains to be 1000.
- The default time scale values will be overwritten by a user-supplied value if exits.

Change-Id: I81b40ed0626ea45e9fd24a89e21a2c5a4a2c3415
2010-08-16 10:38:35 -07:00
Shimeng (Simon) Wang
fbb1bb8ab7 Merge "Update variable to reflect its true value." 2010-08-16 10:30:28 -07:00
satok
12af0e3eb3 Revert "InputMethodService: Fix ignore case in showInputMethodPickerFromClient"
This reverts commit f2e67a5779d404b4791c6ab5b0d30dfb2c463514.

Open Source Project CL: https://review.source.android.com/#change,16419
This change unexpectedly started preventing users from changing Input-Method.

How to reproduce
1. Long press "?123" button in LatinIME
2. Select "Input method"
3. No window will open.

Change-Id: Ie0d4b58900a9b06aa9d43f9fa0bea5165294fa30
2010-08-17 02:18:11 +09:00
Doug Zongker
997dc32b6b Merge "add an api for getting a device serial number" into gingerbread 2010-08-16 09:19:40 -07:00
Doug Zongker
7d2e3df60d add an api for getting a device serial number
Add a constant to android.os.Build that returns a device-specific
alphanumeric serial number.  It's optional -- it may be blank --
though CTS will require it to be present for non-telephony devices.

Change-Id: I338ae5f43ba679a5e98f2f437dc4efdaef0c835d
2010-08-16 09:18:50 -07:00
Jean-Baptiste Queru
05b20c034d Merge "bootanimation: Don't open non-existing bootanimation.zip" 2010-08-16 09:15:17 -07:00
Jean-Baptiste Queru
bcbb584569 Merge "frameworks/base/opengl: Add NULL check" 2010-08-16 08:57:29 -07:00
Eric Fischer
fed762b944 am d22a1e89: am 244152bf: Merge "Change aapt\'s warning message to suggest formatted="false", not "true"." into gingerbread
Merge commit 'd22a1e896cbc7e86d57be9923d749b017b3cde79'

* commit 'd22a1e896cbc7e86d57be9923d749b017b3cde79':
  Change aapt's warning message to suggest formatted="false", not "true".
2010-08-16 07:49:51 -07:00
Jake Hamby
c93ba8ed0d am 164eb050: am 4f170821: Merge "Fix typo and bug in CTS test class." into gingerbread
Merge commit '164eb050bdbaacb83e48a00c56b78d3c587a6e34'

* commit '164eb050bdbaacb83e48a00c56b78d3c587a6e34':
  Fix typo and bug in CTS test class.
2010-08-16 07:49:44 -07:00
Ficus Kirkpatrick
6e9b12760f am 44e0d5ca: am 0a6bfe2a: am 2abde6e0: Add --max-res-version flag to aapt.
Merge commit '44e0d5ca752db52f2f02e475ecd254b676e50be2'

* commit '44e0d5ca752db52f2f02e475ecd254b676e50be2':
  Add --max-res-version flag to aapt.
2010-08-16 07:49:38 -07:00
Ficus Kirkpatrick
f4d954a126 am 0f414272: am 7525c2cf: Merge "Add --max-res-version flag to aapt." into gingerbread
Merge commit '0f414272ccb9c387f41ad3bb5ee464a6f0b646a4'

* commit '0f414272ccb9c387f41ad3bb5ee464a6f0b646a4':
  Add --max-res-version flag to aapt.
2010-08-16 07:49:30 -07:00
Romain Guy
d601649e6a am a4ed1c67: am 1e4aa48c: Merge "fix [2912927] Can\'t get NV_draw_path extension to work" into gingerbread
Merge commit 'a4ed1c6788ead0324106d76f497233ee42a1f1ac'

* commit 'a4ed1c6788ead0324106d76f497233ee42a1f1ac':
  fix [2912927] Can't get NV_draw_path extension to work
2010-08-16 07:49:24 -07:00
Jean-Baptiste Queru
79b2cf3c65 am 73815413: Ignore 87624778
Merge commit '7381541309d515f780879d23857675c9c8ee9344'

* commit '7381541309d515f780879d23857675c9c8ee9344':
  DO NOT MERGE WLAN: Reset power save mode to startup value after DHCP response.
2010-08-16 07:49:13 -07:00