Commit Graph

46127 Commits

Author SHA1 Message Date
Alan Viverette
0e7c022601 Merge "Add single-arg TextView.setTextAppearance, deprecate two-arg method" 2015-03-18 00:34:38 +00:00
Dianne Hackborn
27eac1d58f Add ability to get a screenshot for assist.
New flag you pass in to startSession() to say you want it,
new callback on VoiceInteractionSession to receive it.

Change-Id: I61fdcfdee41a60d46036a2ef16681a9b4181115a
2015-03-17 16:45:51 -07:00
Andreas Gampe
9a9b45c285 am d6f25364: am 9568772a: Merge "Frameworks/base: Fix format string in Geofence"
* commit 'd6f25364eed09d39b493488cd6adaa02e0d8a252':
  Frameworks/base: Fix format string in Geofence
2015-03-17 22:02:29 +00:00
Andreas Gampe
d6f25364ee am 9568772a: Merge "Frameworks/base: Fix format string in Geofence"
* commit '9568772acbf5b36f2edb41f7c5b06d499329add0':
  Frameworks/base: Fix format string in Geofence
2015-03-17 21:42:55 +00:00
Andreas Gampe
9568772acb Merge "Frameworks/base: Fix format string in Geofence" 2015-03-17 21:30:49 +00:00
Andreas Gampe
1414a6291d Frameworks/base: Fix format string in Geofence
%p is not a valid conversion in format strings. It is also superfluous,
as it is already known that location is null.

Bug: 19797138
Change-Id: I5784e28b05b4ca9aac57e0fc9da4a7f01d9b3247
2015-03-17 21:30:20 +00:00
Andreas Gampe
1938a389e7 am 3814163b: am aae42eb2: Merge "Frameworks/base: Fix format string in Camera"
* commit '3814163b6ddc35292f6b25f782ad7a858c703c24':
  Frameworks/base: Fix format string in Camera
2015-03-17 21:12:25 +00:00
Andreas Gampe
3814163b6d am aae42eb2: Merge "Frameworks/base: Fix format string in Camera"
* commit 'aae42eb26176482b09f0846e6acf7efa844a0d23':
  Frameworks/base: Fix format string in Camera
2015-03-17 21:05:48 +00:00
Andreas Gampe
b95d079c80 am e4bdf3c1: am be549f9b: Merge "Frameworks/base: Fix precedence bug"
* commit 'e4bdf3c1c9e7be06b68cc32f9a492d512bf87528':
  Frameworks/base: Fix precedence bug
2015-03-17 20:56:02 +00:00
Andreas Gampe
aae42eb261 Merge "Frameworks/base: Fix format string in Camera" 2015-03-17 20:52:21 +00:00
Andreas Gampe
02ffb2aad9 Frameworks/base: Fix format string in Camera
One cannot print a boolean with %d. That will result in an exception.

Bug: 19797138
Change-Id: I86c42ea834cebebaecff8463637cc9de14d1fc88
2015-03-17 20:51:38 +00:00
Andreas Gampe
e4bdf3c1c9 am be549f9b: Merge "Frameworks/base: Fix precedence bug"
* commit 'be549f9b8e01f884a2cc2d668457c6b1c12ff4cc':
  Frameworks/base: Fix precedence bug
2015-03-17 20:49:18 +00:00
Andreas Gampe
0fdfe72088 am c8484abb: am 0ae488e1: Merge "Frameworks/base: Use || instead of |"
* commit 'c8484abbbde02171023f159491ca342186ae095c':
  Frameworks/base: Use || instead of |
2015-03-17 20:47:41 +00:00
Andreas Gampe
d75a3b4d2c am 17eda7d0: am 4d907643: Merge "Frameworks/base: Fix trivial equals implementation"
* commit '17eda7d0bed1d32a9b8f4a6a9d572aeabb43810a':
  Frameworks/base: Fix trivial equals implementation
2015-03-17 20:47:33 +00:00
Andreas Gampe
c8484abbbd am 0ae488e1: Merge "Frameworks/base: Use || instead of |"
* commit '0ae488e1cb64318906397a40d8be4866e81e4860':
  Frameworks/base: Use || instead of |
2015-03-17 20:41:04 +00:00
Andreas Gampe
17eda7d0be am 4d907643: Merge "Frameworks/base: Fix trivial equals implementation"
* commit '4d9076437c0270cd863493f505e734a3108e89ea':
  Frameworks/base: Fix trivial equals implementation
2015-03-17 20:40:58 +00:00
Andreas Gampe
be549f9b8e Merge "Frameworks/base: Fix precedence bug" 2015-03-17 20:36:21 +00:00
Andreas Gampe
869d26fda0 Frameworks/base: Fix precedence bug
Explicit cast has higher precedence than shift.

