Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
133,605 Commits 3 Branches 0 Tags
3f2941931328224f264e5fa6b726ae010d403e73
Commit Graph

39107 Commits

Author SHA1 Message Date
Igor Murashkin
3f29419313 am 051dd983: camera2: Add camera-specific data types used for metadata key/value 
* commit '051dd9832b0c6c483f2d162154f67a31ef097598':
  camera2: Add camera-specific data types used for metadata key/value
 2014-05-02 23:30:13 +00:00
Igor Murashkin
f188f1863d am 9c31c106: camera2: Add re-usable data types for camera metadata key/values 
* commit '9c31c106db115c8fba67f83a1b416839b99317ee':
  camera2: Add re-usable data types for camera metadata key/values
 2014-05-02 23:30:09 +00:00
Igor Murashkin
94814218d2 camera2: Add camera-specific data types used for metadata key/value 
Adds new public API classes:
* InputOutputFormatsMap
* LensShadingMap
* RggbChannelVector
* StreamConfigurationMap
* TonemapCurve

Adds new @hide classes:
* StreamConfiguration
* StreamConfigurationDuration

Minor changes:
* CameraDevice (doc only)
* Preconditions (new @hide function)

Change-Id: I2f3757e2fe9d63e710f51469c650377165fd6631
 2014-05-02 15:55:30 -07:00
Igor Murashkin
b3a78b2ca9 camera2: Add re-usable data types for camera metadata key/values 
Adds new types to public API:
* ColorSpaceTransform
* Range<T>
* SizeF (android.util)
* MeteringRectangle

Minor changes to:
* Size (docs and move to android.util)
* Preconditions (@hide)

Adds helper class:
* HashCodeHelpers

Change-Id: Ied6749a19234f3af9da838f365f8d68d90251aaf
 2014-05-02 15:55:29 -07:00
Selim Gurun
c2cea198e8 am 2f54693f: Merge "Add an import missing" 
* commit '2f54693ffd34ed3d937cc98ad4ec4743619fa61e':
  Add an import missing
 2014-05-02 21:57:46 +00:00
Selim Gurun
56e36a9781 Merge "Add an import missing" 2014-05-02 21:54:30 +00:00
Selim Gurun
87a0351ddc Add an import missing 
Change-Id: I99a15779bff3bae5dd78d823d1f6c7f644c98751
 2014-05-02 14:52:49 -07:00
Selim Gurun
6f95a10851 am 27cafa43: Merge "Fix javadoc breakage" 
* commit '27cafa431d3291cd1bf964721d7064da76caf2a2':
  Fix javadoc breakage
 2014-05-02 21:50:26 +00:00
Selim Gurun
53b75c0838 Merge "Fix javadoc breakage" 2014-05-02 21:47:46 +00:00
John Reck
6ea7fb6e23 am d06f1ba3: Merge "Allow starting an RT animation via Canvas" 
* commit 'd06f1ba33ba58ccfd2bc29de74b97872ef3117b0':
  Allow starting an RT animation via Canvas
 2014-05-02 21:42:10 +00:00
Selim Gurun
8b414fc483 Fix javadoc breakage 
Change-Id: I2667bdb6b4ea76c2f81bae77ceaecb3391e4521b
 2014-05-02 14:40:41 -07:00
Selim Gurun
6f91ae3947 am 79cf1cfd: Merge "Unhide Client Cert APIS" 
* commit '79cf1cfd04bc5819f87252c8d9f46030c7698fbf':
  Unhide Client Cert APIS
 2014-05-02 21:38:14 +00:00
John Reck
7f090dfa64 Merge "Allow starting an RT animation via Canvas" 2014-05-02 21:36:57 +00:00
Selim Gurun
f72382aec7 Merge "Unhide Client Cert APIS" 2014-05-02 21:34:25 +00:00
John Reck
1c058e96b3 Allow starting an RT animation via Canvas 
Change-Id: I8b105a01cf28ad03797b63347343f6b999d46386
 2014-05-02 14:31:02 -07:00
