Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
146,915 Commits 3 Branches 0 Tags
fad9cd4746847c42f5ebdf46790f7641e3eb198e
Commit Graph

39154 Commits

Author SHA1 Message Date
Eino-Ville Talvala
fad9cd4746 am a9545b21: am 5496085d: am c02b64b6: Camera2: API review updates 
* commit 'a9545b21509c07541a3637dcd1eb34a4c765edc2':
  Camera2: API review updates
 2014-07-30 16:51:36 +00:00
Jeff Davidson
8456f49a27 am d823f25a: am bf7b7ee0: am ebc1f37f: Merge "Add NetworkScoreManager.disableScoring()." into lmp-dev 
* commit 'd823f25a7899ab5203755424a80a605ac98ccd8e':
  Add NetworkScoreManager.disableScoring().
 2014-07-30 16:51:12 +00:00
Eino-Ville Talvala
abd9d3c5c7 Camera2: API review updates 
- Rename CameraCharacteristics#SENSOR_INFO_TIMESTAMP_CALIBRATION
  to TIMESTAMP_SOURCE
- Remove StreamConfigurationMap#NO_MIN_FRAME_DURATION

Bug: 16402755
Change-Id: I6c30a1e931c9f064c22092d362bcc61bd88e2f8a
 2014-07-29 23:30:34 +00:00
Jeff Davidson
1561fd3b06 Merge "Add NetworkScoreManager.disableScoring()." into lmp-dev 2014-07-24 16:56:49 +00:00
Jeff Davidson
26fd143326 Add NetworkScoreManager.disableScoring(). 
Allows the active scorer app to disable itself.

Change-Id: I7bcdc3aafb95af4ea0b110b01b08ab4daf7a137f
 2014-07-29 16:03:19 -07:00
George Mount
7299bc1305 Merge "Allow a "ghost view" that paint a different view from the overlay." into lmp-dev 2014-07-25 21:16:23 +00:00
George Mount
807e40c55c Allow a "ghost view" that paint a different view from the overlay. 
Bug 15744995

The ghost view doesn't route touch events, but hides another
view in its normal parent, and paints it as a child of another
ViewGroup or ViewGroupOverlay.

Change-Id: I352e14c366ccfb7303cee1dbff8563c673fd12ff
 2014-07-29 07:27:52 -07:00
Jinsuk Kim
b2b3151a42 Send TV app the intent for the new active source 
When signalled by an external CEC device about to become a new active
source, TIF(TvInputHardwareManager) sends an intent for TV app to tune to
the input mapped to the device. For non-CEC devices or MHL device
the device info comes with port ID only, which should be used to find
the right input.

Change-Id: I71c8454fead037d880ee440b0a8d64dd361ed558
 2014-07-29 22:41:57 +00:00
Igor Murashkin
ffdfcd7f27 Merge "camera2: legacy: Don't set the @hide frame number metadata" into lmp-dev 2014-07-25 21:16:23 +00:00
Igor Murashkin
56678d8778 camera2: legacy: Don't set the @hide frame number metadata 
Change-Id: Id1c8292444a45a97228d5c95f23f6d1f8171d3b5
 2014-07-29 15:14:57 -07:00
Igor Murashkin
bdf366cc70 camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT) 
Change-Id: I164011c97a57fb9fb9c504ae4c5f394dcb36a4bc
 2014-07-29 15:09:45 -07:00
Igor Murashkin
3676164462 Merge "camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)" into lmp-dev 2014-07-29 21:36:00 +00:00
Igor Murashkin
3a3eb15741 camera2: legacy: fix cached results bug and fix focus modes 
- Also add request.frameCounter and request.pipelineDepth results

Change-Id: I104c8243fa525622cb4ab7b5535cbca8588862f3
 2014-07-29 14:23:27 -07:00
Igor Murashkin
83d8639e90 camera2: legacy: Add focus support 
* Characteristics will list control.availableAfModes
* Request/result for control.afMode and control.afState

