Adam Powell
d9b0ee029f
Merge "Tweak action bar metrics."
2011-06-22 21:14:42 -07:00
Romain Guy
8b4512ef20
Merge "Prevent possible NPE in TextureView"
2011-06-22 21:02:31 -07:00
Romain Guy
1ec3a58bcd
Prevent possible NPE in TextureView
...
Change-Id: I539813d614c7eb1f68dad6b605cbad5b5144c5e9
2011-06-22 21:01:58 -07:00
Romain Guy
c2e0a1f1cd
Merge "Add the ability to specify the opacity of a TextureView"
2011-06-22 20:59:46 -07:00
Romain Guy
a9489274d6
Add the ability to specify the opacity of a TextureView
...
TextureView assumes its content is opaque by default.
Change-Id: Iba873423566a5b67c388081838bd910dceba32ba
2011-06-22 20:58:11 -07:00
Adam Powell
0d5d1b7e8c
Tweak action bar metrics.
...
Free up some more pixels in the action bar and better define how icons
within it resize.
Change-Id: I0768180e595ee7b23190a26607e8989fa1bac38f
2011-06-22 20:41:44 -07:00
Nick Pelly
b8a8c7a279
resolved conflicts for merge of 6ce70394 to master
...
Change-Id: I7a4a08409c0133a1738b03b476f2b388c7aec5bf
2011-06-22 20:32:36 -07:00
Xia Wang
fdd33e0144
Merge "Fix issues in Opengl Benchmark tests: - fix live wallpaper drawing, bind the global vertex program after it - scale the icons according to render surface in display icons, also add a background for the icon display test case."
2011-06-22 19:34:34 -07:00
Jim Miller
71c77aa822
Merge "Update LockScreen layouts to latest UX spec."
2011-06-22 18:10:02 -07:00
Shimeng (Simon) Wang
6ecf3e90f2
Merge "Use local variable instead of webview method."
2011-06-22 17:58:57 -07:00
Shimeng (Simon) Wang
b30381d783
Use local variable instead of webview method.
...
This removes the thread warning.
Change-Id: Id2eec46fda8413cfaed49d2a97de40491b7496a2
2011-06-22 17:44:27 -07:00
Conley Owens
1c5d9dec7b
am 587e9563: am c1b62e3b: am bf5adfa5: Merge "Check if we are in daylight time when calculating timezone"
...
* commit '587e9563d61beaaa67090eddd99b737847561eb9':
Check if we are in daylight time when calculating timezone
2011-06-22 17:37:19 -07:00
Chet Haase
ef716baaa0
Merge "Fix flashing artifacts caused by invalidation bugs"
2011-06-22 17:17:02 -07:00
Romain Guy
5ab03d5fa9
Merge "Fix another memory leak in OpenGLRenderer"
2011-06-22 17:12:14 -07:00
Romain Guy
d586ad9c9f
Fix another memory leak in OpenGLRenderer
...
Change-Id: I23ed56891452a05cf3ca13f6919c4fef90d5ff4e
2011-06-22 17:10:00 -07:00
Jaikumar Ganesh
ae16cd8137
Merge "Get the profile proxies after the BT Service is up."
2011-06-22 17:05:21 -07:00
Jaikumar Ganesh
78ff1a658b
Get the profile proxies after the BT Service is up.
...
Trying to get the profile proxies before service is up will
cause a NPE.
Change-Id: I604041d6823775abbc2fe10794afaac83d6827ce
2011-06-22 16:55:32 -07:00
Romain Guy
ac3e355bc9
Merge changes I00b54796,Iac465b72
...
* changes:
Change max heap size to 48MB
Fix memory leak in OpenGLRenderer.
2011-06-22 16:14:58 -07:00
Romain Guy
83c033de06
Change max heap size to 48MB
...
Change-Id: I00b547960c07f1cbe753c3a1391fd3840bd70ea3
2011-06-22 16:12:41 -07:00
Jim Miller
08a975ef86
Update LockScreen layouts to latest UX spec.
...
- better placement and consistent handling of emergency button.
- use new GridLayout for landscape modes.
- add dimensionable parameters for time and status line fonts.
- fix assets and emergencyCallButton resource references when building for tablets.
Change-Id: I5f4c9cfb6a88ce3ccd8ab4fdafede8e6e59f9407
2011-06-22 16:08:09 -07:00
Chet Haase
ad4f70306b
Fix flashing artifacts caused by invalidation bugs
...
Therea re 2 fixes here:
- We sometimes cleared a flag in ViewAncestor too soon that controlled
how invalidated areas were redrawn (related to whether the invalidates
happened on opaque views or not).
- TransitionDrawable was always setting/restoring alpha values on its
drawables every time it was drawn. setAlpha on BitmapDrawable causes
an invalidation, so essentially this was an infinite invalidation/redrawing
loop. The fix was to notice when the animation was done and to simply
draw the appropriate drawable[s].
Change-Id: I1849a5a909b0039a0e9bce0aa3cfc33c50f8f854
2011-06-22 15:53:53 -07:00
Romain Guy
f6a63ae3a7
Fix memory leak in OpenGLRenderer.
...
When creating a display list, matrices are duplicated locally. They
were however never deleted, thus causing apps to slowly leak memory
(a matrix is about 40 bytes.)
Change-Id: Iac465b720d4c4c9b5ca3fce870c0c912c14a74ab
2011-06-22 15:13:09 -07:00
Romain Guy
4d65fdc810
Merge "Collapse UI events in TextureView."
2011-06-22 15:01:59 -07:00
Romain Guy
c989d867f2
Collapse UI events in TextureView.
...
Change-Id: Ia6c0cef0f694edc4b685c1ade1a9ba509a51e541
2011-06-22 15:01:07 -07:00
Brian Carlstrom
c7dc3dcb57
Merge "Fix build."
2011-06-22 14:45:10 -07:00
Robert Greenwalt
7af34ab836
Merge "resolved conflicts for merge of 7a652bc8 to master"
2011-06-22 14:41:09 -07:00
Dianne Hackborn
bd67cddd0d
Merge "Don't report a resize unless the window's surface actually changed."
2011-06-22 14:13:35 -07:00
Shailendra
31f8b62855
Merge "Fix for kenBurn Effect for PNG image is crashing (4861071 )"
2011-06-22 14:13:21 -07:00
Gloria Wang
019caf42c0
Merge "Timed text display format support: 1. Extract 3GPP global format descriptions 2. Extract 3GPP local format descriptions 3. Define data structure (TimedText) for applications to retrieve the format metadata"
2011-06-22 13:47:45 -07:00
Romain Guy
06e87407f7
Merge "Fix the issue where TextureView stuck if the producer side is too fast."
2011-06-22 13:42:34 -07:00
Brian Carlstrom
86b569020b
Merge "JniUtil depends on webcore native library and should not depend on others to load it"
2011-06-22 13:42:07 -07:00
Robert Greenwalt
5ff886e531
resolved conflicts for merge of 7a652bc8 to master
...
Change-Id: Id0a41cae36f5a3b30f2fe8a202c934153b9cd03f
2011-06-22 13:20:14 -07:00
Adam Powell
bacbe7fd72
Merge "Fix bug 4807086 - Options menu panel too narrow in landscape"
2011-06-22 12:58:03 -07:00
Mike Lockwood
181735a8d5
Merge changes I9851299e,I4160e73a
...
* changes:
Combine UsbManager.setPrimaryFunction and setDefaultFunction
Fix window leak in UsbPreferenceActivity
2011-06-22 12:24:26 -07:00
Mike Lockwood
f59717ddb5
Combine UsbManager.setPrimaryFunction and setDefaultFunction
...
Due to the property trigger on persist.sys.usb.config,
setting the default function also sets the current function.
Now we combine both of these methods into setCurrentFunction, which has
a "makeDefault" option to make the new function the default.
This change should eliminate some problems with setting properties due to
multiple property triggers happening at the same time.
Change-Id: I9851299e9c2ee20475eada1a8104c0d50bf5a9e1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-22 15:19:33 -04:00
Shailendra
d7ed599263
Fix for kenBurn Effect for PNG image is crashing (4861071 )
...
Change-Id: I4b9905ca862a1f0eac0bed4c7f021e93f79ea592
2011-06-22 12:15:56 -07:00
Dianne Hackborn
b961cd2c80
Don't report a resize unless the window's surface actually changed.
...
Change-Id: I133cf8e417753dba60d23a3bfc1c84ace983b335
2011-06-22 12:10:25 -07:00
Svetoslav Ganov
5df21a1843
Merge "Minor tweak I forgot in the presious change."
2011-06-22 11:41:25 -07:00
Svetoslav Ganov
1ecc1e098a
Minor tweak I forgot in the presious change.
...
Change-Id: I17854e3c824bea5b6c0ffeea45f986f0b5297054
2011-06-22 11:40:13 -07:00
Svetoslav Ganov
b5d578fbdb
Merge "AccessibilityNodeInfo bounds inconsistent with compatibility mode."
2011-06-22 11:35:47 -07:00
Brian Carlstrom
98e1e18c1c
Fix build.
...
git cherry-pick --no-commit 22a614142aacce13fc46a0e524dbfb6ca56bf237
Change-Id: I1409bc3dd1f1b3027c12355e8b6aeffa2d857c83
2011-06-22 11:35:11 -07:00
Gloria Wang
eaa5d8f9c0
Timed text display format support:
...
1. Extract 3GPP global format descriptions
2. Extract 3GPP local format descriptions
3. Define data structure (TimedText) for applications to
retrieve the format metadata
Change-Id: I6eac2a78df29ee15beee456656331fdd83b24e8e
2011-06-22 11:32:19 -07:00
Brian Carlstrom
452ffe7d1e
JniUtil depends on webcore native library and should not depend on others to load it
...
Bug: 4584468
Change-Id: Ib553cda843669d40cc52ff0bc84bea2c626c5045
2011-06-22 11:29:56 -07:00
Adam Powell
a3e3c533ee
Fix bug 4807086 - Options menu panel too narrow in landscape
...
Now that landscape on phones uses the config_prefDialogWidth setting
to restrict the default size of dialog windows, the options menu panel
was affected.
Restrict the ratcheting preferred width feature based on the width
LayoutParam only, and respect the LayoutParams width provided by panel
windows.
Change-Id: Idc62f41910f6f22dc50cab978c5642bb0a8dbdaf
2011-06-22 11:21:54 -07:00
James Dong
032897470a
Merge "Add some error log messages to indicate the failure of a recording session"
2011-06-22 11:07:52 -07:00
James Dong
0f5d8441ef
Merge "Switch to use MediaMetadataRetriever to generate the project thumbnail when the first media item is a MediaVideoItem"
2011-06-22 10:33:25 -07:00
Philip Milne
0edc52970f
Merge "Minor tweaks to GridLayout for KeyGuardScreenUnlock."
2011-06-22 10:18:32 -07:00
James Dong
839ba2c183
Add some error log messages to indicate the failure of a recording session
...
Change-Id: I8c5885200bcf6a59736076efc021f07f45a0fdac
2011-06-22 10:09:03 -07:00
Mike Lockwood
7730ad569d
Fix window leak in UsbPreferenceActivity
...
Change-Id: I4160e73a4e840662c6ac724e27460853fb259eae
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-22 12:02:10 -04:00
Grace Kloba
0bc6eb30bc
Fix the issue where TextureView stuck if the producer side is too fast.
...
When SurfaceTexture is in sync mode, the consumer needs to pull the pending
frames. Otherwise the onFrameAvailable won't be called and no more update.
This simple fix is to skip frame to keep up with the producer side.
Change-Id: Ica833695dc0b0221d2543f46f0dd41aa55d1aa16
2011-06-22 01:29:13 -07:00