Bug: 19797138
Change-Id: Ifcf569bf774fbf65ee50c078f736ad167bcc6b8c
2015-03-17 20:31:22 +00:00
Andreas Gampe
0ae488e1cb Merge "Frameworks/base: Use || instead of |" 2015-03-17 20:28:53 +00:00
Andreas Gampe
e1b9262084 Frameworks/base: Use || instead of |
Nothing wrong with | in this case, but || is canonical.

Bug: 19797138
Change-Id: I5f145736a5470f7cde06efce9a217d86eda2135f
2015-03-17 20:27:42 +00:00
Andreas Gampe
4d9076437c Merge "Frameworks/base: Fix trivial equals implementation" 2015-03-17 20:25:20 +00:00
Andreas Gampe
610b2c778c Frameworks/base: Fix trivial equals implementation
The comparator's equal implementation doesn't satisfy the constraints
of an equals method, namely being reflexive. Use the standard Object
implementation instead.

Bug: 19797138
Change-Id: I74f888e99533e1945aab7ab10fe8ee3ded6388f4
2015-03-17 20:24:45 +00:00
John Spurlock
d799f70187 Merge "Audio: Flag volume adjustments from hardware keys." 2015-03-17 19:19:01 +00:00
Ruben Brunk
db2b5f4472 Merge "camera2: Release surface in ImageReader#close and fix legacy cleanup" 2015-03-17 19:11:33 +00:00
Filip Gruszczynski
a483a1d85e am 81c47fc2: am 86318d76: Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev
* commit '81c47fc23a0a15dddf37d96d28305e8b5e5ca2da':
  Option for going home when going to sleep for devices without physical button.
2015-03-17 19:06:58 +00:00
Filip Gruszczynski
81c47fc23a am 86318d76: Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev
* commit '86318d768a2c5043e1261e9daacf1497d1e4a732':
  Option for going home when going to sleep for devices without physical button.
2015-03-17 18:35:17 +00:00
John Spurlock
b94f2d6cad Audio: Flag volume adjustments from hardware keys.
Bug: 19793279
Change-Id: If20d70c13c9e7d1f8a6b31e0069564073d30e2bc
2015-03-17 14:15:02 -04:00
Ruben Brunk
443ab2c7db camera2: Release surface in ImageReader#close and fix legacy cleanup
Bug: 19694090
Change-Id: I344ad707dbd414db023e4770769b5237bd3bbb4e
2015-03-17 17:49:29 +00:00
Tobias Sargeant
9ad4c44308 Merge "Add visual state callbacks to the WebView." 2015-03-17 17:07:11 +00:00
Clara Bayarri
15f78bbd6f Merge "Floating toolbars: Add content rect related methods to API" 2015-03-17 15:43:51 +00:00
Tobias Sargeant
a8352f4031 Add visual state callbacks to the WebView.
Registering a visual state callback allows the caller to be notified
after the commit, activation and swap of the current (or future) state
of the DOM tree has occurred. At the point at which the callback is
called, the caller can be sure that any DOM updates made prior to
the registration are ready to be drawn in the next WebView#onDraw.

We also provide a convenience callback related to the visual state:

* WebViewClient.onPageCommitVisible; called at the earliest point at
  which the next draw will not render contents from the previously
  loaded page.

Bug: 6375170
Change-Id: I17e706b6e6ba4a8c28c835552687c9f7a4623024
2015-03-17 15:19:07 +00:00
Andreas Gampe
11b07c05ac am 14e436ae: am 345a8f69: Merge "Frameworks/base: Fix a comparison"
* commit '14e436aec45e7d83c2b3695c07d9740b9fd7f043':
  Frameworks/base: Fix a comparison
2015-03-17 14:29:50 +00:00
Christopher Tate
bb41a5f6de Merge "Back up / restore spell checker configuration" 2015-03-17 02:17:34 +00:00
Christopher Tate
3d0bdf6f71 Merge "Notification listener backup & restore" 2015-03-17 02:12:13 +00:00
Christopher Tate
06cbaddb87 Back up / restore spell checker configuration
Bug 19779845

Change-Id: Ib8382f0296f0726b64494d3b1fd8237e13adb540
2015-03-16 18:29:42 -07:00
Clara Bayarri
cba5fc22d1 Floating toolbars: Add content rect related methods to API
This CL adds the ActionMode.Callback2 abstract class and the rect
invalidate method needed to add the content rect API for Floating
Toolbars. It also extends the existing ActionModeCallbackWrapper in
DecorView to handle the case when ActionMode.Callback is provided
instead of Callback2, falling back to a default implementation.