Selim Gurun
f271c8ecd0 Unhide Client Cert APIS 
Bug:12983007
Change-Id: I9ae23be110ff036ce64271841e1ba69122ce6caa
 2014-05-02 14:19:16 -07:00
Dianne Hackborn
a1842e0b28 am 0f5a222d: Merge "Change wake reason checkin tag to "wr"." 
* commit '0f5a222dabb943b5161fdbd0f1f4af4b9172c89f':
  Change wake reason checkin tag to "wr".
 2014-05-02 21:13:18 +00:00
Dianne Hackborn
f589f2a190 Merge "Change wake reason checkin tag to "wr"." 2014-05-02 21:08:53 +00:00
Selim Gurun
16616b5706 am 63e690cc: Merge "Design a static API for clearclientcertpreferences" 
* commit '63e690ccddb62609c2066a10f580a2f55516b08d':
  Design a static API for clearclientcertpreferences
 2014-05-02 20:59:20 +00:00
Selim Gurun
c25f243a50 Merge "Design a static API for clearclientcertpreferences" 2014-05-02 20:56:44 +00:00
Dianne Hackborn
d06dcfd3db Change wake reason checkin tag to "wr". 
The old "Wr" was also used for Wifi Running.

Also include discharge/charge time remaining in
checkin output.

Change-Id: I303a0be902002d0399b9eb76773857da9103e8ce
 2014-05-02 13:54:13 -07:00
John Reck
3a11dbaa41 am 91058957: Merge "Add CanvasProperty for drawCircle" 
* commit '91058957b673bee84d1f7694309c2b33a17a48ac':
  Add CanvasProperty for drawCircle
 2014-05-02 20:51:11 +00:00
John Reck
0e82d134ee Merge "Add CanvasProperty for drawCircle" 2014-05-02 20:48:26 +00:00
John Reck
52244fff29 Add CanvasProperty for drawCircle 
Change-Id: Icbcc030f5033d2094e567d7c519b9d672f2aac1c
 2014-05-02 13:43:46 -07:00
Dianne Hackborn
ed433f5b88 am 89094f50: Merge "Make GET_TASKS signature|system." 
* commit '89094f504091775d1f7ff68cf9cde11c87d2417a':
  Make GET_TASKS signature|system.
 2014-05-02 20:21:00 +00:00
Dianne Hackborn
5b8b920022 Merge "Make GET_TASKS signature|system." 2014-05-02 20:18:10 +00:00
Selim Gurun
e1c6c3ae21 Design a static API for clearclientcertpreferences 
Bug: 12983007

Change-Id: I869b4cd4c178b8fedf725f108fd2e369895543e9
 2014-05-02 13:08:55 -07:00
Adam Powell
48880767b1 am 298eed05: Merge "Fix a bug in querying showing state for action bars" 
* commit '298eed05ff178486433421de31b6a4e9822c9928':
  Fix a bug in querying showing state for action bars
 2014-05-02 20:06:05 +00:00
Adam Powell
9529d8f26f Merge "Fix a bug in querying showing state for action bars" 2014-05-02 20:04:01 +00:00
Adam Powell
c4b416f18d Fix a bug in querying showing state for action bars 
Bug 14492418

Change-Id: I8d24fd90a8d4004ace186f5ce84ba68fc8419307
 2014-05-02 12:55:24 -07:00
Dianne Hackborn
0923328962 Make GET_TASKS signature|system. 
Normal apps can't hold it now.  If they try to use
getRecentTasks() or getRunningTasks() without the permission,
they will only see their own tasks and home in the list.

Also took this opportunity to eradicate all of the old pending
thumbnail stuff.

Change-Id: I6dc52a06221c78097162e4a8b482027b798bf3ee
 2014-05-02 11:51:26 -07:00
Zhijun He
7db103bb2d am 7c358ce4: Merge "Camera2: replace AssertionError with error log" 
* commit '7c358ce4a1961612ed5f644ec8827010db545dec':
  Camera2: replace AssertionError with error log
 2014-05-02 18:50:07 +00:00
