144211 Commits

Author SHA1 Message Date
George Mount
b4c5d7bf21 Fix no transition when only shared element exists.
Bug 16245703

Change-Id: Ie31baaf7f58038fc79ffca0206ce3bec0ef64cb4
2014-07-24 13:19:51 -07:00
Prerepa Viswanadham
3f10f58d28 am 6565c129: cleanup : delete BLE advertising related hidden state references in Bluetooth Adapter
* commit '6565c12905b959401c2f9d3cb123e200bb7ce0e2':
  cleanup : delete BLE advertising related hidden state references in Bluetooth Adapter
2014-07-24 19:32:41 +00:00
Svetoslav
38afb38a62 am fc7c8bee: Updated accessibility nodes not properly cached.
* commit 'fc7c8beecb31cc94d23e0d4312e93c2e38989c2b':
  Updated accessibility nodes not properly cached.
2014-07-24 19:28:43 +00:00
Prerepa Viswanadham
5bec5af971 cleanup : delete BLE advertising related hidden state references in Bluetooth Adapter
Change-Id: Ia58a46392157e274f8fc4696e8e25af480eb2d2a
2014-07-24 19:28:12 +00:00
Svetoslav
f7c42c5067 Updated accessibility nodes not properly cached.
We have an accessibiliy node info cache in the process of each
accessibility service. Sometimes the cached node changes and
in this case we have evict from the cache the sub-trees rooted
at children that are no longer present. There was bug where if
none of the children is present anymore we did not evict their
sub-trees.

Also the verification logic was not stopping if a duplicate
node is seen potentially getting into an infinite loop.

bug:15729762

Change-Id: I7adf4f0a1bde07b385556d9acdded5059231f1f3
2014-07-24 19:24:42 +00:00
John Spurlock
afe011778a am 54a6d07c: Merge "Volume: force-dismiss panel when the screen turns off." into lmp-dev
* commit '54a6d07c818c34f7361a45e1a79e5cfe2d876edd':
  Volume: force-dismiss panel when the screen turns off.
2014-07-24 19:23:35 +00:00
John Spurlock
aae32cfdfd am 79c0bf24: Merge "QS: Fix clipped battery icon when expanded." into lmp-dev
* commit '79c0bf24e8a5af9a41b4d8f2103623fdadf0d86e':
  QS: Fix clipped battery icon when expanded.
2014-07-24 19:02:04 +00:00
Wei Wang
06accb4b88 am c20ddd45: Merge "Move AdvertiseData length check to BluetoothAdvertiser." into lmp-dev
* commit 'c20ddd4563d4a7fc675d6f1f5060373fac78b1af':
  Move AdvertiseData length check to BluetoothAdvertiser.
2014-07-24 18:31:27 +00:00
Hector Dearman
7bda3995fa am aa2a5911: Merge "Update CookieManager API for Council review." into lmp-dev
* commit 'aa2a591149af6c904adb780ac539194a0b9893a0':
  Update CookieManager API for Council review.
2014-07-24 18:10:11 +00:00
Chris Craik
c767e9dbc3 am 1a146fc8: Compute layer bounds over subset of VertexBuffer verts
* commit '1a146fc8f4f02869ff24c15c63e98d62b2a07811':
  Compute layer bounds over subset of VertexBuffer verts
2014-07-24 18:10:07 +00:00
Ruben Brunk
a61242b5d6 am 70279653: camera2: Move noise model to dynamic metadata.
* commit '70279653dbdfd7c95c55d54ba1bbb2d873f8e099':
  camera2: Move noise model to dynamic metadata.
2014-07-24 18:10:02 +00:00
Yorke Lee
fc11b6438f am 9abe5673: Merge "Add Calls.TRANSCRIPTION to CallLog (2/2)" into lmp-dev
* commit '9abe5673818acbcf6b2313a2ebbf64c062eb41b2':
  Add Calls.TRANSCRIPTION to CallLog (2/2)
2014-07-24 18:09:58 +00:00
Prashant Malani
bc3699b1c3 am b4dcc64f: Merge "Revert "Remove circular mask"" into klp-modular-dev
* commit 'b4dcc64fe6314b139ac17aa296419bbf153df2f6':
  Revert "Remove circular mask"
2014-07-24 18:06:03 +00:00
Chris Craik
9a89bc6524 Compute layer bounds over subset of VertexBuffer verts
bug:15538815
Change-Id: I0dbb54f656a6ae99a87c5734761107e1c2351b65
2014-07-24 17:49:23 +00:00
Ruben Brunk
1b1f1b611c camera2: Move noise model to dynamic metadata.
Bug: 16369384