Change-Id: Ia918ddfcfdf73d0e4cafd24c4a0573245d497cfe
2015-03-17 01:07:14 +00:00
Andreas Gampe
14e436aec4 am 345a8f69: Merge "Frameworks/base: Fix a comparison"
* commit '345a8f69ea2acd6d3ecf4c200cb33e8037f8798c':
  Frameworks/base: Fix a comparison
2015-03-17 00:25:04 +00:00
Andreas Gampe
345a8f69ea Merge "Frameworks/base: Fix a comparison" 2015-03-17 00:12:25 +00:00
Christopher Tate
6597e3435f Notification listener backup & restore
We now back up & restore the set of enabled notification listeners.  Post-
restore, a listener that had been enabled on the ancestral device will be
enabled on the current device as soon as it's installed, matching the
user's previous configuration.  After this has happened the enable/disable
state for that app is not "sticky"; disabling it again will work as
expected.

The infrastructure for accomplishing this is general: it can be leveraged
by any ManagedServices derivative.  There's a bit of extra wiring in the
settings provider to support the restore-time information flow as well.
This is because ManagedServices -- like many other parts of the system --
monitors writes to the settings provider and does work in response to new
writes of the elements that it cares about.  Unfortunately this means that
there is no way to use the BackupAgent's restoreFinished() hook to post-
process the restored data: by the time it is run, the ManagedService's
observers have already executed and culled any unknown components from
the description that was just pushed into settings.

As of this patch, the settings provider's restore logic knows that a
particular settings element will require a message to interested observers
about the restore-driven change.  The message is delivered as a broadcast,
and is sent after the new value has been committed to the settings db.
Adding other system ManagedService handling that parallels this will only
require adding a new corresponding entry to the table of individual settings
for which the relevant "this settings element is being restored" broadcast
is sent, found in SettingsHelper.

(It isn't sent for all settings elements because very few settings elements
have semantics that require it; 3rd party code won't be running yet during
platform restore anyway; and sending up to hundreds of broadcasts during
setup & restore is far from ideal.)

Bug 19254153

Change-Id: Ib8268c6cb273862a3ee089d2764f3bff4a299103
2015-03-16 16:24:28 -07:00
Tor Norbye
7339cf3585 Merge "Add @TransitionRes for transition resource integers" 2015-03-16 23:03:41 +00:00
Adam Lesinski
9c329b8b64 Merge "Only attempt to load .apk files in AssetManager" 2015-03-16 22:16:04 +00:00
Adam Lesinski
1dd50c54b5 Only attempt to load .apk files in AssetManager
This will reduce the number of files we must open
and reduce log spam.

Change-Id: I595ba4a5ea8466e530915d6ae4cf1d3e3dba15ef
2015-03-16 15:10:56 -07:00
Dianne Hackborn
a501a021c3 Merge "Add new voice request for picking from a list." 2015-03-16 22:01:51 +00:00
Andreas Gampe
2851d7d0fd am 7f95a1bc: am 5eb42122: Merge "Frameworks/base: Force long computation"
* commit '7f95a1bc3271318d7f08f19426be24b17186f9f0':
  Frameworks/base: Force long computation
2015-03-16 21:58:39 +00:00
Tor Norbye
da81fa569e Merge "Add resource type annotations to some APIs" 2015-03-16 21:20:31 +00:00
Andreas Gampe
7f95a1bc32 am 5eb42122: Merge "Frameworks/base: Force long computation"
* commit '5eb421221bcade4f5715d42843346f7d3c733547':
  Frameworks/base: Force long computation
2015-03-16 20:49:12 +00:00
Andreas Gampe
5eb421221b Merge "Frameworks/base: Force long computation" 2015-03-16 20:37:02 +00:00
Eric Laurent
aff57b7519 Merge "broadcast radio API" 2015-03-16 18:30:23 +00:00
Dianne Hackborn
3d07c94c39 Add new voice request for picking from a list.
Also add API for voice interaction service to control
whether the system should hold a wake lock while it is
working with an activity (and actually *do* hold a wake
lock while doing so, duh!).

And while in there, clean up the launching wake lock to
correctly give blame to the app that is launching.

Change-Id: I7cc4d566b80f59fe0a9ac51ae9bbb7188a01f433
2015-03-16 11:29:12 -07:00
Andreas Gampe
872d191e61 am 8af305f1: am 6878ee57: Merge "Revert "Frameworks/base: Fix a constructor""
* commit '8af305f17ff0d4b84e5a71777de788e9a6ae2780':
  Revert "Frameworks/base: Fix a constructor"
2015-03-16 18:11:47 +00:00