Commit Graph

38266 Commits

Author SHA1 Message Date
Elliott Hughes
10596fbcce resolved conflicts for merge of 3ce4f3d0 to master
Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210
2014-04-28 13:53:25 -07:00
Yohei Yukawa
b609ea3884 Merge "Revise Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT" 2014-04-28 20:33:26 +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
Yohei Yukawa
985fd3063c Merge "Return the cursor position in screen coordinates" 2014-04-28 19:17:05 +00: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
Dianne Hackborn
fb875cb028 Merge "Rework some of the voice interaction APIs." 2014-04-28 18:28:06 +00:00
Elliott Hughes
bbd87eb919 Merge "Track libcore.os' move to android.system." 2014-04-28 18:14:00 +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
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
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
George Mount
80c1210e59 Merge "Fade Transition sometimes disappeared improperly." 2014-04-28 17:23:53 +00:00
Jeff Sharkey
dd77fdacca Define action used to show regulatory info.
Bug: 13340779
Change-Id: I90abb3574797e4b258d32440a2434ae8a7be2949
2014-04-28 08:54:17 -07:00
Jeff Sharkey
28f0877073 Allow custom wallpaper and boot animation.
Add new "ro.config.wallpaper" and "ro.config.wallpaper_component"
properties which may be defined outside of the bundled framework
resources.  Falls back to bundled resources when properties are
undefined.

Also look for boot animation under OEM partition.

Bug: 13340779
Change-Id: Ibdc9935dbdaae3319bf63b40573de0503d82ae67
2014-04-28 08:54:17 -07:00
Jeff Sharkey
bdd4491b32 Gracefully handle long fingerprints.
Otherwise derived fingerprints longer than the maximum system property
size put the device into a crash loop.

Bug: 13983493
Change-Id: I8a88e71b1fd396f1cd63b414e3a62bb25010430c
2014-04-28 08:54:16 -07:00
Jeff Sharkey
5568772e81 Derive fingerprint at runtime when undefined.
Some devices leave "ro.build.fingerprint" undefined at build time,
since they need to build it from the components at runtime.

Bug: 13340779
Change-Id: I4d74398817af22079a11c196dc6742b85d2bfb61
2014-04-28 08:54:16 -07:00
Chris Wren
01c70711d5 Merge "Remove opPkg from the notification key." 2014-04-28 15:03:17 +00:00
Chris Wren
e6345b5194 Remove opPkg from the notification key.
Change-Id: Iadff2dbeb3c9ec69837d3b6e763f24d687ee368b
2014-04-28 10:53:05 -04:00
Jim Miller
df2258be5b Fix doc build.
We probably don't need to deprecate this constant.  It can still be used
by partner devices if they choose to continue to support widgets.

Change-Id: Ie8c33446e0c5c32d96ed0670df1772adedf6a5de
2014-04-27 20:11:44 -07:00
Alan Viverette
2a56ef70cd Merge "Quantum ripple for ListView selector" 2014-04-28 01:14:47 +00:00
Alan Viverette
d1ca75bffe Quantum ripple for ListView selector
Also fixes row clipping and ripple alpha channel. Only supports showing
ripple on a single list row -- multiple rows for focus traversal and
drag-to-open are coming soon.

BUG: 13212804
BUG: 14257108
Change-Id: Ided15611dc868a513e8d2a994723cdf57b0d206c
2014-04-27 18:13:34 -07:00
John Spurlock
1c923a386e Force condition provider unsubscribe when exiting zen mode.
Bug:13743109
Change-Id: I3c205067498a86e2862a0c545bc38e41682693d5
2014-04-27 17:41:51 -04:00
John Spurlock
e77bb36d48 Wire up condition providers to zen mode exit triggers.
Bug:13743109
Change-Id: I4e45d7050d1f9aaa379f46379a3203e61e216a3d
2014-04-27 11:36:32 -04:00
Chris Craik
6689c9700d Merge "Support Oval GradientDrawable outlines, and ShapeDrawable" 2014-04-26 01:59:00 +00:00
Jim Miller
66fbe3dc81 Merge "Add new DevicePolicyManager disable flags for keyguard." 2014-04-26 00:28:44 +00:00
George Mount
1b2fb2ca13 Fade Transition sometimes disappeared improperly.
Bug 14320504

Change-Id: I43c2ddd34a5bd3a366027cd3c09d088baa4fb6f4
2014-04-25 17:07:58 -07:00
Amith Yamasani
0150b48c4c Merge "Handle density request in LauncherActivityInfo" 2014-04-25 23:04:27 +00:00
Chris Craik
7979388d4f Support Oval GradientDrawable outlines, and ShapeDrawable
Change-Id: Ifc9e55757d3325cb28a1a812ec696512d4a18b39
2014-04-25 15:59:47 -07:00
Amith Yamasani
30acde7e90 Handle density request in LauncherActivityInfo
Change-Id: I4e8dc8ef1454b3881bdb80ae118e2d0d306642f3
2014-04-25 15:56:26 -07:00
Mark Salyzyn
95df2024ed am a19b9c41: am dfdeabf9: am ac732708: Merge "EventLog: event log translation errors"
* commit 'a19b9c413b3e7f3b6038b06c51d01bab1e0bfda9':
  EventLog: event log translation errors
