Scott Main
08e9a0fd2e
cherrypick Change-Id: I9e1b530b5cbd43043d326c04bfc30b073bf9d388
...
fix bug 3295540
Change-Id: I1835444ff6dd0351a0f66ef565fa97a15dfea53f
2011-01-07 13:38:34 -08:00
Scott Main
e6320beff7
cherrypick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f
...
docs: update dashboard
Change-Id: Ifb21e6277ca71f717e4d91fca1ec4a49a810a7dc
2011-01-07 13:37:04 -08:00
Romain Guy
0ddd45e245
am 2b55d903: Merge "Don\'t match wrap_content/match_parent children with child count = 1. Bug #3328711 " into honeycomb
...
* commit '2b55d9030e9ac018659abbcc01ff7e2006b7b43f':
Don't match wrap_content/match_parent children with child count = 1. Bug #3328711
2011-01-07 13:28:33 -08:00
Romain Guy
a174d7a0d5
Don't match wrap_content/match_parent children with child count = 1.
...
Bug #3328711
Change-Id: Ic131f2feecbeec4a7250d47193c9794aa70d22ee
2011-01-07 13:27:39 -08:00
Romain Guy
2b55d9030e
Merge "Don't match wrap_content/match_parent children with child count = 1. Bug #3328711 " into honeycomb
2011-01-07 13:24:50 -08:00
Leon Scroggins
7ba37ecdf4
am 23586239: Merge "Do not update matches string when there are no matches." into honeycomb
...
* commit '2358623917067ad57a14ffe66e445ab779d6c5b7':
Do not update matches string when there are no matches.
2011-01-07 13:22:17 -08:00
Louis Huemiller
cfd575f894
am 48d5f1f6: Merge "Hardware Composer new and refactored test cases" into honeycomb
...
* commit '48d5f1f6818c47f3687bc7fa1db94c88733fdaa4':
Hardware Composer new and refactored test cases
2011-01-07 13:17:25 -08:00
Leon Scroggins
2358623917
Merge "Do not update matches string when there are no matches." into honeycomb
2011-01-07 13:17:19 -08:00
Gilles Debunne
fa6f5c6511
am c0dc4062: Merge "Added support for Unicode surrogate characters in word selection" into honeycomb
...
* commit 'c0dc40628e684398fd258069bcd31eac1e967180':
Added support for Unicode surrogate characters in word selection
2011-01-07 13:15:28 -08:00
Louis Huemiller
48d5f1f681
Merge "Hardware Composer new and refactored test cases" into honeycomb
2011-01-07 13:12:11 -08:00
Gilles Debunne
c0dc40628e
Merge "Added support for Unicode surrogate characters in word selection" into honeycomb
2011-01-07 13:11:16 -08:00
Alex Sakhartchouk
a12ab63934
am 660733d3: Merge "Additional loading methods for fonts and a3d files. Cleaned up error messages." into honeycomb
...
* commit '660733d3e457482104d8a6e5b0a1fe2182de5150':
Additional loading methods for fonts and a3d files. Cleaned up error messages.
2011-01-07 13:08:54 -08:00
Eric Fischer
d471a2cf36
am 691bc9fe: Merge "Import some unabbreviated translations for large screens." into honeycomb
...
* commit '691bc9fec08e389b766b56308ebede44a88a5ebb':
Import some unabbreviated translations for large screens.
2011-01-07 13:08:41 -08:00
Alex Sakhartchouk
660733d3e4
Merge "Additional loading methods for fonts and a3d files. Cleaned up error messages." into honeycomb
2011-01-07 13:03:07 -08:00
Eric Fischer
691bc9fec0
Merge "Import some unabbreviated translations for large screens." into honeycomb
2011-01-07 13:00:17 -08:00
Leon Scroggins
73254be0dd
Do not update matches string when there are no matches.
...
Bug:2927451
Change-Id: I6374ffcc9d0710d69206d2f1f31a908b010a75bf
2011-01-07 15:51:43 -05:00
Xavier Ducrohet
2b9c38ab62
LayoutLib: fix animated moveChild.
...
The child can only be added to the new viewgroup
after it's been removed from the previous one, which
is delayed if there's an animation.
Change-Id: I9123a2670d0d17b3eb6f8f89085ebab8ca2b800f
2011-01-07 12:49:49 -08:00
Marco Nelissen
6cacc84c08
am af5473ee: Merge "Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831" into honeycomb
...
* commit 'af5473eeddbf2149427df0bd8b49f6b2182c629e':
Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831
2011-01-07 12:47:23 -08:00
Gilles Debunne
7e0bb6d9aa
am c43d13f4: Merge "Removed XmlAdapters from frameworks." into honeycomb
...
* commit 'c43d13f495f59bbef6ba439afc4da035a7520647':
Removed XmlAdapters from frameworks.
2011-01-07 12:45:22 -08:00
Marco Nelissen
af5473eedd
Merge "Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831" into honeycomb
2011-01-07 12:43:36 -08:00
Vasu Nori
d7bd3f0bf7
am df22d839: Merge "in requery(), when exception is caught, print warning + stacktrace" into honeycomb
...
* commit 'df22d839aa1268a8137cadb4f036fd88946aa112':
in requery(), when exception is caught, print warning + stacktrace
2011-01-07 12:43:22 -08:00
Marco Nelissen
ee35aff744
Add support for the "compilation" tag in mp3, mp4 and ogg, and also add
...
support for two common ways of specifying album artist in ogg files.
b/3311831
(cherry-picked from GB because of weird automerger failure)
Change-Id: Ibf12a3d6bc8bbc2ac5ea815de6b33414b8f53f0f
2011-01-07 12:42:07 -08:00
Gilles Debunne
c43d13f495
Merge "Removed XmlAdapters from frameworks." into honeycomb
2011-01-07 12:41:10 -08:00
Vasu Nori
df22d839aa
Merge "in requery(), when exception is caught, print warning + stacktrace" into honeycomb
2011-01-07 12:40:16 -08:00
Gilles Debunne
0633549799
Removed XmlAdapters from frameworks.
...
Has been moved to samples.
Change-Id: Icc0530d78df9755a4a1fe9314fa557a91da408c6
2011-01-07 12:14:27 -08:00
Robert Greenwalt
ec2e01842e
Merge "Propagate new link-status-change message to any NetworkManagementService observers. Also fix the syntax of the "interface-status-change" message. Add a null handler in the ThrottleService and Tethering classes (plus fix names)."
2011-01-07 12:14:25 -08:00
Joe Onorato
af2047f1c6
am ccdf3853: Merge "Mark the veto button GONE for ongoing notifications so they can go into its space." into honeycomb
...
* commit 'ccdf3853b505f56a8bc52ee038dfe07aa87eb088':
Mark the veto button GONE for ongoing notifications so they can go into its space.
2011-01-07 12:11:59 -08:00
Joe Onorato
ccdf3853b5
Merge "Mark the veto button GONE for ongoing notifications so they can go into its space." into honeycomb
2011-01-07 12:08:27 -08:00
Dmitri Plotnikov
ac77f4629c
Prevent ActivityTestCase from erasing constants.
...
If you test case is declaring a non-primitive constant,
this method would clear out the constant between
individual tests.
Change-Id: I570f2bbbbbb0a170bf63b7473b4aaf84869e93e0
2011-01-07 12:06:47 -08:00
Gilles Debunne
79ff914f21
Added support for Unicode surrogate characters in word selection
...
Inspired by https://review.source.android.com/#change,16606
Change-Id: I896354f5aba83c1919c008f07b6d0b2abf0b8e01
2011-01-07 11:59:26 -08:00
Jason parks
609dca2cc5
Merge "Add a method enable encryption."
2011-01-07 11:47:11 -08:00
Stan Chesnutt
780dfa42aa
Propagate new link-status-change message to any NetworkManagementService
...
observers. Also fix the syntax of the "interface-status-change" message. Add
a null handler in the ThrottleService and Tethering classes (plus fix names).
Change-Id: I58cabc7b0ce5662243bc6513b2de4818065e6c52
2011-01-07 11:40:33 -08:00
Adam Powell
dbba746628
am 26c0c772: Merge "Fix bug 3330223 - onCreateOptionsMenu() unable to getActionView() immediately after orientation change" into honeycomb
...
* commit '26c0c772204f0962ae7a1d888a5aeadd13350008':
Fix bug 3330223 - onCreateOptionsMenu() unable to getActionView() immediately after orientation change
2011-01-07 11:38:45 -08:00
Xavier Ducrohet
ae621e1911
am fe75027c: Merge "LayoutLib: Finish the matrix delegate." into honeycomb
...
* commit 'fe75027c5c2bbb53f008ae5382de94ed8d37317b':
LayoutLib: Finish the matrix delegate.
2011-01-07 11:36:48 -08:00
Adam Powell
26c0c77220
Merge "Fix bug 3330223 - onCreateOptionsMenu() unable to getActionView() immediately after orientation change" into honeycomb
2011-01-07 11:35:15 -08:00
Adam Powell
d16c9884bb
Fix bug 3330223 - onCreateOptionsMenu() unable to getActionView()
...
immediately after orientation change
Inflate action view layout resource earlier so that calls to
getActionView are valid immediately after menu inflation.
Change-Id: I8023328b1a77670ac42a783f6e4b46aa5c2a798e
2011-01-07 11:33:41 -08:00
Amith Yamasani
f50c5113d0
Update default for auto-brightness.
...
Bug: 3297046
Change-Id: I92e34a85332988bb3faa1e1997ccc85abf4b5dec
2011-01-07 11:32:30 -08:00
Xavier Ducrohet
fe75027c5c
Merge "LayoutLib: Finish the matrix delegate." into honeycomb
2011-01-07 11:32:00 -08:00
Alex Sakhartchouk
b0253ea696
Additional loading methods for fonts and a3d files.
...
Cleaned up error messages.
Change-Id: Id33b7149671df23c37cc11375d844a7837dac750
Change-Id: I6663ce54f7b9bbaf285935ca658d93ba417f8179
2011-01-07 11:16:08 -08:00
Joe Onorato
100748e328
Mark the veto button GONE for ongoing notifications so they can go into its space.
...
Change-Id: I0f03052c630c937f12d52d93dfa680ce8c6a27d0
2011-01-07 11:08:11 -08:00
Wink Saville
a78060345b
am 81f573de: Merge "Add telephony.sms.receive and telephony.sms.send properties." into honeycomb
...
* commit '81f573de6361b0420b22c857afa7e03df125d1a5':
Add telephony.sms.receive and telephony.sms.send properties.
2011-01-07 11:04:26 -08:00
Romain Guy
cf65322357
am 3c38e0a2: Merge "Fix typo bug in FrameLayout\'s measurement code. Bug #3327185 " into honeycomb
...
* commit '3c38e0a2a617f87a43d3647b532e3b493b7dae6d':
Fix typo bug in FrameLayout's measurement code. Bug #3327185
2011-01-07 11:04:23 -08:00
Romain Guy
cf70dcb0f7
Fix typo bug in FrameLayout's measurement code.
...
Bug #3327185
Change-Id: If9a897efd8766b158749d053dabee3477bf1b053
2011-01-07 11:03:20 -08:00
Wink Saville
81f573de63
Merge "Add telephony.sms.receive and telephony.sms.send properties." into honeycomb
2011-01-07 11:00:42 -08:00
Romain Guy
3c38e0a2a6
Merge "Fix typo bug in FrameLayout's measurement code. Bug #3327185 " into honeycomb
2011-01-07 11:00:20 -08:00
Wink Saville
97afc5e097
am 077490f5: Merge "For Cdma a blank plmn is valid to show in some cases." into honeycomb
...
* commit '077490f567028c9d02f9dbaeff80eba38e39e8a2':
For Cdma a blank plmn is valid to show in some cases.
2011-01-07 10:51:54 -08:00
Eric Fischer
b279a0a701
am 483f2c27: Merge "Mark the status bar configuration string untranslatable." into honeycomb
...
* commit '483f2c277250278722f1a056124c608cc1bb3cc2':
Mark the status bar configuration string untranslatable.
2011-01-07 10:51:50 -08:00
Wink Saville
077490f567
Merge "For Cdma a blank plmn is valid to show in some cases." into honeycomb
2011-01-07 10:44:20 -08:00
Eric Fischer
483f2c2772
Merge "Mark the status bar configuration string untranslatable." into honeycomb
2011-01-07 10:41:50 -08:00
Irfan Sheriff
73746fa9ce
am 60525c82: Merge "Use BluetoothAdapter broadcast for coex settings" into honeycomb
...
* commit '60525c824ccf11302a9b8343e72eba259485edea':
Use BluetoothAdapter broadcast for coex settings
2011-01-07 09:40:51 -08:00