129620 Commits

Author SHA1 Message Date
Chris Craik
cc39e16cb9 Add elevation, Z properties to View
Change-Id: I3dd3b683a66e248a0fdf2ca69d1e962615b0daf9
2014-04-28 14:33:33 -07:00
Yorke Lee
2e9c300b91 Merge "Add setOverlay method to QuickContactsBadge" 2014-04-28 21:24:21 +00:00
Griff Hazen
7c12112d62 am e638b844: am 3c5a6cf9: am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
* commit 'e638b84436caeea8d54b560c0b883ef599ba328d':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
2014-04-28 21:21:10 +00:00
Adam Lesinski
1ebf4ef188 Merge "Merge commit '734a78fb' into manualmerge" 2014-04-28 21:20:01 +00:00
Bo Liu
802667b20b Merge "Add invokeFunctor call to ViewRootImpl" 2014-04-28 21:16:14 +00:00
Adam Lesinski
e929bee9bb Merge commit '734a78fb' into manualmerge
Conflicts:
	core/java/android/app/WallpaperManager.java

Change-Id: Id103f540329ea484ff2e0829a0fc8158621f3dd3
2014-04-28 14:15:06 -07:00
Elliott Hughes
812ad2265e am d937f275: am 12928a07: am 2336c4ec: Merge "Fix build."
* commit 'd937f2750c6edc2c1a03901605b22dad02b89147':
  Fix build.
2014-04-28 21:02:17 +00:00
Yorke Lee
a702ccdf9f Add setOverlay method to QuickContactsBadge
Allow apps to disable/configure their own overlay to be used
on the QuickContactsBadge

Bug: 13747208

Change-Id: Id84c6ee1ebde6ce17477c12d22522ca19c27ea9b
2014-04-28 13:57:04 -07:00
Elliott Hughes
10596fbcce resolved conflicts for merge of 3ce4f3d0 to master
Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210
2014-04-28 13:53:25 -07:00
Bo Liu
ae738a7a45 Add invokeFunctor call to ViewRootImpl
BUG: 13961296

Change-Id: Ief8eea0b4c79a64ea76d75daaec176f1b8438581
2014-04-28 13:41:18 -07:00
Griff Hazen
e638b84436 am 3c5a6cf9: am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
* commit '3c5a6cf93520be23e6d5a9bc4cb8f4e8c18214b1':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
2014-04-28 20:37:24 +00:00
Yohei Yukawa
b609ea3884 Merge "Revise Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT" 2014-04-28 20:33:26 +00:00
Griff Hazen
3c5a6cf935 am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
* commit '2c6131bba957dc5b4e1638bb8b0c10ebddf2049a':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
2014-04-28 20:33:22 +00:00
Adam Lesinski
734a78fb86 am 8ea2d451: Merge "Various CTS fixes" into klp-modular-dev
* commit '8ea2d4512248ec612356f558ac35534c3e4c6db6':
  Various CTS fixes
2014-04-28 20:33:09 +00:00
Adam Lesinski
8ea2d45122 Merge "Various CTS fixes" into klp-modular-dev 2014-04-28 20:30:35 +00:00
Alan Viverette
a1a680480e Fix alert dialog icon
Previously, failing to call setIcon() would result in a blank icon
rather than hiding the icon. Also, calling setIcon(icon) followed by
setIcon(null) could be a no-op depending on whether the alert had
already been constructed.

Change-Id: I65a96a4e89b9eac1123cbbf5d57e7e366e7b4d4e
2014-04-28 13:30:08 -07:00
Griff Hazen
2c6131bba9 am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
* commit '293977bdb028e2aa893fbeb370e20132646094a9':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
2014-04-28 20:29:12 +00:00
Mathieu Chartier
ce4c6218a6 am c6d0dc89: am 18582a82: am 0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS."
* commit 'c6d0dc896438d8918f4f985513e92be9b4d69e87':
  Use Runtime.gc instead of System.gc for DDMS.
