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

4295 Commits

Author SHA1 Message Date
Paul Lawrence
b6102427ae Merge "Hide crypto consts from docs" 2014-05-29 14:43:09 +00:00
Yorke Lee
547d9b9b55 Merge "Unhide ContactsCount API" 2014-05-29 14:35:53 +00:00
Dianne Hackborn
d3a5b916b1 am c2091a1f: Merge "Add system layer for voice interaction services." into lmp-preview-dev 
* commit 'c2091a1fbc463941b3e42db36e369124ac3c1013':
  Add system layer for voice interaction services.
 2014-05-29 09:42:56 +00:00
Zhijun He
d5a8d65b43 am 239ac054: Merge "Camera2: Update spec for thumbnail cropping behavior" into lmp-preview-dev 
* commit '239ac0541bf7e0fc8b301d077b40e3e52cf32161':
  Camera2: Update spec for thumbnail cropping behavior
 2014-05-29 00:42:32 +00:00
Dianne Hackborn
a923758d80 Merge "Add system layer for voice interaction services." into lmp-preview-dev 2014-05-29 00:18:25 +00:00
Dianne Hackborn
e30e02f5d9 Add system layer for voice interaction services. 
New window layer that voice interaction service windows
go in to.  Includes a new voice-specific content rectangle
that voice activities are placed in to.

Add specific animations for this layer, sliding down from
the top (though this can be customized by the voice interaction
service).

Also add the concept of activities running for voice interaction
services for purposes of adjusting the animation used for them,
again sliding from the top, but not (yet?) customizable by the
voice interaction service.

Change-Id: Ic9e0e8c843c2e2972d6abb4087dce0019326155d
 2014-05-28 17:16:51 -07:00
Adam Powell
88e719fd3e am 49a4961e: Merge "Toolbar factoring and ActionBar functionality integration" into lmp-preview-dev 
* commit '49a4961efde042f4921393f59cff86c2b7889c71':
  Toolbar factoring and ActionBar functionality integration
 2014-05-28 23:07:25 +00:00
Zhijun He
f5fe63c35c Merge "Camera2: Update spec for thumbnail cropping behavior" into lmp-preview-dev 2014-05-28 22:49:31 +00:00
Zhijun He
50f7243ca0 Camera2: Update spec for thumbnail cropping behavior 
Also update FULL capability spec (remove ZSL from the requirement list).

Bug: 15168075
Change-Id: I864baf35ffab9047b52facb29011682e724bbc9b
 2014-05-28 15:23:21 -07:00
Evan Charlton
89f858c874 Merge "@hide Telecomm APIs [DO NOT MERGE]" into lmp-preview-dev 2014-05-28 22:14:07 +00:00
ztenghui
c9ad54e8ec Merge "Add translation and scale to the group tag and related tests." 2014-05-28 21:59:42 +00:00
Adam Powell
6addcea6ae Merge "Toolbar factoring and ActionBar functionality integration" into lmp-preview-dev 2014-05-28 21:44:01 +00:00
Eino-Ville Talvala
5b02e9f65f am a4aad3d0: Merge changes Ia0f54124,I1e085f5e,Ic0a3ff0a,I141847df,I8ae4efa2 into lmp-preview-dev 
* commit 'a4aad3d0e5c258d6bbf6254ec5ab80a470b1b529':
  camera2: Update native/managed key mappings.
  Camera2: switch API interface to java classses
  Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
  camera2: Add new metadata keys, change types for existing range keys
  Camera2: Replace int[] by MeteringRectangle
 2014-05-28 20:35:58 +00:00
Eino-Ville Talvala
b9a65de1f7 Merge changes Ia0f54124,I1e085f5e,Ic0a3ff0a,I141847df,I8ae4efa2 into lmp-preview-dev 
* changes:
  camera2: Update native/managed key mappings.
  Camera2: switch API interface to java classses
  Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
  camera2: Add new metadata keys, change types for existing range keys
  Camera2: Replace int[] by MeteringRectangle
 2014-05-28 20:33:42 +00:00
ztenghui
452f6ece7f Add translation and scale to the group tag and related tests. 
bug:15288554

Change-Id: Iebe176d0a9c2c566d1910674a068e65e15569829
 2014-05-28 13:22:44 -07:00
Evan Charlton
b4eb0c0863 @hide Telecomm APIs [DO NOT MERGE] 
Change-Id: Id2d8d21f5de79bd5ffa468a82b29b77daf07e120
 2014-05-28 13:22:05 -07:00
Paul Lawrence
e8fdc541dc Hide crypto consts from docs 
@bug 15192967

Change-Id: I134b2cb2d2841bc101e63a8a4dbd86f7b7bdca14
 2014-05-28 12:58:13 -07:00