Change-Id: I7a540705176c7be68431a977e2b7218ffa1bddd0
2014-07-24 17:43:54 +00:00
ram
0453296950 am 487c4b7f: IMS: Adding ims on/off interface files and callback for enabled/disabled features.
* commit '487c4b7f7a9caf275e89a8dd9f337b5db7296939':
  IMS: Adding ims on/off interface files and callback for enabled/disabled features.
2014-07-24 17:39:40 +00:00
ram
ab458a1858 IMS: Adding ims on/off interface files and callback for enabled/disabled features.
Change-Id: I4e0049d605d9e7d13035c43e2504cdfb67a7a102
2014-07-24 17:36:17 +00:00
Amit Mahajan
615cb60142 am 8d569bbf: Merge "Add API invokeOemRilRequestRaw" into lmp-dev
* commit '8d569bbf62a3bfb177afdc6a736834c077b5cbb8':
  Add API invokeOemRilRequestRaw
2014-07-24 17:35:26 +00:00
Svetoslav
3063849fdf am a6960246: Print to PDF putting a pring job in a wrong state.
* commit 'a6960246b2053d29ee61080903762c5d75131573':
  Print to PDF putting a pring job in a wrong state.
2014-07-24 17:21:40 +00:00
Svetoslav
b59555ca74 Print to PDF putting a pring job in a wrong state.
When printing to a PDF file we get a Uri from the storage APIs
and write the content. Once the file is written to storage the
print job is completed and there is print service involved. Th
spooler was wrongly putting the job in a failed state instead
of a complete state.

bug:16522267

Change-Id: I4741c9b9eb763e118e7dfb2c7c502bd7fc13f7a1
2014-07-24 17:17:07 +00:00
Leon Scroggins III
5e710c1123 am 41508fb0: Merge "Document BlurMaskFilter.Blur." into lmp-dev
* commit '41508fb01d8a9fd031e666f80bf74758b4bd28ad':
  Document BlurMaskFilter.Blur.
2014-07-24 17:07:21 +00:00
Chris Craik
9ca85bca4d am 2d3c6c93: Connect shadow style attributes to renderer
* commit '2d3c6c9382dcb1033737fa177aa7dc592afed46c':
  Connect shadow style attributes to renderer
2014-07-24 16:48:19 +00:00
Chris Craik
058fc64001 Connect shadow style attributes to renderer
bug:15859361

Moves lighting info out of StatefulBaseRenderer, since it's not useful
at record time, and only used by OGLR.

Change-Id: I7ab065d02d9304afad1dc4c48597a7a621366f8e
2014-07-24 16:41:13 +00:00
Ricardo Cervera
b042189a3f am e974a59f: am 0f1e067a: am 472e234d: am 7af4e812: docs: Fixed RecyclerView example. Bug: 16483811
* commit 'e974a59f7c5c5d1ade49b846b1f515b40230c6c8':
  docs: Fixed RecyclerView example. Bug: 16483811
2014-07-24 16:28:30 +00:00
Robert Ly
2af6f19489 am 1be71de6: am 39572996: am 1903bbb8: am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs
* commit '1be71de6a71a871da7980d84dad4e3d12ed5cefc':
  cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
2014-07-24 16:28:26 +00:00
Scott Rowe
552bc6c46e am 1b009123: am 162493b5: am 3bb44fec: am 72c80d30: cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
* commit '1b009123999c485b7b7294f44faac821af013803':
  cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
2014-07-24 16:28:23 +00:00
Ricardo Cervera
753d849b2a am 0f1e067a: am 472e234d: am 7af4e812: docs: Fixed RecyclerView example. Bug: 16483811
* commit '0f1e067a28c2ef50d4db53ad19e0902b052bd014':
  docs: Fixed RecyclerView example. Bug: 16483811
2014-07-24 16:22:40 +00:00
Robert Ly
eb355efc1b am 39572996: am 1903bbb8: am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs
* commit '39572996f25d4b4ce744d9d04080e33b687ab03b':
  cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
2014-07-24 16:22:29 +00:00
Scott Rowe
fc66190344 am 162493b5: am 3bb44fec: am 72c80d30: cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
* commit '162493b5e3fb1bbf4505c2d18ebf6c900d7875e6':
  cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
2014-07-24 16:22:15 +00:00
Jungshik Jang
1660611911 Merge "Replace osd message for record status with IHdmiRecordCallback." into lmp-dev 2014-07-24 16:05:03 +00:00
Jungshik Jang
12e5dcefe1 Replace osd message for record status with IHdmiRecordCallback.
Add new interface, IHdmiRecordCallback, in order to handle
result of all recording features, One Touch Record and
Timer Recording.
HdmiRecordCallback is clientside interface which uses
RecordSource as return of getOneTouchRecordSource,
instead of raw byte array.

Along with it, add TimerRecordingAction.

Bug: 16160962