Zhijun He
25bb60e844 Merge "Camera2: replace AssertionError with error log" 2014-05-02 18:45:06 +00:00
Justin Koh
ce3c998337 am 93671ef4: am 9abf0b90: am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev 
* commit '93671ef4b14fabcd06eb64618dc82f6e609edaa2':
  Make global action key timeout configurable.
 2014-05-02 17:42:07 +00:00
Justin Koh
f46009225b am 9abf0b90: am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev 
* commit '9abf0b9031d0ddc33970589d2fb88065d15de712':
  Make global action key timeout configurable.
 2014-05-02 17:33:48 +00:00
Justin Koh
9abf0b9031 am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev 
* commit '6015844578dc4d725c7ab3d3004d18ffea446087':
  Make global action key timeout configurable.
 2014-05-02 17:28:53 +00:00
Justin Koh
6015844578 Merge "Make global action key timeout configurable." into klp-modular-dev 2014-05-02 17:25:50 +00:00
Justin Koh
feabd2c730 Make global action key timeout configurable. 
Make global action key timeout configurable: deprecated the old public method
and created a new one: getDeviceGlobalActionKeyTimeout.
Bug: 14441321

Change-Id: Ifa9b136984a9f02cfe4040baeff11275174967c5
 2014-05-02 10:04:34 -07:00
Mark Renouf
ef78c873b0 am 8302a4d9: am 63f72806: am 11b14691: Implement cliff guard for swipeDismiss gesture 
* commit '8302a4d960ee2f4f22d9816f12218761d26f0707':
  Implement cliff guard for swipeDismiss gesture
 2014-05-02 16:59:11 +00:00
Matthew Williams
f686bfa68a am b283ac25: Merge "Fix sdk build by removing javadoc link" 
* commit 'b283ac25cbaf228dc8fdcde74e5c44e5db2af0da':
  Fix sdk build by removing javadoc link
 2014-05-02 16:54:57 +00:00
Mark Renouf
698a7ab344 am 63f72806: am 11b14691: Implement cliff guard for swipeDismiss gesture 
* commit '63f728065a7584e3a51bb7b0b58ce8cf0c25390e':
  Implement cliff guard for swipeDismiss gesture
 2014-05-02 16:52:29 +00:00
Matthew Williams
6dd51be673 Merge "Fix sdk build by removing javadoc link" 2014-05-02 16:49:09 +00:00
Mark Renouf
63f728065a am 11b14691: Implement cliff guard for swipeDismiss gesture 
* commit '11b1469144d73ad0280ef9d0c2e478d180f17074':
  Implement cliff guard for swipeDismiss gesture
 2014-05-02 16:45:34 +00:00
Michael Wright
7e1c52bf40 am aacd869f: Merge "Fix WebViewClient docs" 
* commit 'aacd869f7fdebfb9895699ecfb9c71c84f7f2708':
  Fix WebViewClient docs
 2014-05-02 16:33:18 +00:00
Michael Wright
428d1e40a9 Merge "Fix WebViewClient docs" 2014-05-02 16:29:27 +00:00
Matthew Williams
ae3e53e933 Fix sdk build by removing javadoc link 
Change-Id: I3ed2a1a0f0c52ad6726be321d03a2c19e5b28d31
 2014-05-02 09:22:25 -07:00
Ben Murdoch
af1019ffc2 am d70c9d98: Merge "Add API definition for WebSettings.allowMixedContent" 
* commit 'd70c9d98771c950ef63e5c1c0fbe789043e5698f':
  Add API definition for WebSettings.allowMixedContent
 2014-05-02 15:51:02 +00:00
Ben Murdoch
27ecb35b19 Merge "Add API definition for WebSettings.allowMixedContent" 2014-05-02 15:48:12 +00:00
Jeff Davidson
8319d99a34 am 9e35d785: Merge "API for network cache subsystems." 
* commit '9e35d785d00a3dd219f08cb5bdf5d3c525837619':
  API for network cache subsystems.
 2014-05-02 15:37:00 +00:00
Jeff Davidson
4cd4110f20 Merge "API for network cache subsystems." 2014-05-02 15:33:36 +00:00