Adam Powell
e021e6ed89 Toolbar factoring and ActionBar functionality integration 
Toolbars now can act in the role of ActionBar with the exception of
navigation modes. Expandable action views are now supported as well as
populating menu items from a host window.

Change-Id: If477db9c7ad9f95723f28cf73cbf03a07ce9d6ad
 2014-05-28 12:36:38 -07:00
Christopher Tate
560ce61c59 Merge "DO NOT MERGE - Run the task manager service at startup" into lmp-preview-dev 2014-05-28 19:03:03 +00:00
Derek Sollenberger
90735dc0c6 Merge "Cleanup Canvas API by deprecating a few methods." 2014-05-28 18:33:27 +00:00
Derek Sollenberger
0d181540e0 Cleanup Canvas API by deprecating a few methods. 
The clipRegion(Region) API exposed a different semantic than all other clip APIs by not
respecting the current matrix. The same behavior can be achieved by calling clipRect(Rect)
on the Rects within a Region.

bug: 14650725
Change-Id: I7e91813b8e2474f327e070e549fa303d66f8b552
 2014-05-28 14:26:06 -04:00
Griff Hazen
8c2a828849 am c15d315a: am a9cb1e66: Add full screen size preset to WearableExtender 
* commit 'c15d315aeb2c23895e940560784bd51f7962b702':
  Add full screen size preset to WearableExtender
 2014-05-28 17:44:11 +00:00
Ruben Brunk
574936894d camera2: Update native/managed key mappings. 
Switches to using managed value classes for the following keys:
- android.sensor.info.sensitivityRange
- android.sensor.info.exposureTimeRange
- android.jpeg.gpsCoordinates
- android.jpeg.gpsTimestamp
- android.jpeg.gpsProcessingMethod
- android.statistics.lensShadingMap
- android.lens.info.shadingMapSize
Also fixes a minor bug in LensShadingMap

Bug: 14628001
Change-Id: Ia0f541242f529ab9ba3111db799306b198f2b40b
 2014-05-28 10:26:21 -07:00
Jean-Michel Trivi
a0b731363d Merge "DO NOT MERGE temporary hide of AudioAttributes" into lmp-preview-dev 2014-05-28 16:11:30 +00:00
Yin-Chia Yeh
8490ace76f Camera2: switch API interface to java classses 
android.sensor.info.physicalSize: float[] -> SizeF
android.statistics.hotPixelMap: int[] -> Point[]
android.tonemap.curve[Red|Green|Blue]: float[] -> TonemapCurve

Bug: 14628001
Change-Id: I1e085f5e640a059852fcb504b6dd5f884039e653
 2014-05-28 01:36:54 -07:00
Igor Murashkin
78712a8bd7 camera2: Add new metadata keys, change types for existing range keys 
Also adds the following keys:
* android.control.maxRegionsAe
* android.control.maxRegionsAwb
* android.control.maxRegionsAf
* android.request.maxNumOutputRaw
* android.request.maxNumOutputProc
* android.request.maxNumOutputProcStalling

Changes the following keys' type
generations:
* android.control.aeTargetFpsRange
* (Range<Integer>)
* android.control.aeAvailableTargetFpsRanges
* (Range<Integer>[])
* android.control.aeCompensationRange
* (Range<Integer>)
* android.lens.focusRange
* (Range<Float>)

Bug: 14628001
Change-Id: I141847dffc4b0d89cea37c19a54d6d5faf24a9bb
 2014-05-28 01:36:53 -07:00
Yorke Lee
f4b2845547 Unhide ContactsCount API 
Bug: 6948882
Change-Id: Iae639827ddaeecf105c0377c51e3314d742034f8
 2014-05-27 19:59:30 -07:00
Matthew Williams
bc132a068b Merge "Implementation of TaskManager reschedule/cancel" 2014-05-28 02:52:00 +00:00
Matthew Williams
b61c506a50 Implementation of TaskManager reschedule/cancel 
Issues here:
"Reschedule" of an idle-mode task is not well-defined. In the
API I throw an error if you try to set a back-off policy on
an idle mode task.
Implementation-wise, i add a delay for a reschedule request of an
idle mode task. This means that if the phone's still in idle mode
after the delay they app will get a call back, but otherwise it'll
have to wait til the next one.

Implemented all API functions

Change-Id: I0264c2614cc52c28730abbcb1557f314f058f991
 2014-05-27 18:36:54 -07:00
Griff Hazen
d5f11f98d1 DO NOT MERGE Cherry-pick: Add full screen size preset to WearableExtender 
Bug: 14838838

Change-Id: Id038d994d61d3c89dba08232a424a5b1b934e5db
 2014-05-27 17:36:44 -07:00
