142882 Commits

Author SHA1 Message Date
Tyler Gunn
aa07df84f2 Wiring video state through from Connection
Bug: 16285417
Bug: 16013178
Change-Id: Ia48959248ca22f4569b0ffd01a1716470aa0a711
2014-07-18 01:30:34 +00:00
Marcin Kosiba
3ee06efef3 Add a WebView.zoomBy API.
The WebView has zoomIn/zoomOut APIs which zoom in/out by a fixed
amount. This adds a more flexible API.

BUG: 13399510
Change-Id: Ia505048d5b1c48f9a3ff1c4ce7129ed2f55804f8
2014-07-18 02:18:44 +01:00
Zhijun He
d1d2d43fc0 Merge "Camera2: partialResultCount should be optional" into lmp-dev 2014-07-17 21:09:48 +00:00
Zhijun He
1420de4162 Camera2: partialResultCount should be optional
Change-Id: Iacd2b5e8f388c18cbff0f1cefdb5c10812ae751e
2014-07-17 17:45:54 -07:00
Jinsuk Kim
fe61a67bb9 Merge "Remove system audio output option for HdmiControlService" into lmp-dev 2014-07-17 21:07:39 +00:00
Craig Stout
abdd154334 Fix timepicker double done buttons.
Leanback theme uses a legacy layout with a done button, but
apps won't necessarily have target apilevel L.

Change-Id: Ib38b08df1fe07bd8fb4e64e93633ce0b7eb12567
2014-07-17 23:28:48 +00:00
Filip Gruszczynski
0048da2114 resolved conflicts for merge of bbc49941 to lmp-dev
Change-Id: If8e607ab1946c3ca5bb8960d32fdefebbfb21ffe
2014-07-17 16:20:24 -07:00
Filip Gruszczynski
bbc499415c am a76164e1: Merge "Only use bottom outset for main display." into klp-modular-dev
* commit 'a76164e1d0d283baf412c18999e680d93bd50f01':
  Only use bottom outset for main display.
2014-07-17 19:55:27 +00:00
John Spurlock
c2d09dd746 Merge "Shade: Hide status icons, take 2." into lmp-dev 2014-07-17 19:20:15 +00:00
Christopher Tate
5f7f252b45 Properly end full restore attempt if getNextFullRestoreDataChunk() fails
Don't just drop the error return on the floor and retry (forever!).

Change-Id: I5f0ef2d09ea286d813add69517f865e474341b43
2014-07-17 23:01:04 +00:00
John Spurlock
604ae09142 Shade: Hide status icons, take 2.
Restore visibility logic (for mirrored view) and remove a bad
optimization from the clipping calculation.

Bug:16337935
Change-Id: I7eb82ef6c87f30da9d8b70136e05dab3abdbdead
2014-07-17 18:22:45 -04:00
Zhijun He
dcb743e276 Merge "Camera2: replace partial quirks with normal partial result" into lmp-dev 2014-07-17 18:11:21 +00:00
Zhijun He
83159151f6 Camera2: replace partial quirks with normal partial result
Change-Id: I56550748478bf0aa1a7bf9a350b4fdc7bbd6af86
2014-07-17 20:08:32 +00:00
John Spurlock
edbaa7d293 Merge "QS: Fix crash switching users." into lmp-dev 2014-07-17 19:13:40 +00:00
John Spurlock
8b0249da3e QS: Fix crash switching users.
Bug:16375449
Change-Id: I971c5b043edcffe669c29bbc566b80696b6251b2
2014-07-17 15:53:32 -04:00
Filip Gruszczynski
a76164e1d0 Merge "Only use bottom outset for main display." into klp-modular-dev 2014-07-17 18:11:21 +00:00
Filip Gruszczynski
b57503c34d Only use bottom outset for main display.
Change-Id: I42154d026811ee4b7ba9711c560c7a62fcdde7ee
2014-07-17 11:23:13 -07:00
Chris Craik
f3e85b5bac Merge "[HWUI]: fix residual line on FrameBuffer" into lmp-dev 2014-07-17 18:11:21 +00:00
henry.uh_chen
33f5a59ac3 [HWUI]: fix residual line on FrameBuffer
Symptom: If app applies animation to enlarge a bitmap, there will be an residual
         line on the screen

