Fabrice Di Meglio
9c83011005
Merge "Fix bug #4972141 Overlapping content in single-choice dialogs"
2011-07-15 17:51:46 -07:00
Glenn Kasten
170626b2ba
Fix build break on MacOS
...
Change-Id: Ica19984d0e623ac2482fc3512231e6c00671fd3a
2011-07-15 17:45:50 -07:00
Daniel Lehmann
9eebaf10e9
Merge "Use higher resolution in in-call UI if available."
2011-07-15 17:41:36 -07:00
Fabrice Di Meglio
54d6962555
Fix bug #4972141 Overlapping content in single-choice dialogs
...
- need to take care about padding resolution
Change-Id: Ida9738ffada6c6455b7949f933fa61924c4f7961
2011-07-15 17:05:11 -07:00
Eric Fischer
8d96f19692
Merge "Import revised translations."
2011-07-15 17:04:36 -07:00
Fabrice Di Meglio
9703ac8e6f
Merge "Some code refactoring"
2011-07-15 16:52:03 -07:00
Romain Guy
9189c2ea75
Merge "Don't break the build..."
2011-07-15 16:51:30 -07:00
Romain Guy
f85ad93755
Don't break the build...
...
Change-Id: I9c77f3d22eb412dc92703167100d72496aefac9c
2011-07-15 16:50:52 -07:00
Romain Guy
e57a981f14
Merge "Remove unused code"
2011-07-15 16:46:39 -07:00
Romain Guy
dafbf247ee
Remove unused code
...
Change-Id: I7f7fc6bac03c92087037fc56b78fc43a1e93dae5
2011-07-15 16:44:39 -07:00
Eric Fischer
67fa9f0d84
Import revised translations.
...
Change-Id: I6c9ed6cf456cdefc7fd062eaad0e53d5c64b91f9
2011-07-15 16:42:18 -07:00
Glenn Kasten
0bd30801c9
Merge "Log CPU usage"
2011-07-15 16:27:13 -07:00
Glenn Kasten
7e7de71f6e
Merge "CPU statistics library"
2011-07-15 16:24:26 -07:00
Rajneesh Chowdury
e3065f23a2
Merge "Fix for issue 5007510 AssertionFailed for MediaPropertiesTest#testPropertiesH263QCIF"
2011-07-15 16:08:01 -07:00
John Reck
849a147c99
Merge "Implement SeekBarPreference.onGetDefaultValue"
2011-07-15 15:58:43 -07:00
John Reck
595d2bdc16
Implement SeekBarPreference.onGetDefaultValue
...
Bug: 5036325
Change-Id: I1db0ed3809b862a547e5fda40027852f8b46aa38
2011-07-15 15:48:01 -07:00
Chet Haase
d5a7fc0a3b
Merge "Fix leak in LayoutTransition"
2011-07-15 15:29:30 -07:00
Chet Haase
622e05c4d2
Fix leak in LayoutTransition
...
Static objects were referencing the first LayoutTransition object,
which referenced its target container, which eventually referenced the
Activity. That reference chain never went away.
The fix is to create animators that do not reference any target
object (they are just templates which are loaded with real target
objects when they are started).
Change-Id: Ie29f53bf3b886b8052b6ee3a56647a312d9adeaa
2011-07-15 15:24:18 -07:00
Chia-chi Yeh
f604c6f6a9
Merge "VpnDialogs: change paddings."
2011-07-15 15:22:56 -07:00
Chia-chi Yeh
8f6fdf448c
VpnDialogs: change paddings.
...
Change-Id: I46d949099778d1801ac1ca81b845b93936ceecb9
2011-07-15 15:21:44 -07:00
Rajneesh Chowdury
aea7d6cdfb
Fix for issue 5007510 AssertionFailed for MediaPropertiesTest#testPropertiesH263QCIF
...
Change-Id: I1c7c32fee491871223ad12df4696363415902377
2011-07-15 15:11:48 -07:00
Christopher Tate
755c7dc48d
Merge "Support for compressed backups"
2011-07-15 15:05:53 -07:00
Christopher Tate
7bdb096289
Support for compressed backups
...
The backup format now includes a stream header. That header begins with
a magic string and version number, then includes a flag stating whether
the archive data is compressed, and then in the case of encrypted archives
states the password salt used during encryption key stretching.
When compression is used, everything following the header is run through
a standard zlib "deflate" compressor before being sent downstream.
Change-Id: Ica72753e4ef2c3d13e63b45e7722a00652940a55
2011-07-15 14:55:30 -07:00
Irfan Sheriff
75683d59db
Merge "WifiWatchdog rewrite to formal statemachine"
2011-07-15 14:38:04 -07:00
Chet Haase
131fe17628
Merge "Read font info from system config files"
2011-07-15 14:32:21 -07:00
Mathias Agopian
700e13d7a1
Merge "dump GLES strings in SF dumpsys log"
2011-07-15 14:32:10 -07:00
Mathias Agopian
ab95117be0
dump GLES strings in SF dumpsys log
...
Change-Id: I438d511159b2bd915c84954f30574340017d4f47
2011-07-15 14:29:25 -07:00
Gloria Wang
e1ea88c573
Merge "Use unsigned char to store table of contents retrieved from XING header. Our compiler treats char default to unsigned (trygon-eng on master branch). If I force "signed char" for the table of contents array, some MediaFramework tests for VBR mp3 would fail."
2011-07-15 14:20:45 -07:00
Andreas Huber
698a5e0806
Merge "Refetch playlists according to the HLS specs, varying delay if playlists unchanged"
2011-07-15 14:16:15 -07:00
Glenn Kasten
131515b681
CPU statistics library
...
Change-Id: I113e2a926466cc410cfa5602ceb165b390a290fc
2011-07-15 14:09:49 -07:00
Glenn Kasten
da494f9625
Log CPU usage
...
Change-Id: Ie447e59be139153e526b7ad467c46c659d26816f
2011-07-15 13:28:19 -07:00
John Reck
9a3d51f596
Merge "Add a hidden generic property interface"
2011-07-15 13:18:50 -07:00
Jamie Gennis
97912d0b9d
Merge "SurfaceTexture: fix SurfaceTextureGLToGLTest"
2011-07-15 12:35:34 -07:00
Isaac Levy
654f509075
WifiWatchdog rewrite to formal statemachine
...
Rewrote wifiwatchdog service to use net.statemachine
Change-Id: Id6fd42b13192ac2e99f842ff50e9edff1696675d
2011-07-15 12:31:58 -07:00
Chia-chi Yeh
339abf1fba
VpnDialogs: enforce calling permissions.
...
Change-Id: I1bb3bd4616309f091ef653ee246b97b1a006a225
2011-07-15 12:10:48 -07:00
Gloria Wang
c2e5ca3cac
Use unsigned char to store table of contents retrieved from XING header.
...
Our compiler treats char default to unsigned (trygon-eng on master branch).
If I force "signed char" for the table of contents array, some MediaFramework
tests for VBR mp3 would fail.
Change-Id: I725e2d4dfe57ff36fdb1d65fe3184f7ab41ad695
2011-07-15 12:08:00 -07:00
Chet Haase
c8f060c938
Read font info from system config files
...
This change adds new files in /system/etc: system_fonts.xml and
fallback_fonts.xml. The change also allows a third file to be added
by vendors in /vendor/etc/fallback_fonts.xml. These files, loaded at
boot time, mimic the logic that used to be in code, but which is
now configurable through editing these files, making the system more
flexible and easy to work with for us and vendors as future fonts
are added to the system.
Change-Id: I209f1ef08a5279b376b89a880241906387efd576
2011-07-15 12:06:35 -07:00
Andreas Huber
cc0b9f139f
Refetch playlists according to the HLS specs, varying delay if playlists unchanged
...
since the previous fetch.
Change-Id: I75e167a650c65a23e284381db5203beba7be7420
related-to-bug: 4983546
2011-07-15 11:30:16 -07:00
Romain Guy
f9284695e8
Add new ViewDebug APIs to profile the event queue.
...
Change-Id: I225bf288780b0244f459316e2765cfa29cd22c89
2011-07-15 11:25:11 -07:00
Nick Pelly
fed878d98b
am fc00b2ed: am 1bce9e25: am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
...
* commit 'fc00b2ed4fa64621015b47310b91e937581bd3a3':
Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
2011-07-15 11:20:44 -07:00
John Reck
637758940f
Add a hidden generic property interface
...
Change-Id: Iff890d7802af00a80b0148c7cc3233c6fc4d5dad
2011-07-15 11:14:43 -07:00
Justin Ho
cbbd798066
Merge "Updated some effects and notifications"
2011-07-15 11:13:22 -07:00
Robert Greenwalt
ef75edaf0f
am e1635197: am 476f5525: Small fix to 5008973 fix.
...
* commit 'e1635197bb6e6471b333d194855bb399da419957':
Small fix to 5008973 fix.
2011-07-15 11:03:52 -07:00
Gilles Debunne
ae68f886b2
Merge "Removed vertical padding in PreferenceActivity header list on phones"
2011-07-15 11:03:42 -07:00
Robert Greenwalt
fc5e367d80
Merge "resolved conflicts for merge of 8550f3b8 to master"
2011-07-15 11:01:36 -07:00
Alex Sakhartchouk
e173b9d73b
Merge "For the serialization context, no fifo initialization is necessary."
2011-07-15 10:57:33 -07:00
Gilles Debunne
c7f2cdea3c
Merge "Bug 4382356: No automatic focus change in ScrollViews"
2011-07-15 10:55:32 -07:00
Robert Greenwalt
d9212d3088
resolved conflicts for merge of 8550f3b8 to master
...
Change-Id: If2881b8b7faea5139af83a37cba04ccac5904f81
2011-07-15 10:52:54 -07:00
Nick Pelly
fc00b2ed4f
am 1bce9e25: am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
...
* commit '1bce9e25b6979780d849096059ef73507bdda250':
Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
2011-07-15 10:47:10 -07:00
Robert Greenwalt
e1635197bb
am 476f5525: Small fix to 5008973 fix.
...
* commit '476f55253adc670d7290ad8c90b5adc9e4f58d3b':
Small fix to 5008973 fix.
2011-07-15 10:20:48 -07:00