Griff Hazen
24f1e5342e Merge "DO NOT MERGE Cherry-pick: Fix current.txt" into lmp-preview-dev 2014-05-28 00:32:01 +00:00
Griff Hazen
e6fff6e088 Merge "DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notifications" into lmp-preview-dev 2014-05-28 00:31:46 +00:00
Griff Hazen
c15d315aeb am a9cb1e66: Add full screen size preset to WearableExtender 
* commit 'a9cb1e66737f816d643bca03832af719cbdd0f20':
  Add full screen size preset to WearableExtender
 2014-05-28 00:18:03 +00:00
Igor Murashkin
5fe5bcaeaa am dc0230fc: Merge "camera2: Add partial results to the capture listener (API change)" into lmp-preview-dev 
* commit 'dc0230fc450e8880fb640cd476f2248bf0a401e4':
  camera2: Add partial results to the capture listener (API change)
 2014-05-27 23:57:36 +00:00
Igor Murashkin
79458826c6 Merge "camera2: Add partial results to the capture listener (API change)" into lmp-preview-dev 2014-05-27 23:54:21 +00:00
Griff Hazen
a9cb1e6673 Add full screen size preset to WearableExtender 
For custom display notifications.

Bug: 14838838
Change-Id: Id038d994d61d3c89dba08232a424a5b1b934e5db
 2014-05-27 15:40:09 -07:00
Jean-Michel Trivi
1ad0192800 DO NOT MERGE temporary hide of AudioAttributes 
Bug 15089989

Change-Id: I6077d4906d5624be4dd2b8a5c3378a04c848b6d8
 2014-05-27 12:44:05 -07:00
Aravind Akella
1a68f24ab7 Merge "Adding wakeup sensors, maxDelay to java SDK." 2014-05-27 19:25:41 +00:00
Igor Murashkin
db075afc85 camera2: Add partial results to the capture listener (API change) 
* Also adds capture sequence aborted callback

Bug: 12492876
Change-Id: I56ec8edbcda8b64c2262ff7472961ac78042c7f4
 2014-05-27 11:25:24 -07:00
Etienne Le Grand
ef0b88181e am 7326defe: am d7439d8c: Merge "Add confidence to the heart rate monitor definition and clarify onAccuracyChange" into klp-modular-dev 
* commit '7326defe2de7ace86236bf0c5353fe0687c3f99c':
  Add confidence to the heart rate monitor definition and clarify onAccuracyChange
 2014-05-27 18:10:52 +00:00
Etienne Le Grand
7326defe2d am d7439d8c: Merge "Add confidence to the heart rate monitor definition and clarify onAccuracyChange" into klp-modular-dev 
* commit 'd7439d8c59e4c5a82ad94a5080436cc94f72e0be':
  Add confidence to the heart rate monitor definition and clarify onAccuracyChange
 2014-05-27 18:06:13 +00:00
Wink Saville
ec16a95928 Merge "Hide LogicalChannel operations developer preview." 2014-05-27 17:40:31 +00:00
Winson Chung
2eb4f9c377 DO NOT MERGE 
Removing unnecessary public values. (Bug 14995844)
(cherry picked from commit aa327fc2ce428f939885e1172578ff1dc975214c)

Change-Id: I98672d0ed3120c15bf31ce7a21ab604cfe66273d
 2014-05-27 17:07:52 +00:00
ztenghui
427a15a0f0 Merge "DO NOT MERGE: Hide the VectorDrawable" into lmp-preview-dev 2014-05-27 16:09:05 +00:00
Nicolas Prevot
e282c97e21 Merge "Rename code related to cross-profile intents." 2014-05-27 10:07:58 +00:00
Wink Saville
d42f945a3c Hide LogicalChannel operations developer preview. 
Bug: 15193354
Change-Id: I0e41ab7bd8bb3aab9af855f022cb89349802f63f
 2014-05-26 09:01:20 -07:00
Griff Hazen
5b86b248fd DO NOT MERGE Cherry-pick: Fix current.txt 
Change-Id: Ie262b0be6cecd7084cab2b0468820e9d5b9ea670
 2014-05-25 19:37:44 -07:00
Griff Hazen
61a9e8635f DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notifications 
Change-Id: I40012fd0458ec103eabf75ed4c91f636e02f4c8f
 2014-05-25 19:37:32 -07:00
John Spurlock
098c0b8ca0 DO NOT MERGE Hide vibrator streamHint overloads for preview. 
Bug:15192966
Change-Id: I25f57053b6f62fb627ae4f451d5f64ee77b8eba0
 2014-05-24 09:09:06 -04:00
Etienne Le Grand
af80510e85 Add confidence to the heart rate monitor definition and clarify onAccuracyChange 
Change-Id: I686d07dcd603bf3c3be3c1471de8be3b4e240855
 2014-05-23 19:14:33 -07:00