(Does not yet support control.afRegions)

Change-Id: I828111425fa587114d5159f7fb2b1e53a2c74e61
 2014-07-29 14:20:41 -07:00
Igor Murashkin
3f2757a305 Merge changes I104c8243,I82811142 into lmp-dev 
* changes:
  camera2: legacy: fix cached results bug and fix focus modes
  camera2: legacy: Add focus support
 2014-07-25 21:16:23 +00:00
Prerepa Viswanadham
f6b3d8ca36 Fix crash in Stopping/Starting BLE advertising after 
BluetoothAdapter cycling

Bug 16528460
Change-Id: Iad852bc93d307c5ca5f7e42f24248aa02c105e8a
 2014-07-29 21:06:29 +00:00
George Mount
964c3cf5b2 Add default propagation back to Explode. 
Bug 16217557

Change-Id: I47460db128749af978077755a777068392492aee
 2014-07-29 14:13:00 +00:00
Jon Miranda
0615026ba1 Merge "Exposed getLocationOnScreen, added formatToHexString method." into lmp-dev 2014-07-24 15:36:21 +00:00
Michael Wright
9469cdde2c Add paragraph tags to MediaProjection docs 
Change-Id: Ia881f9bcf3b93bd699f9ddf80d51ec7d0e74d2ed
 2014-07-29 20:46:40 +00:00
Jon Miranda
4597e98069 Exposed getLocationOnScreen, added formatToHexString method. 
In order to use the ExportedProperty annotation, I needed a public non-void
method which is why I created a new "public int[] getLocationOnScreen()."

The formatToHexString method is used to convert an int or byte to a hex string
prefixed with "0x". I set the value to true on these flags: mGravity,
mPrivateFlags, mSystemUiVisibility, mViewFlags, mGroupFlags, mMarginFlags,
and flags.

Change-Id: I5914992ba19b80643dfcc6caa487398452e18cbc
 2014-07-29 07:25:49 -07:00
Adrian Roos
489d2dfc29 Fix checkbuild 
Change-Id: I9c3de31af792863b93a29ef81b50e2149b0a2184
 2014-07-29 20:30:50 +00:00
Alan Viverette
4d193bdbe7 Merge "Clean up TimePicker and DatePicker styling" into lmp-dev 2014-07-28 22:45:16 +00:00
Alan Viverette
60727e07c6 Clean up TimePicker and DatePicker styling 
Removes the time and date picker specific themes and defaults their
theme attributes to use the alert dialog theme attribute's value.

BUG: 14973897
Change-Id: Id5cc74ea0c1a379fc1ee76b354a1bb5ba329585a
 2014-07-29 12:49:50 -07:00
Dake Gu
09d9c3be8a Transition: Don't suppressLayout(false) for returning activity 
Change-Id: I7be8a779ab8996809b36baa107acd55ab872580c
 2014-07-29 11:34:35 -07:00
Alan Viverette
57b69dd27e Merge "Partial revert "Add better errors for unresolved attributes, remove unused code"" into lmp-dev 2014-07-28 18:28:56 +00:00
Alan Viverette
500c56089f Partial revert "Add better errors for unresolved attributes, remove unused code" 
This reverts commit 0e42f4b98752b6457b04887e2a557fa007da73d7.

Change-Id: Ic3f0cb709c7aaa0a9892d728311886714ba73f22
 2014-07-29 11:30:35 -07:00
Sandeep Siddhartha
6817337118 Read the keyphrase ID from the recognition event 
Bug: 16516658
Change-Id: Ibeee81c9543aa1091bb075066cfc2269107f13c0
 2014-07-29 11:24:51 -07:00