Change-Id: If0ed7abc5f45b020b39555cac585becbe8ee7da4
2014-07-25 11:33:39 +09:00
Dongwon Kang
2380f36e67 Merge "Disable TvInputManagerService on non-TV devices." into lmp-dev 2014-07-24 16:05:03 +00:00
Yuncheol Heo
3ae16ddabc Merge "Check the validity of the port id of HdmiCecMessage only in TV." into lmp-dev 2014-07-24 16:04:26 +00:00
Yuncheol Heo
e946ed8f54 Check the validity of the port id of HdmiCecMessage only in TV.
In playback device, we don't track the port info, so we can't verify
the validity of the port id part of the physical address parameter of
HdmiCecMessages.

Bug: 16274232
Change-Id: I41f95dba0505d45688e2c9031b78863dc93248ce
2014-07-25 15:08:43 +09:00
Jinsuk Kim
68bed6c5d7 Merge "Add portID information in HdmiCecDeviceInfo" into lmp-dev 2014-07-24 16:04:26 +00:00
Jinsuk Kim
2b152015ff Add portID information in HdmiCecDeviceInfo
This change makes it convenient to get the HDMI port ID from the device
info without having to look it up through a separate HdmiPortInfo, which
happens in many places.

Also removed port information lookup loop by introducing two maps variable
in Control Service: port path ->port ID, and port ID -> port info.

Bug: 16547583
Change-Id: Ibfff722a16b626230766058efcc819e9c8ca0663
2014-07-25 02:14:55 +00:00
Dongwon Kang
cfec0fbacb Merge "Remove COLUMN_CONDITIONAL_ACCESS from TvContract." into lmp-dev 2014-07-24 16:04:26 +00:00
Dongwon Kang
94a509b123 Remove COLUMN_CONDITIONAL_ACCESS from TvContract.
It turned out that having this flag in Channels table does not
make sense for some European countries because they scremble the signal
per program basis. Also, the current flag does not fit to the use-case
like 'pay per view'. Decided to remove this in L release because it's not
clear how we will handle the cases raised at this moment.

Change-Id: Ibbf829f331a307ac89a553e00ece18d5958e72b5
2014-07-25 10:19:12 +09:00
Terry Heo
c0c3dc4ee3 Merge "TIF: Add @SystemApi to TvStreamConfig" into lmp-dev 2014-07-24 16:04:26 +00:00
Terry Heo
b6437cd0ed TIF: Add @SystemApi to TvStreamConfig
To fix broken build of xts

Change-Id: Iefb94c1a7211e6b0a9ae64b78ba6b3999dd8d366
2014-07-25 10:10:47 +09:00
Sungsoo Lim
f0452adb43 Merge "Call removeOverlayView() before onRelease()" into lmp-dev 2014-07-24 16:04:26 +00:00
Justin Morey
da8f79a487 am 75a72009: Merge "Fix build" into lmp-dev
* commit '75a720091bf1d08a61ff92616b64170a4f65c5c6':
  Fix build
2014-07-24 15:59:00 +00:00
Kenny Guy
79db5b8742 am b4900242: Load package information from correct user.
* commit 'b490024232143ebde9bc14f33c775cbcfaba03af':
  Load package information from correct user.
2014-07-24 15:54:55 +00:00
Kenny Guy
4dcb0dc453 Load package information from correct user.
Handle case where a package is only installed
for secondary user.

Bug: 15983201
Change-Id: I6733011c59e6d08d275dc761660d38b709051d79
2014-07-24 15:49:18 +00:00
Adrian Roos
28aca0a170 am 29c97b8d: Update KeyguardUserSwitcher to use UserSwitcherController
* commit '29c97b8d23cd1b8174e19c13484f9f355d6356d8':
  Update KeyguardUserSwitcher to use UserSwitcherController
2014-07-24 15:37:25 +00:00
Wei Wang
a2796a7abe Merge "Use Scanner for legacy LE scans(1/2)." into lmp-dev 2014-07-24 15:36:51 +00:00
Wei Wang
c3059ccfb0 Use Scanner for legacy LE scans(1/2).
Also removed different scan methods from IBluetoothGatt and make
BluetoothLeScanner and BluetoothLEAdvertiser singleton.

Change-Id: Ifa2e950b50f100f5507a6dace3bd70db18d7f9ca
2014-07-24 20:26:55 -07:00
Aravind Akella
0dcebb9246 Merge "Define TYPE_PICK_UP_GESTURE." into lmp-dev 2014-07-24 15:36:51 +00:00
Aravind Akella
96eb62c3b9 Define TYPE_PICK_UP_GESTURE.
Change-Id: Ic2c7963352ff954884ce05a0a3a71516ed417140
2014-07-24 17:45:05 -07:00
John Spurlock
09890b3a90 Merge "QS: Handle all camera api exceptions during init." into lmp-dev 2014-07-24 15:36:51 +00:00