Stephen Hines
cf86dc2997
Merge "Move divsi3, modsi3, udivsi3, umodsi3 to libbcc."
2011-06-23 17:08:02 -07:00
Stephen Hines
7c1747c13c
Merge "Remove verbose logging, update test app and docs."
2011-06-23 17:07:10 -07:00
Adam Powell
95c0f924b2
Merge "Fix bug 4771354 - Phone landscape action bar subtitle slightly cut off on the bottom"
2011-06-23 17:00:00 -07:00
Adam Powell
c8b0b005cb
Fix bug 4771354 - Phone landscape action bar subtitle slightly cut off
...
on the bottom
Let action bar title sizes adapt for restricted space in landscape.
Fix home spacing for tablets to eliminate redundant layout.
Change-Id: If38a43d87ca1aebf96b5d7adfdb1cf36c41ec07e
2011-06-23 16:56:07 -07:00
Stephen Hines
e352f05d3a
Move divsi3, modsi3, udivsi3, umodsi3 to libbcc.
...
BUG=3435530
Change-Id: I4e90a6cdf5af534f93d83093ea31b1defd1e896c
2011-06-23 16:49:00 -07:00
Stephen Hines
3d782666d7
Remove verbose logging, update test app and docs.
...
Change-Id: I6659c5e51a747011239128dc2682a5d78aecfa26
2011-06-23 16:18:28 -07:00
Gloria Wang
5510a153bf
Merge "- Public part of the Metadata API. - Modify the media framework test for Metadata."
2011-06-23 16:17:55 -07:00
Jesse Wilson
52da3a4328
Merge "Warn about the lack of access controls for SD card HTTP caches."
2011-06-23 16:04:00 -07:00
RoboErik
48e34174cc
Merge "api comment fixes"
2011-06-23 16:00:00 -07:00
Jesse Wilson
98e8b19c7b
Warn about the lack of access controls for SD card HTTP caches.
...
Change-Id: I54adc2f9b57964e15a0fc26b719729e6087b1bda
http://b/4772280
2011-06-23 15:59:32 -07:00
Bart Sears
792dba9e07
Merge "Add Droid Ethiopic fonts"
2011-06-23 15:52:17 -07:00
Gloria Wang
1e1b13e62e
- Public part of the Metadata API.
...
- Modify the media framework test for Metadata.
Change-Id: Ib8fa4991f114e1bb88a17ca662844b9b8e1d0faf
2011-06-23 15:28:36 -07:00
RoboErik
e00d58998c
api comment fixes
...
Change-Id: I0fe70ab54c78ba18ae7d759bbfa692c5235008ef
2011-06-23 15:16:55 -07:00
JP Abgrall
40e44467e2
Merge "NetworkStatsService: check kernel bandwidth support before enabling"
2011-06-23 15:06:55 -07:00
tedbo
0694cfe49a
Merge "Add method to create a ParcelSurfaceTexture from android.view.Surface."
2011-06-23 14:45:30 -07:00
Scott Main
090117774a
am d4f9872c: am dc0ae0cb: am 138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2
...
* commit 'd4f9872cb077abc54cfa2def348f831d24e32ca0':
docs: add info about manifest attributes that should not change
2011-06-23 14:30:30 -07:00
Raphael Moll
b02367778d
am f9705ef6: am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods."
...
* commit 'f9705ef6d3f1502991dd312bfdbfb93cb07fe672':
Laoutlib_creator: keep original of delegate methods.
2011-06-23 14:30:25 -07:00
Jerry J. Wang
996bdbaaf0
am 4333de2a: (-s ours) am a5342f1a: am 850aaaef: Merge "Don\'t throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2
...
* commit '4333de2a8e878b319c0e779942b87c042804d352':
Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)
2011-06-23 14:29:55 -07:00
Scott Main
16d1f17675
am d65fab3d: am e2f74aec: am 929cba13: docs: remove exclamation from media title
...
* commit 'd65fab3de6381a8b040101c74d5276290de1c7c1':
docs: remove exclamation from media title
2011-06-23 14:29:50 -07:00
Katie McCormick
c182bd5162
am 02362299: am a108223f: am d4fac2c0: Doc change: updated TOC for Bluetooth CL.
...
* commit '023622997d886074f7c0cf831945a466803acf5e':
Doc change: updated TOC for Bluetooth CL.
2011-06-23 14:29:25 -07:00
JP Abgrall
b851cc23c8
NetworkStatsService: check kernel bandwidth support before enabling
...
And catch the actual errors reported by the other side of NetworkManager.
Change-Id: I9a9393b659d6f896ee1bf40a8deaca7853ef8f94
Signed-off-by: JP Abgrall <jpa@google.com>
2011-06-23 14:13:28 -07:00
David Brown
0824b928ce
Merge "Update CallerInfo to use the geocoder in the updated location."
2011-06-23 14:08:56 -07:00
Bart Sears
621cbd3feb
Add Droid Ethiopic fonts
...
Add the Ver 1.02 Droid Ethiopic fonts from Monotype.
Adding to git, but not adding them into the fonts.mk file (to copy
to production builds) until we have Fallback support for multiple
styles (i.e. Regular and Bold).
Change-Id: Id86d6006adf753940d7886dd9a2fd558e2fa2773
2011-06-23 13:27:20 -07:00
Jamie Gennis
b950b8e23e
Merge "Fix the issue where onFrameAvailable is not triggered if SurfaceTexture is in sync mode."
2011-06-23 13:02:40 -07:00
Dianne Hackborn
58b8684177
Merge "Fix issue #4770360 : older app compatibility mode is really tiny on ICS phones"
2011-06-23 12:13:06 -07:00
Adam Powell
2a08791491
Merge "Fix bug 4904520 - Swap force close/report buttons"
2011-06-23 12:05:50 -07:00
Philip Milne
368c0f900d
Merge "Handle baseline aligned rows in which some components define baseline and some don't."
2011-06-23 12:05:09 -07:00
Adam Powell
3187632e0a
Fix bug 4904520 - Swap force close/report buttons
...
Make the force close dialogs consistent with both the new rules for
wizardy-button bar UI flows and the previous arrangement that people
are used to. Force close = negative/back/cancel, Report =
positive/next/ok.
Change-Id: I212ba172f8076238a1833100b025b6e25a538a65
2011-06-23 12:02:27 -07:00
Dianne Hackborn
2b31d53161
Fix issue #4770360 : older app compatibility mode is really tiny on ICS phones
...
We were applying the density compat mode scaling multiple times to
display metrics, causing bad values.
Change-Id: Iafafd9a5e94b9d774cd2715bf968e91602a1bd82
2011-06-23 12:00:54 -07:00
Philip Milne
a1f7b10f72
Handle baseline aligned rows in which some components define baseline and some don't.
...
Also:
. Make all of the methods in Alignment package private.
. Inlucde Tor's test case
Change-Id: If78a6a3b653723d9e12d6b162fd0c86b11a82dff
2011-06-23 11:41:57 -07:00
Adam Powell
8457f0fe34
Merge "Fix bug 4595971 - Menu not prepared to be prepared"
2011-06-23 11:38:10 -07:00
Brian Carlstrom
0ff6d7ee17
Merge "Reinitialize KeyStore::mMasterKey after unlock (and add test-keystore)"
2011-06-23 10:26:38 -07:00
Andreas Huber
5ecc4601ea
Merge "Parse RTP-Info even for live streams."
2011-06-23 10:12:22 -07:00
Andreas Huber
16b501ae09
Merge "Reconstruct sync frame indication for content served by the MPEG2TSExtractor"
2011-06-23 10:12:12 -07:00
Adam Powell
0b2be42a07
Fix bug 4595971 - Menu not prepared to be prepared
...
The menu key gets the menu ready on key down and shows it on key
up. Ensure on key up that we still have a valid menu before attempting
to show it.
Change-Id: I24e67fa0cdb14cb5471c087a5e9f55ec0b2edf9f
2011-06-23 10:11:49 -07:00
Gloria Wang
b59f677611
Merge "- Add two sanity checks. - Remove one unnecessary line. - Clear the extendedData vector in DecryptHandle."
2011-06-23 09:33:11 -07:00
Glenn Kasten
db262e6cf0
Merge "Fix warnings for uninitialized local variables"
2011-06-23 09:00:03 -07:00
Scott Main
e847fc24c3
am dba7dd71: am 6f2bcc4d: am 24ef1aa6: Merge "docs: use new CSE to show results for all sites" into honeycomb-mr2
...
* commit 'dba7dd71f296a6220cb5a5308221b9ead1b4f106':
docs: use new CSE to show results for all sites
2011-06-23 08:17:28 -07:00
Robert Ly
f64d0ef991
am b6f9e5dd: am 60506b4f: am d60e1b5b: cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
...
* commit 'b6f9e5dd96e34691743000d9f51e4d5d71ead70a':
cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
2011-06-23 08:17:23 -07:00
Irfan Sheriff
756f25fc61
am 1cc0fa41: am db45e0bd: am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2
...
* commit '1cc0fa416f195732cc7c04cebfaabe7f3fe994c7':
Release wakelock after use
2011-06-23 08:17:01 -07:00
Bruno Oliveira
f14192bc4f
am ecf16143: am 0310f4da: am f5c62362: Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2
...
* commit 'ecf161437e4a2f2e0493f303119e8b2f090739eb':
Rewriting "Audio and Video" section of Dev Guide.
2011-06-23 08:16:55 -07:00
Irfan Sheriff
e8c01e5c8a
am a08c5520: (-s ours) am 38053dad: am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling""
...
* commit 'a08c55208335a2dfd6642793d6b3cc2e86615282':
Revert "DO NOT MERGE Revert "Fix lease duration handling""
2011-06-23 08:16:49 -07:00
Irfan Sheriff
4ae8aa9c73
am 5389c80d: (-s ours) am cf99765b: resolved conflicts for merge of 914ed90f to honeycomb-LTE
...
* commit '5389c80d1f7c9d2710a47ccf70cce94c2d5d9599':
Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
2011-06-23 08:16:44 -07:00
Eric Laurent
e2ac799dfc
Merge "Added audio_bytes_per_sample() helper function"
2011-06-23 08:08:20 -07:00
Irfan Sheriff
afd2580afd
am 20b6ded6: (-s ours) am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE
...
* commit '20b6ded6e326e3fedb9f7e112773a82b94c4aca6':
DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
2011-06-23 07:50:01 -07:00
Wink Saville
9b897922e1
am 446a436c: am 4d9261fa: Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE
...
* commit '446a436cf3d6eb0ee2feb628efc84fda746dfe52':
Use dataConnectionNotInUse to decide if a DC is free.
2011-06-23 07:49:30 -07:00
Wink Saville
3b14c78466
am 66c37f5d: am 64a09341: Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE
...
* commit '66c37f5df2b4cf469e90a0e9f7e0b336f56e8433':
Fix handling of unsol_data_state_change with PDP sharing scenario
2011-06-23 07:49:16 -07:00
Wink Saville
7bfb80d122
am 47e31924: am aef70d3f: Merge "Return USIM IMSI as subscriber ID in case of CDMA-LTE mode" into honeycomb-LTE
...
* commit '47e319247e89ab4ba30f58e5f532454ef21d15e6':
Return USIM IMSI as subscriber ID in case of CDMA-LTE mode
2011-06-23 07:49:09 -07:00
Wink Saville
b939b4d36a
am 1773120c: am ac4ff895: Merge "Special retry back-off timer in call setup failure." into honeycomb-LTE
...
* commit '1773120c1e9aeebc917e1bb6c1241aecfe9d6500':
Special retry back-off timer in call setup failure.
2011-06-23 07:49:02 -07:00
Irfan Sheriff
e35446e8f4
am e8898d4a: (-s ours) am 885c3c11: am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2
...
* commit 'e8898d4a4441b590c3c6e6336cfbb53fcd853775':
DO NOT MERGE Revert "Fix lease duration handling"
2011-06-23 07:48:38 -07:00