2014-04-28 20:03:38 +00:00
Yohei Yukawa
c644ff6d4f Revise Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT
This is a follow-up CL for I3acf2317ae1d763d11 to improve the
Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT

BUG: 14323360
Change-Id: Ie8948eda3ce57da282bd82e8e9a44997f6d53245
2014-04-29 05:01:08 +09:00
Elliott Hughes
d937f2750c am 12928a07: am 2336c4ec: Merge "Fix build."
* commit '12928a07c5c19ac3dea6d0489506595c138b621a':
  Fix build.
2014-04-28 19:48:24 +00:00
Elliott Hughes
12928a07c5 am 2336c4ec: Merge "Fix build."
* commit '2336c4ecc5735eb374e5c804b1fe863650c24d7f':
  Fix build.
2014-04-28 19:45:06 +00:00
Elliott Hughes
2336c4ecc5 Merge "Fix build." 2014-04-28 19:41:24 +00:00
Elliott Hughes
9790190fee Fix build.
Change-Id: I0bd6e1aac19276bf664accd8d38f86d2cc7450cc
2014-04-28 12:40:12 -07:00
Alan Viverette
5ec00ab05c Make switchStyle public
Change-Id: I4960c4ebeb3db09b3d716330b33639c865d37490
2014-04-28 12:39:15 -07:00
Christopher Lane
6d50c3ff88 Merge "Fix incorrect "listener no longer active" errors" 2014-04-28 19:24:07 +00:00
Yohei Yukawa
985fd3063c Merge "Return the cursor position in screen coordinates" 2014-04-28 19:17:05 +00:00
Jorim Jaggi
10c84f0109 Merge "Attemp to fix blank lockscreen #2." 2014-04-28 19:08:41 +00:00
Jorim Jaggi
fa505a7f26 Attemp to fix blank lockscreen #2.
Bug: 14280857
Change-Id: Ib868cc7a01d24f7169310774a5397b90a2d5b35f
2014-04-28 21:06:37 +02:00
Jorim Jaggi
d3406d7a1a Merge "Flatten notification hiearchy and remove glow." 2014-04-28 19:01:14 +00:00
Jorim Jaggi
fe40f7d13b Flatten notification hiearchy and remove glow.
Currently, the padding and the glow was inside the individual
notification. This no longer works if we want to adjust the
padding dynamically whether we are on Keyguard or not. This change
moves the padding outside of the individual notifications, and as
a side effect, removes the glow. The glow wasn't really visible with
the new layout, so it's not a breaking change. We have to discuss
with UX first what the new "glow" solution is going to be.

Change-Id: Iac16892cb3b7bb1de3001954b1428796b07950c1
2014-04-28 20:59:26 +02:00
Yohei Yukawa
4de04795f9 Return the cursor position in screen coordinates
From its beginning, InputMethodService#onUpdateCursor has
provided the cursor position in local coordinates in the attached
view. However, the local coordinates is not useful for IMEs
to render a floating UI near the cursor because the IME is not
able to know the origin of the attached view.

With this CL, CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT also means
that the IME will receive the cursor position in screen
coordinates. Because this is a new constant in the next release,
conditionally changing the coordinates never causes
compatibility issues as long as its behavior is well documented.

BUG: 14323360
Change-Id: I3acf2317ae1d763d11dae5ef73c2a1348b377c71
2014-04-29 03:53:34 +09:00
Elliott Hughes
3ce4f3d0af am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system."
* commit '685a0a72d445515167a2071330679cdf9b53a62d':
  Track libcore.os' move to android.system.
2014-04-28 18:36:53 +00:00
Mathieu Chartier
c6d0dc8964 am 18582a82: am 0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS."
* commit '18582a827c3f908cd75e1d9c189c554f42415a4a':
  Use Runtime.gc instead of System.gc for DDMS.
