Adam Powell
e7dee824cf
am 8fb6d97a: Merge "Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu" into klp-dev
...
* commit '8fb6d97ad5671b4abc1940d8bc56cf7448e45c35':
Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu
2013-09-30 17:07:03 -07:00
Chet Haase
be68329500
am 033837dd: Merge "Make fading transitions work better" into klp-dev
...
* commit '033837dd6bf32b33d9a67d340efd167f94bf80cf':
Make fading transitions work better
2013-09-30 17:06:55 -07:00
Raph Levien
306bda7927
am adf14902: Merge "Fix for Text fading on RTL app names is done at the beginning..." into klp-dev
...
* commit 'adf149029f701464c66cc5cacbbbc649c1319bcd':
Fix for Text fading on RTL app names is done at the beginning...
2013-09-30 17:06:29 -07:00
Scott Main
6d28c45699
am aaf0f83c: am ef4e5e61: am 194925f9: am a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
...
* commit 'aaf0f83c69efd004420633fb577443de80eb35d6':
add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
2013-09-30 17:06:26 -07:00
Jason Monk
915015a797
am da51d36c: Merge "Fix Sending PAC Broadcast before downloaded" into klp-dev
...
* commit 'da51d36c74f62a1c50f3960919cb74c5da178cd2':
Fix Sending PAC Broadcast before downloaded
2013-09-30 17:06:23 -07:00
Jim Miller
3d4e30ba97
am 398d7f61: Merge "Update navbar camera icon and widget background assets in keyguard." into klp-dev
...
* commit '398d7f61866baab65e69b9107c36ba32bf824353':
Update navbar camera icon and widget background assets in keyguard.
2013-09-30 16:42:26 -07:00
Romain Guy
c8532ce4ae
am 33ed738d: Expose View.executeHardwareAction() Bug #10911502
...
* commit '33ed738d49dce3af5851d0566739e9ed593057a5':
Expose View.executeHardwareAction() Bug #10911502
2013-09-30 16:42:19 -07:00
Craig Mautner
5c60d6b657
am c449613e: Merge "Revert behavior to perform onResume." into klp-dev
...
* commit 'c449613ec6ffed7b4605a6708a3341ab2dd5320f':
Revert behavior to perform onResume.
2013-09-30 16:42:11 -07:00
Victoria Lease
b5f72171fb
am a4eb894a: Merge "clarify Paint flag docs" into klp-dev
...
* commit 'a4eb894a55b07eeddb05d47558e6b2838d56af08':
clarify Paint flag docs
2013-09-30 16:42:08 -07:00
Romain Guy
bb1d4d3896
am d6c1870d: am 5fceada3: Merge "Fragement, or Fragment: that is the question"
...
* commit 'd6c1870d434562a10e015915dd9da9f8a956661c':
Fragement, or Fragment: that is the question
2013-09-30 16:23:05 -07:00
Romain Guy
d6c1870d43
am 5fceada3: Merge "Fragement, or Fragment: that is the question"
...
* commit '5fceada31f0dc8f8e003e9c1d0a0ed0363711343':
Fragement, or Fragment: that is the question
2013-09-30 16:19:22 -07:00
Romain Guy
5fceada31f
Merge "Fragement, or Fragment: that is the question"
2013-09-30 22:48:44 +00:00
Cyril Mottier
2de5082f43
Fragement, or Fragment: that is the question
...
Change-Id: Iac3a14b9d2d7b4bd1e452db987b3c5c95dbefd3b
2013-09-30 22:43:59 +02:00
Elliott Hughes
917f88f033
am 82e5d875: am ebd397ad: Merge "Regenerate all the OpenGL stubs."
...
* commit '82e5d8758a61f1a49700f67f6ddb69219528bad2':
Regenerate all the OpenGL stubs.
2013-09-27 15:41:25 -07:00
Elliott Hughes
82e5d8758a
am ebd397ad: Merge "Regenerate all the OpenGL stubs."
...
* commit 'ebd397ad9182c37487ba95aaa71ae6dcf0c9d762':
Regenerate all the OpenGL stubs.
2013-09-27 15:37:56 -07:00
Elliott Hughes
ebd397ad91
Merge "Regenerate all the OpenGL stubs."
2013-09-27 22:33:25 +00:00
Nick Kralevich
19db889424
am 19f9f445: am 7a56d949: Merge "Fix SELinux.java doc errors"
...
* commit '19f9f445bfe368f801f893aad6dbd372562746ac':
Fix SELinux.java doc errors
2013-09-27 09:37:56 -07:00
Nick Kralevich
19f9f445bf
am 7a56d949: Merge "Fix SELinux.java doc errors"
...
* commit '7a56d949ef524d00e4091827104ac2450e4ec9db':
Fix SELinux.java doc errors
2013-09-27 09:35:01 -07:00
Nick Kralevich
7a56d949ef
Merge "Fix SELinux.java doc errors"
2013-09-27 16:32:57 +00:00
Adam Powell
8fb6d97ad5
Merge "Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu" into klp-dev
2013-09-27 00:46:10 +00:00
Chet Haase
033837dd6b
Merge "Make fading transitions work better" into klp-dev
2013-09-27 00:26:22 +00:00
Raph Levien
adf149029f
Merge "Fix for Text fading on RTL app names is done at the beginning..." into klp-dev
2013-09-26 23:31:49 +00:00
Scott Main
aaf0f83c69
am ef4e5e61: am 194925f9: am a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
...
* commit 'ef4e5e6182e020d0dd349848b38a33e0c33491b4':
add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
2013-09-26 16:25:24 -07:00
Jason Monk
da51d36c74
Merge "Fix Sending PAC Broadcast before downloaded" into klp-dev
2013-09-26 23:23:19 +00:00
Scott Main
ef4e5e6182
am 194925f9: am a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
...
* commit '194925f9e894d35991920edbaa0681c1aea48120':
add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
2013-09-26 16:23:06 -07:00
Scott Main
194925f9e8
am a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
...
* commit 'a8f519ff9cb38e97db34f5a7bac95a9e09ed5ade':
add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
2013-09-26 16:20:41 -07:00
Scott Main
a8f519ff9c
add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
...
Change-Id: I196ac5955477cd822bbf78a9cd4fd53a3d8fbd5f
2013-09-26 16:17:57 -07:00
Raph Levien
8079ae1a2d
Fix for Text fading on RTL app names is done at the beginning...
...
This is a fix for bug 10918591 [Android][bidid][HH] "Text fading on RTL
app names is done at the beginning of the text, not at the end."
The old logic for getting the fade edge was not symmetric with respect
to the text direction - when the text was centered, it basically
always placed the fade edge at the left, which of course is appropriate
for LTR text but not RTL. This patch makes the two paths symmetric
and sensitive to text direction.
Change-Id: Ief7604aeb659d474864468d2f102a53f5b43d09e
2013-09-26 16:17:11 -07:00
Jason Monk
d443479a45
Fix Sending PAC Broadcast before downloaded
...
The PacManager now waits until the local proxy is bound and the PAC file
is downloaded before sending out the proxy broadcast.
Bug: 10895515
Change-Id: Iaa7fc0989b52453aeeb720b44df0fca0fcb959ca
2013-09-26 23:06:32 +00:00
Adam Powell
54c94dea8a
Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu
...
Allow calling code to specify left/right/start/end gravity when
showing a popup attached to an anchor. This allows easy alignment of
either the right or left edges of the popup and anchor view.
Bug 10728401
Change-Id: Ie0844a04ea0576fa67b0972f5873aaa4c5b823f6
2013-09-26 15:49:27 -07:00
Jim Miller
398d7f6186
Merge "Update navbar camera icon and widget background assets in keyguard." into klp-dev
2013-09-26 22:27:15 +00:00
Romain Guy
33ed738d49
Expose View.executeHardwareAction()
...
Bug #10911502
Views creating hardware resources need a way to safely interact
with the hardware. This new method invokes HardwareRenderer.safelyRun()
which executes a Runnable after making sure the hardawre rendering
context is in a valid state.
With the OpenGL backend, executeHardwareAction() tries to call
eglMakeCurrent() if needed. This method is not guaranteed to
work.
Change-Id: I38ec65132eeba85605cffb1a6de12b7a0184e213
2013-09-26 22:01:01 +00:00
Craig Mautner
c449613ec6
Merge "Revert behavior to perform onResume." into klp-dev
2013-09-26 21:43:24 +00:00
Victoria Lease
a4eb894a55
Merge "clarify Paint flag docs" into klp-dev
2013-09-26 21:40:55 +00:00
Craig Mautner
5314a40b96
Revert behavior to perform onResume.
...
Back out changes from CLs ag/363992 and ag/363859. These introduced
the bugs found in bug 10917435 which is now fixed. Note that backing
out these changes reintroduces bug 10732489.
Change-Id: Ic5105dd4cfc8bf79c6f06188283d1ee3680c370c
2013-09-26 14:24:02 -07:00
Christopher Tate
a63816c1bb
am 4e9c7d8b: Merge "Sigh." into klp-dev
...
* commit '4e9c7d8ba3caa8b558e2a1de796c100a562445ae':
Sigh.
2013-09-26 14:14:54 -07:00
Svetoslav Ganov
ef7242326a
am c6afd813: Merge "PackageManager#queryIntentServices breaks its contract." into klp-dev
...
* commit 'c6afd813ac2ddaa576fc7866479e933627622248':
PackageManager#queryIntentServices breaks its contract.
2013-09-26 14:14:51 -07:00
Svetoslav Ganov
342daca7d7
am 2c854022: Merge "Choosing default paper size for the "Save to PDF" fake printer" into klp-dev
...
* commit '2c854022bf7fb6d626b0e86dc0c16372774f2432':
Choosing default paper size for the "Save to PDF" fake printer
2013-09-26 14:14:49 -07:00
Christopher Tate
4e9c7d8ba3
Merge "Sigh." into klp-dev
2013-09-26 21:10:39 +00:00
Svetoslav Ganov
c6afd813ac
Merge "PackageManager#queryIntentServices breaks its contract." into klp-dev
2013-09-26 21:10:19 +00:00
Svetoslav Ganov
2c854022bf
Merge "Choosing default paper size for the "Save to PDF" fake printer" into klp-dev
2013-09-26 21:09:25 +00:00
Amith Yamasani
946395ec7f
am d2534f8c: Merge "Don\'t remove restrictions files that are valid" into klp-dev
...
* commit 'd2534f8c05ccdf692f1e265ae719b67290d15050':
Don't remove restrictions files that are valid
2013-09-26 14:04:21 -07:00
Amith Yamasani
d2534f8c05
Merge "Don't remove restrictions files that are valid" into klp-dev
2013-09-26 21:02:10 +00:00
Svetoslav Ganov
0ce3e8743c
Choosing default paper size for the "Save to PDF" fake printer
...
Change-Id: I1e2eb73fd1eb3b1e9812155b69b94cba261243c2
2013-09-26 13:54:49 -07:00
Victoria Lease
8dc7d5ea26
clarify Paint flag docs
...
Bug: 10460797
Change-Id: Iae622b302cad3dc788f512b472e3a59ec227a8d7
2013-09-26 13:40:47 -07:00
Chet Haase
b7a7fc9d23
Make fading transitions work better
...
Previously, a Fade transition would only affect a view if its
parent hierarchy was not also affected between the start/end states.
This caused problems for views which were removed from their parents
between scenes when their parents' visibility also changed between those
scenes. The effect would be that the transition would fade the parent...
but the child would no longer be in that parent, so the user would just see the
child view blink out.
This fix ensure that views are faded appropriately by fading them
regardless the parent hierarchy; if a view is removed from its
parent, fade it out.
Additionally, if that view has not been removed from its parent, but
its parent is no longer parented *and* scene being
transitioned from is based on a layout resource file (and thus
the views are considered temporary after transitioning), then it is
removed from its parent to be faded out in the overlay.
Also, renamed TextChange to ChangeText to be more consistent with
other transition class names.
Change-Id: I4e0e7dfc9e9d95c7a4ca586534b6d204c4f3bae0
2013-09-26 13:38:12 -07:00
Jeff Sharkey
66ee877f5d
am 8c6c0419: Merge "Tighten flags enforcement, API to test Uris." into klp-dev
...
* commit '8c6c04197e58be6f3e46ba6a38f5d16e4fb091fa':
Tighten flags enforcement, API to test Uris.
2013-09-26 13:37:21 -07:00
Jeff Sharkey
8c6c04197e
Merge "Tighten flags enforcement, API to test Uris." into klp-dev
2013-09-26 20:33:29 +00:00
Zhijun He
db2aacfb7b
am 8f4e289f: Merge "Camera2: Fix focusRange type" into klp-dev
...
* commit '8f4e289f8c1f4743a459b232b9e5ac9d58095139':
Camera2: Fix focusRange type
2013-09-26 13:30:23 -07:00
Zhijun He
8f4e289f8c
Merge "Camera2: Fix focusRange type" into klp-dev
2013-09-26 20:28:19 +00:00