Matthew Williams
ee410da42b remove possible JobScheduler race in cancel() 
Client can jobFinished() before getting a cancel msg.
1) Do better clean up of JobServiceContext after client jobFinished()
to remove superfluous MSG_CANCELs
2) When processing MSG_CANCEL check whether the context is still active
3) Do JobServiceContext cleanup before calling back to JobSchedulerService
Client can get a cancel msg even after calling jobFinished() (opposite to above)
1) explicitly check whether there are any MSG_CALLBACKs in the queue before
processing a MSG_CANCEL. If there are we can throw away the cancel.

Bug: 16547638
Change-Id: I90644586c7895a9ce97de752a5d657faf7f74b78
 2014-07-29 11:11:41 -07:00
Jason Monk
9a090e6ded Merge "Fix incorrect Activity#startLockTask doc" into lmp-dev 2014-07-25 23:00:08 +00:00
Jason Monk
8863b57e89 Fix incorrect Activity#startLockTask doc 
It referenced a swipe down gesture that doesn't exist.  This should
be more safe, and cover other devices as well.

Bug: 16626273
Change-Id: I907b25a00d903f9f36ca335d3a75c1f8f931d50e
 2014-07-29 13:49:32 -04:00
Alan Viverette
216d3e6d81 Add better errors for unresolved attributes, remove unused code 
Change-Id: Icf81a81b9ce97b5a5edff85569e6e3da93149436
 2014-07-29 10:35:42 -07:00
Bernhard Bauer
70f9fad939 Merge "Add a method to DevicePolicyManager to register a private key access listener." 2014-07-24 15:36:05 +00:00
Bernhard Bauer
6bd165d0eb Add a method to DevicePolicyManager to register a private key access listener. 
BUG=15065444

Change-Id: I6ae8afa4f3514c0cace76d9cc0912287e90a79d5
 2014-07-30 17:12:10 +01:00
Jinsuk Kim
006c117421 am 58b0f818: am e129f19b: am 78aaab20: Merge "Send TV app the intent for the new active source" into lmp-dev 
* commit '58b0f818878fbd739ed5420ac62fc69877a50e63':
  Send TV app the intent for the new active source
 2014-07-30 14:28:17 +00:00
Igor Murashkin
22cadc9bf8 am f0ccdc11: am 75b10ee7: am 3387fffa: Merge "camera2: legacy: Don\'t set the @hide frame number metadata" into lmp-dev 
* commit 'f0ccdc119b6d5bbcbefc31fc6a961e0b9e046b5d':
  camera2: legacy: Don't set the @hide frame number metadata
 2014-07-30 14:28:08 +00:00
Igor Murashkin
13fab195a4 am c1efd6d8: am 12b57ce6: am 92f2d610: Merge "camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)" into lmp-dev 
* commit 'c1efd6d8e9f69eac39bec309b76514afcb401fcb':
  camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)
 2014-07-30 14:28:03 +00:00
Igor Murashkin
e7d8ff1159 am c5b6a0c8: am 44e5ce82: am 6dc35134: Merge changes I104c8243,I82811142 into lmp-dev 
* commit 'c5b6a0c8ba9f1c89ec58670e374039fe7e88df2a':
  camera2: legacy: fix cached results bug and fix focus modes
  camera2: legacy: Add focus support
 2014-07-30 14:27:54 +00:00
Prerepa Viswanadham
36c5cf089f am 22047da1: am 57f30880: am d5359a8e: Fix crash in Stopping/Starting BLE advertising after BluetoothAdapter cycling 
* commit '22047da1b9130892d5c45274a713fb97f9a90908':
  Fix crash in Stopping/Starting BLE advertising after BluetoothAdapter cycling
 2014-07-29 21:21:35 +00:00
Jon Miranda
cea134eadd am c9d29fe3: am 56d9d1cf: am 1f4a4791: Merge "Exposed getLocationOnScreen, added formatToHexString method." into lmp-dev 
* commit 'c9d29fe3ef35d568aa83e3ca404aa55e797f5792':
  Exposed getLocationOnScreen, added formatToHexString method.
 2014-07-29 21:05:59 +00:00