Root Cause: On platform which has Tile Rendering implementation (ex. Qualcomm
            CPU), startTiling() call will restrict the framebuffer region which
            GPU can affect. So the expansion of clear region by 1 will not take
            effect if startTiling region is not expanded.

Solution: Expand the startTiling region by 1, too.

Reproduce steps: Apply animation to enlarge (and then shrink) a bitmap icon.

Cherry-pick of 20adb6ce4d52b15472e7e5ee953e06cc349a827c from AOSP

Change-Id: I163b898b87b74d221dc4210b7fa657aa93c82c19
2014-07-17 21:50:01 +00:00
Michael Wright
c7a845de4a Merge "Add MediaProjection APIs." into lmp-dev 2014-07-17 21:15:46 +00:00
Michael Wright
c39d47a8e7 Add MediaProjection APIs.
The new MediaProjection infrastructure allows the system to hand out
tokens granting the ability to capture the screen's contents, audio,
etc. at a granular level. It's intended to be used both for screen
casting, via the cast APIs, as well as screen sharing via third party
applications.

The screen sharing case is implemented, but all of audio capturing
is still forthcoming.

Change-Id: I4b24669bed7083e11413c10ed8d6b025f5375316
2014-07-17 14:30:19 -07:00
destradaa
6ccb5f894e Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev 2014-07-17 18:11:21 +00:00
Craig Stout
f83ccb9647 Fix legacyMode for leanback timepicker
Change-Id: Idcd9627f330918d8b2de144af28e749c47602769
2014-07-17 20:50:13 +00:00
Andres Morales
963295ea10 Permit settings to "wipe" the persistent partition
One of the requirements is that when the user does a
factory reset through settings, all data on the
persistent partition should be cleared.

This adds one last API method that allows settings
to wipe the partition.

Bug: 14288780
Change-Id: Ib87ee741d1e5195814516ae1d66eb7c4cf754dcf
2014-07-17 20:42:04 +00:00
Ben Murdoch
86f8a7425b Merge "Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast." into lmp-dev 2014-07-17 18:11:21 +00:00
Ying Wang
4b8aa28ef2 Fix sdk build.
Change-Id: I9073747f7a12f826fabf99c34dce813edf6462c1
2014-07-17 14:30:54 -07:00
Ben Murdoch
dc00a84af1 Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.
This allows the WebViewUpdateService to receive notifications that
an update has been installed and we need to trigger recreation of
the relro file.

bug: 16329377
Change-Id: I088e61487416add997995db304beca0cde71390c
2014-07-17 21:18:40 +00:00
destradaa
3b0224dc3c Fix exceptions in ActivityRecognition platform stack.
b/16348349

Change-Id: I1f85283c86130b86389a1be7da49904658b0558c
2014-07-17 11:09:46 -07:00
Jeff Sharkey
69eef8a0d2 Merge "Support cluster-style installs for bundled apps." into lmp-dev 2014-07-17 18:05:14 +00:00
Jeff Sharkey
1e9189a276 Support cluster-style installs for bundled apps.
Bug: 16319961
Change-Id: I499b904dfd56f236a1b574c29a44272ed814be0f
2014-07-17 11:07:12 -07:00
Joe Fernandez
64ae930359 am e1e81a9e: am e287cf33: docs: Update ADT-1 page with supported apps
* commit 'e1e81a9ee0f3632898eff1056fd2283b79789e23':
  docs: Update ADT-1 page with supported apps
2014-07-17 18:04:47 +00:00
Sandeep Siddhartha
f8cf71d753 Support model deletion
the updateKeyphrase call is also used to clear out a sound model currently,
this happens when the sound model passed in has no keyphrases.

We can revisit if we need another deleteSoundModel method

- Also fix an issue with the way we were writing keyphrase to the DB
  and when updating keyphrase, we actually addOrUpdate

Change-Id: Ib7250c2fdafef6bc40387912a79366c334d73292
2014-07-17 11:01:25 -07:00
Craig Mautner
e2e280ec59 Merge "Restore calling identity before checking permission" into lmp-dev 2014-07-17 17:59:02 +00:00
Craig Mautner
85c11a8831 Restore calling identity before checking permission
Using the system service identity to check the CHANGE_CONFIGURATION
permission isn't likely to catch a security violation. Changing
back to the original caller and then checking permissions is
preferred.

