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

39133 Commits

Author SHA1 Message Date
John Reck
b5b8c92bb3 am ad81362a: Make RenderNodeAnimator and WebView play nice 
* commit 'ad81362a92ce21d6d8cbdfd2a3d4cd9c212cfae7':
  Make RenderNodeAnimator and WebView play nice
 2014-05-05 19:40:43 +00:00
John Reck
f9be77940e Make RenderNodeAnimator and WebView play nice 
Change-Id: Ifaefcf510b2d377663fc86f60608d6ec9be8329a
 2014-05-05 12:35:30 -07:00
John Reck
1ad1596dc8 am f7b1e0db: Merge "TIME LORD!" 
* commit 'f7b1e0dbba17dd0c522f44cf6424f38f64520a65':
  TIME LORD!
 2014-05-05 19:26:39 +00:00
John Reck
5d039c458c Merge "TIME LORD!" 2014-05-05 19:21:26 +00:00
Christoph Studer
d7192c6384 am df9e20f2: Merge changes Iffd15e95,Id2db95ec 
* commit 'df9e20f28839a61dd487c2a67f914e87da1dede9':
  Log notification clicks
  Add userId to StatusBarNotification key
 2014-05-05 19:07:50 +00:00
Christoph Studer
983ce97a5d Merge changes Iffd15e95,Id2db95ec 
* changes:
  Log notification clicks
  Add userId to StatusBarNotification key
 2014-05-05 19:04:57 +00:00
Dianne Hackborn
0e3b95498e am 644aec25: Merge "Further work on voice interaction services." 
* commit '644aec2573cd0540e2a98e86e24681760d58f596':
  Further work on voice interaction services.
 2014-05-05 18:34:43 +00:00
Dianne Hackborn
c03c9167c2 Further work on voice interaction services. 
This makes VoiceInteractionSession a more first-class
concept.  Now the flow is that a VoiceInteractionService
calls startSession() when it wants to begin a session.
This will result in a new VoiceInteractionSession via the
VoiceInteractionSessionService containing it, and the
session at that point an decide what to do.  It can now
show UI, and it is what has access to the startVoiceActivity
API.

Change-Id: Ie2b85b3020ef1206d3f44b335b128d064e8f9935
 2014-05-05 11:18:08 -07:00
John Reck
18f16e6fba TIME LORD! 
Bug: 14444180

Change-Id: I68bec3807c4d1c88d5af1aec2fe6907d60b5f2f3
 2014-05-05 10:57:04 -07:00
Zhijun He
575d6966d2 am 0219201c: Merge "Camera2: Minor update for hyperfocalDistance spec" 
* commit '0219201ca06203303099fb284bdeee488bf5ab53':
  Camera2: Minor update for hyperfocalDistance spec
 2014-05-04 23:41:14 +00:00
Zhijun He
dab4049383 Merge "Camera2: Minor update for hyperfocalDistance spec" 2014-05-04 23:38:28 +00:00
Zhijun He
b41fcc2506 Camera2: Minor update for hyperfocalDistance spec 
Doc only change.

Change-Id: I1b425ab739f10d5e2ba9403baf918f3ee6150d71
 2014-05-04 16:29:57 -07:00
Jinsuk Kim
d8faf17dc8 am 8994ae73: Merge "Define Feature action for obtaining info on a new CEC device" 
* commit '8994ae7367ed687fcd6bd27486765f1ca89e05aa':
  Define Feature action for obtaining info on a new CEC device
 2014-05-04 21:55:38 +00:00
Jinsuk Kim
043aa252cf Merge "Define Feature action for obtaining info on a new CEC device" 2014-05-04 21:51:44 +00:00
Winson Chung
959681876c am 2e1bb944: Merge "Adding ability to load a search widget into Recents." 
* commit '2e1bb94421d996a45cbc2e5472a0fdaa3e2b921c':
  Adding ability to load a search widget into Recents.
 2014-05-03 02:03:09 +00:00
Winson Chung
c74b3cb6f0 Merge "Adding ability to load a search widget into Recents." 2014-05-03 01:58:10 +00:00
Winson Chung
b66ef989d6 am e315e251: Merge "Refactoring activity method to update recents values." 
* commit 'e315e251f07d1346925048fb420312d792af6f9b':
  Refactoring activity method to update recents values.
 2014-05-03 01:45:57 +00:00
Winson Chung
f7bca430d9 Adding ability to load a search widget into Recents. 
Change-Id: Ie17d9b9a47c979774b39a37e87f75d9dadc79ad9
 2014-05-02 18:45:40 -07:00
Winson Chung
3e586e4621 Merge "Refactoring activity method to update recents values." 2014-05-03 01:42:42 +00:00
Adam Powell
c69886edc0 am 94ffd117: Merge "ListViews in ScrollViews and ScrollViews in ListViews" 
* commit '94ffd117faef4b8a73c6ffb7ba0fdf2ebe1f05d4':
  ListViews in ScrollViews and ScrollViews in ListViews
 2014-05-03 00:41:32 +00:00
Adam Powell
3feb0419d2 Merge "ListViews in ScrollViews and ScrollViews in ListViews" 2014-05-03 00:36:21 +00:00
Winson Chung
03a9baedc9 Refactoring activity method to update recents values. 
Change-Id: Ic525be207714d34abe0c2d26091c3e46abcd9bad
 2014-05-02 17:34:37 -07:00
Adam Powell
96d62aff0f ListViews in ScrollViews and ScrollViews in ListViews 
Dogs and cats, living together, mass hysteria!

Add support for nested scrolling to AbsListView, granting the ability
to both ListView and GridView.

Change-Id: Iae5c0518c5cebe41927720a7a27916ef13ca706e
 2014-05-02 17:16:04 -07:00
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