2014-04-28 18:36:44 +00:00
Alan Viverette
21cc573199 Merge "Pull out dirty bounds before nulling ripples" 2014-04-28 18:29:04 +00:00
Selim Cinek
622e32bb6a Merge "Fixed race condition regarding first child max height" 2014-04-28 18:28:32 +00:00
Dianne Hackborn
fb875cb028 Merge "Rework some of the voice interaction APIs." 2014-04-28 18:28:06 +00:00
Selim Cinek
2ba5f1f4e3 Fixed race condition regarding first child max height
The scroller could crash due to a race condition when updating
the maxheight of the first view.

Bug: 14295010
Change-Id: I911c724a26c8624e2326118e3b392ee675001bc6
2014-04-28 20:27:32 +02:00
Alan Viverette
323596de4e Pull out dirty bounds before nulling ripples
BUG: 14378485
Change-Id: I286374db9865d2338852fd0df896928099a8eb24
2014-04-28 11:22:40 -07:00
Elliott Hughes
685a0a72d4 am bbd87eb9: Merge "Track libcore.os\' move to android.system."
* commit 'bbd87eb9193e9730869171324ee4f5fc1abeae55':
  Track libcore.os' move to android.system.
2014-04-28 18:17:06 +00:00
Elliott Hughes
bbd87eb919 Merge "Track libcore.os' move to android.system." 2014-04-28 18:14:00 +00:00
Mathieu Chartier
18582a827c am 0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS."
* commit '0cd623bb9f832194cdd9c08625fa32583e947c76':
  Use Runtime.gc instead of System.gc for DDMS.
2014-04-28 18:13:07 +00:00
Elliott Hughes
34385d352d Track libcore.os' move to android.system.
(This is partial, but should cover everything in AOSP master except
for the zygote.)

Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
2014-04-28 11:11:32 -07:00
Mathieu Chartier
0cd623bb9f Merge "Use Runtime.gc instead of System.gc for DDMS." 2014-04-28 18:10:42 +00:00
Mathieu Chartier
83f7d0d67f Use Runtime.gc instead of System.gc for DDMS.
System.gc doesn't always do a GC unless to attempt to run the
finalizers after you call System.gc.

Bug: 14325353
Change-Id: Iebed7fad5576d610cea13a86e7d3d46652c67478
2014-04-28 11:07:22 -07:00
Raph Levien
d97b097a5b Followon fix for 14276128 Clipping at bottom of TextView
The previous fix did not work when the text was ellipsized, because the
test for whether the line was the last line was incorrect. The new test
handles both the end of the buffer and the case where it is the last
line because of ellipsizing.

So this should be the proper fix for bug 14276128 Clipping at bottom of
TextView when lineSpacingMultiplier < 1

This version of the patch also handles the single-line case (which is
computed in BoringLayout rather than StaticLayout).

Change-Id: I88791acc2aa493cc8c599b374f4d213571260b4b
2014-04-28 18:02:27 +00:00
Dianne Hackborn
18f0d357f9 Rework some of the voice interaction APIs.
On the app side, requests are now composed by subclassing
from various types of Request objects.

On the service side, starting a voice interaction session
involves starting another service that will then manage the
session.  This leads the service design much more to what
we want, where the long-running main service is very tiny
and all the heavy-weight transient session work is elsewhere
in another process.

Change-Id: I46c074c6fe27b6c1cf2583c6d216aed1de2f1143
2014-04-28 10:54:15 -07:00
Baligh Uddin
94b6f73368 Import translations. DO NOT MERGE
Change-Id: Ie48d7eaf59819fac2bcdc2a6d8a706a3bfa3c6dd
Auto-generated-cl: translation import
2014-04-28 10:34:23 -07:00
Griff Hazen
293977bdb0 Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
The logic was opposite.

Change-Id: I62e0b1e6701a4c9990119a1b94918e64783e9b1a
2014-04-28 10:32:21 -07:00
Baligh Uddin
9b0e267f4c Import translations. DO NOT MERGE
Change-Id: I0759dcb477375df5e96160003f421821fb5ba371
Auto-generated-cl: translation import
2014-04-28 10:27:17 -07:00
George Mount
80c1210e59 Merge "Fade Transition sometimes disappeared improperly." 2014-04-28 17:23:53 +00:00