Fixes bug 16215650.

Change-Id: Iff08d04422bcc052a487194154f1fd0d727d38f4
2014-07-17 12:38:18 -07:00
RoboErik
69b86207bf Merge "return false for media keys if no controller" into lmp-dev 2014-07-17 18:05:14 +00:00
RoboErik
28204a768e return false for media keys if no controller
bug:16311395
Change-Id: I4cde865858f99a9159abc181cc987fbd9866025b
2014-07-17 12:18:32 -07:00
Joe Fernandez
9142a0f80c am 64ae9303: am e1e81a9e: am e287cf33: docs: Update ADT-1 page with supported apps
* commit '64ae930359619f2a49c8a4bef5dc45261c772d45':
  docs: Update ADT-1 page with supported apps
2014-07-17 18:16:10 +00:00
John Reck
21f61b7d87 Merge "Fix logging" into lmp-dev 2014-07-17 18:05:14 +00:00
John Reck
5cdb8f998c Fix logging
Bug: 16357287

Change-Id: Ic14e32c941e42ab1f1ed51ff8ed7185979e57a55
2014-07-17 18:12:01 +00:00
Ruben Brunk
84cca777e2 Merge "camera2: Fix swapped Face detection commands." into lmp-dev 2014-07-17 18:11:21 +00:00
Ruben Brunk
40001f5dac camera2: Fix swapped Face detection commands.
Bug: 16343647
Change-Id: I06186b1d6a2ef5d73d2e22759e947156d43cab3f
2014-07-17 18:04:42 +00:00
ztenghui
738177caf6 Add the RTL support to VectorDrawable.
bug:15905631

Change-Id: Ieb3dcac2dd446ba89f307716411688dcd6ec5279
2014-07-17 17:37:19 +00:00
John Reck
580ff8142b Revert "Separate Canvas JNI code from the implementation."
This reverts commit e28a5afee885cd69a5be5809f88116b601cb1a72.

 Appears to cause memory corruption and random appearances of
 chinese

 Bug: 16343240
 Bug: 16336642

Change-Id: Ife169181f40adff4b12948ed5f9d3a88dcec935b
2014-07-17 17:36:24 +00:00
Winson Chung
4fc90de51b Fixing regression in flinging not updating the stack. (Bug 16371020)
Change-Id: I6397c854dc0d305206eb3b48de855c58cf2740ea
2014-07-17 17:33:03 +00:00
Joe Fernandez
e1e81a9ee0 am e287cf33: docs: Update ADT-1 page with supported apps
* commit 'e287cf33d4cd69aef2177d025a110cf8b9f0e267':
  docs: Update ADT-1 page with supported apps
2014-07-17 16:44:19 +00:00
Craig Mautner
b3325cbb26 Merge "resolved conflicts for merge of 0a931069 to lmp-dev" into lmp-dev 2014-07-17 16:16:48 +00:00
Craig Mautner
aa9b0f1575 resolved conflicts for merge of 0a931069 to lmp-dev
Conflicts:
	services/core/java/com/android/server/am/ActivityManagerService.java
	services/core/java/com/android/server/am/ActivityStackSupervisor.java

Change-Id: I68e8290566b51fadb5671abdd9d05faf28502e22
2014-07-17 10:50:18 -07:00
Justin Koh
0a93106964 am 65d7c332: Merge "Additional cleanup after stack deletion." into klp-modular-dev
* commit '65d7c332d7b613f23a26066051cc7496e0efa994':
  Additional cleanup after stack deletion.
2014-07-17 10:56:16 +00:00
Justin Koh
75f317403f am 77cdac05: Merge "Wait for all windows to draw before turning screen on" into klp-modular-dev
* commit '77cdac05ba80925f6cdc4c349af0fa7567c36146':
  Wait for all windows to draw before turning screen on
2014-07-17 10:55:56 +00:00
Filip Gruszczynski
95198b9166 am 39f0e7da: Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev
* commit '39f0e7da00eae4e5a331a9413a396f3dddbeb625':
  Using outset bottom from theme as bottom inset on circular screens.
2014-07-17 10:55:43 +00:00