Michael Wright
62d0a425a6 am 7431252e: am 0ff95fbb: am f277aa69: Add paragraph tags to MediaProjection docs 
* commit '7431252efd77d634304bc10464bb9d310b046425':
  Add paragraph tags to MediaProjection docs
 2014-07-29 21:01:40 +00:00
Adrian Roos
d06d87aa5f am 1bc3511a: am ecd63d4e: am b64bbc56: Fix checkbuild 
* commit '1bc3511a636118b4b5573bd186d920f0ce540816':
  Fix checkbuild
 2014-07-29 20:43:22 +00:00
Alan Viverette
e583961a54 am 87db1d21: am b05e3134: am 9bbfa2a3: Merge "Clean up TimePicker and DatePicker styling" into lmp-dev 
* commit '87db1d219ce8f96511a11d780f7235fc718394a4':
  Clean up TimePicker and DatePicker styling
 2014-07-29 20:23:26 +00:00
Dake Gu
ed161f68e1 am 8d208dde: am 2b6e7e1a: am ebf01ef4: Merge "Transition: Don\'t suppressLayout(false) for returning activity" into lmp-dev 
* commit '8d208dde1a0dc187a4c7d9191aeb3cfd7bc6a45a':
  Transition: Don't suppressLayout(false) for returning activity
 2014-07-29 20:03:20 +00:00
Alan Viverette
935f6c86c6 am e944c06b: am 71d29ec9: am e89c4031: Merge "Partial revert "Add better errors for unresolved attributes, remove unused code"" into lmp-dev 
* commit 'e944c06b351701b929146a7817055f91606d8b9f':
  Partial revert "Add better errors for unresolved attributes, remove unused code"
 2014-07-29 18:45:30 +00:00
Sandeep Siddhartha
ae08717d53 am b8ae2304: am f3a14c50: am d3fd7b40: Read the keyphrase ID from the recognition event 
* commit 'b8ae2304fad8f02d1fdffee7b1d7ce4f9613ce0f':
  Read the keyphrase ID from the recognition event
 2014-07-29 18:36:22 +00:00
Matthew Williams
70f0ebe26a am 511a2246: am 7a2d0ca3: am bd8038b8: Merge "remove possible JobScheduler race in cancel()" into lmp-dev 
* commit '511a22460ef790270e870777d21b8ad7d36c55e2':
  remove possible JobScheduler race in cancel()
 2014-07-29 18:30:45 +00:00
Jason Monk
7bc5eb4324 am 92333f39: am f3bc00a3: am 9e9b5c70: Merge "Fix incorrect Activity#startLockTask doc" into lmp-dev 
* commit '92333f395d1a00865b95f7d8c066ebcae8fcfb98':
  Fix incorrect Activity#startLockTask doc
 2014-07-29 18:13:09 +00:00
Alan Viverette
93ceaae722 am d1f27d1e: am 31560851: am 936ee391: Merge "Add better errors for unresolved attributes, remove unused code" into lmp-dev 
* commit 'd1f27d1e736a277d09de8c855f1b872256ce5548':
  Add better errors for unresolved attributes, remove unused code
 2014-07-29 17:56:15 +00:00
George Mount
a0e20d8d94 am 8859a36b: am 21ad6298: am b8c728f3: Merge "Allow a "ghost view" that paint a different view from the overlay." into lmp-dev 
* commit '8859a36bf5ab980cbea3c19fdec66102a38a05f6':
  Allow a "ghost view" that paint a different view from the overlay.
 2014-07-29 15:12:34 +00:00
George Mount
68100a58c0 am 562dd4f3: am 610c6e42: am 3356ef9d: Add default propagation back to Explode. 
* commit '562dd4f3041ff650486850cce2692d8c2ab82ee4':
  Add default propagation back to Explode.
 2014-07-29 14:26:50 +00:00