drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
130,325 Commits 1 Branch 0 Tags
Commit Graph

38531 Commits

Author SHA1 Message Date
Zhijun He
e126be2c5b Merge "Camera2: make videostabilization type consistent" 2014-05-06 00:03:28 +00:00
Winson Chung
98596c92a3 Merge "Exposing the API to support widgets in Recents." 2014-05-05 23:59:29 +00:00
Justin Koh
a13a17ee0c am fd04632a: am 3caf9258: Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev 
* commit 'fd04632ab5fe9272b0f1d2ff94367a574e026a5b':
  Hide getDeviceGlobalActionKeyTimeout
 2014-05-05 22:45:23 +00:00
Justin Koh
fd04632ab5 am 3caf9258: Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev 
* commit '3caf92582498bad8fe79f6e3235be218e82b7f68':
  Hide getDeviceGlobalActionKeyTimeout
 2014-05-05 22:38:13 +00:00
Justin Koh
3caf925824 Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev 2014-05-05 22:33:29 +00:00
Justin Koh
68ca14648c am ed23c5bc: Hide NsdServiceInfo additions for KKWT DO NOT MERGE 
* commit 'ed23c5bc12b4110435b1e6f5fb9b82716109136e':
  Hide NsdServiceInfo additions for KKWT DO NOT MERGE
 2014-05-05 22:21:03 +00:00
Justin Koh
ed23c5bc12 Hide NsdServiceInfo additions for KKWT DO NOT MERGE 
Hide NsdServiceInfo additions for KKWT.
Bug: 14116162

Change-Id: I98755a2524168be5e833a634192fd49ff3c32346
 2014-05-05 22:18:42 +00:00
Alan Viverette
f4ce9e115e Merge "Add support for popups overlapping anchors" 2014-05-05 22:05:54 +00:00
Justin Koh
1aa59f86ca Hide getDeviceGlobalActionKeyTimeout 
Hide getDeviceGlobalActionKeyTimeout, as requested. Remove mention from
@deprecated notice.
Bug: 14441321

Change-Id: Ic6e84e718c2eaa15a86d8cd4d13645be88490b61
 2014-05-05 14:40:56 -07:00
Alan Viverette
560f17098f Add support for popups overlapping anchors 
BUG: 14471731
Change-Id: I16e8d76caedfebd0c38b8c0b22cd9619d70877c8
 2014-05-05 14:40:07 -07:00
Winson Chung
da5b84c8d3 Exposing the API to support widgets in Recents. 
Change-Id: I2d53f226dbc328f0dbda7006eac647c6468c6b36
 2014-05-05 14:33:44 -07:00
Craig Mautner
6856ef87a5 am 9bb4df3a: am e88097bd: Merge "Pause and resume ActivityView when visibility changes" into klp-modular-dev 
* commit '9bb4df3a7d9ed479f8ef10b08bbc3354a1984aab':
  Pause and resume ActivityView when visibility changes
 2014-05-05 21:07:48 +00:00
Craig Mautner
9bb4df3a7d am e88097bd: Merge "Pause and resume ActivityView when visibility changes" into klp-modular-dev 
* commit 'e88097bd00d5710bbfb6c24a934743c8d6cac9cf':
  Pause and resume ActivityView when visibility changes
 2014-05-05 21:03:39 +00:00
Ashish Sharma
81850c48fd Avoid creating new battery history types because of no separator. 
Change-Id: I325743142bee21e4dbca5bf9ed6135b7ca5340ec
 2014-05-05 21:00:33 +00:00
Adam Powell
9e7a14ddce Merge "Fix a bug in AbsListView nested scrolling support." 2014-05-05 20:35:44 +00:00
Adam Powell
11d0069f92 Fix a bug in AbsListView nested scrolling support. 
Bug 14564701

Change-Id: I8cb854b987736e6f141610c8e6e77eb263a718db
 2014-05-05 13:28:22 -07:00
George Mount
cac8ce33a9 Merge "Add ImageView-specific shared element activity transition code." 2014-05-05 20:02:53 +00:00
Alan Viverette
c6d2d3a069 Merge "Partial revert "Load device default theme mapping from resources"" 2014-05-05 19:47:49 +00:00
John Reck
f9be77940e Make RenderNodeAnimator and WebView play nice 
Change-Id: Ifaefcf510b2d377663fc86f60608d6ec9be8329a
 2014-05-05 12:35:30 -07:00
Alan Viverette
5effd7e89f Partial revert "Load device default theme mapping from resources" 
This reverts commit e4ab72d54cf41d16819b72e94d9b0d0d51289647.

Change-Id: Id17170312c75993fc1f7859d52c7e050b2aeaf80
 2014-05-05 12:26:03 -07:00
George Mount
080443bcb6 Add ImageView-specific shared element activity transition code. 
Bug 14497858

Probably more than 50% of shared elements will be ImageViews and
sharing the scale type and matrix between the two Activities will
simplify shared element transitions.

Also fixed MoveImage, which had a bug when the scale type was FIX_XY.

Change-Id: Ic5548b4d1420ced12507c18edf76c9e50e27a929
 2014-05-05 12:25:43 -07:00
John Reck
5d039c458c Merge "TIME LORD!" 2014-05-05 19:21:26 +00:00
Craig Mautner
d13a558397 Pause and resume ActivityView when visibility changes 
Once a Surface has been established the activity in an ActivityView
must be paused and resumed as the view goes in and out of visibility
= View.GONE.

Fixes bug 14034658.

Change-Id: Icab43678053c225db70f051dceacd4d024df2153
 2014-05-05 12:07:40 -07: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
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
4793af5e35 Camera2: make videostabilization type consistent 
Make it consistent with availableVideoStabilizationModes and its optical
stabilization relatives.

Change-Id: I6e3834af8a62d4f84fca2d305ac9574052b69db0
 2014-05-05 10:39:12 -07: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
043aa252cf Merge "Define Feature action for obtaining info on a new CEC device" 2014-05-04 21:51:44 +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
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
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
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
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
53b75c0838 Merge "Fix javadoc breakage" 2014-05-02 21:47:46 +00:00
Selim Gurun
8b414fc483 Fix javadoc breakage 
Change-Id: I2667bdb6b4ea76c2f81bae77ceaecb3391e4521b
 2014-05-02 14:40:41 -07: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
f589f2a190 Merge "Change wake reason checkin tag to "wr"." 2014-05-02 21:08:53 +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
0e82d134ee Merge "Add CanvasProperty for drawCircle" 2014-05-02 20:48:26 +00:00