2014-04-25 22:52:09 +00:00
Craig Mautner
e361268e6e am cb48b962: am 1a7e9e66: Merge "Throw exception from startActivity if not allowed." into klp-modular-dev
* commit 'cb48b96223071dc9d8633aab8f6cd9a91b3676bf':
  Throw exception from startActivity if not allowed.
2014-04-25 22:10:12 +00:00
Mark Salyzyn
a19b9c413b am dfdeabf9: am ac732708: Merge "EventLog: event log translation errors"
* commit 'dfdeabf9ba40ea7f082acf7eba6fe086d2e643fb':
  EventLog: event log translation errors
2014-04-25 22:07:07 +00:00
Adam Powell
07064fa730 Merge "Fix ScrollView nested scrolling with touch down on buttons" 2014-04-25 21:34:32 +00:00
destradaa
08f15963fe Merge "Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework. b/14118906" 2014-04-25 21:21:37 +00:00
Adam Powell
e9a16a5a3e Fix ScrollView nested scrolling with touch down on buttons
Start ScrollView's nested scroll in onIntercept to signal nested
scrolling parents not to intercept along the vertical axis.

Change-Id: Ieb343ff6b8216b113d3876bf93a804e609257f2a
2014-04-25 14:21:27 -07:00
Mark Salyzyn
747802f8aa EventLog: event log translation errors
- Deal with L using v3 event log format, or K using v1 or v2 event log format

Change-Id: Id4fb205f51b7e506135888d565acf1604497b91f
2014-04-25 13:45:03 -07:00
Jim Miller
50e62183d4 Add new DevicePolicyManager disable flags for keyguard.
- KEYGUARD_DISABLE_SECURE_NOTIFICATIONS
- KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS
- KEYGUARD_DISABLE_TRUST_AGENTS

Change-Id: I4ed2b9cef78b497d87bb719c57fabdad94c18e82
2014-04-25 13:27:10 -07:00
Kenny Guy
86a6430e52 Provide access to ActivityInfo.name from LauncherActivityInfo
Change-Id: Ia34900f3e232b59f3879dbb3cb3131498023b8ac
2014-04-25 21:21:55 +01:00
Craig Mautner
cb48b96223 am 1a7e9e66: Merge "Throw exception from startActivity if not allowed." into klp-modular-dev
* commit '1a7e9e66a6de039da8f567a2087d9bce34820746':
  Throw exception from startActivity if not allowed.
2014-04-25 18:45:06 +00:00
destradaa
cc972725af Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework.
b/14118906

Change-Id: I4723a3b9cad99aacc70bd3b7b5b5e034aa6c033d
2014-04-25 11:39:16 -07:00
Amith Yamasani
250bb6e3e0 Merge "Allow profile owners to set user restrictions" 2014-04-25 18:23:37 +00:00
Craig Mautner
247ab65a49 Throw exception from startActivity if not allowed.
The ActivityView.startActivity method may defer calling
ActivityContainer.startActivity if the ActivityView is not yet
visible. If the activity being started doesn't have allowEmbedded
attribute set to true then the SecurityException will not be
thrown until the ActivityView is visible. In such a case the caller
of ActivityView.startActivity cannot catch the SecurityException.

This fix checks the attribute at the time ActivityView.startActivity
is called.

Fixes bug 14317210.

Change-Id: I7fff23e39b67a9a0aa1b2e555920d02ae38906d9
2014-04-25 11:20:01 -07:00
John Spurlock
b22aabbbd2 Merge "Introduce condition provider services." 2014-04-25 18:19:06 +00:00
Yuling Liang
2be1f8c3f4 am 69a9d925: am eea94f06: Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev
* commit '69a9d92502428a4cf6eb6b5bf6577d9e525796a2':
  Revert "Followon fix for 14276128 Clipping at bottom of TextView"
2014-04-25 17:38:00 +00:00
Yuling Liang
69a9d92502 am eea94f06: Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev
* commit 'eea94f060a917a5c6195a81d8825551a430a8d69':
  Revert "Followon fix for 14276128 Clipping at bottom of TextView"
2014-04-25 17:35:52 +00:00
Yuling Liang
10973c7776 Revert "Followon fix for 14276128 Clipping at bottom of TextView"
This reverts commit a10e19845c.

Change-Id: I6d40451c9eb6285859e16d251b55947663a3553a
2014-04-25 17:32:08 +00:00
Alexandra Gherghina
d8e6a5f18a Merge "Temporarily switch off returning only enabled profiles to support dogfooding" 2014-04-25 17:12:44 +00:00
Alexandra Gherghina
92d6aea86e Temporarily switch off returning only enabled profiles to support dogfooding
Bug: 14132551
Change-Id: I3679c8fc248a799c816e5b80641b1fca6b7af061
2014-04-25 18:11:21 +01:00