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

5827 Commits

Author SHA1 Message Date
Igor Murashkin
77cd5ace33 am ad2b04a6: am 901be0ae: Merge "camera2: Update Face class." into klp-dev 
* commit 'ad2b04a6f167f8574c7e0efbf8c30b15fa966b5b':
  camera2: Update Face class.
 2013-09-16 15:43:53 -07:00
Igor Murashkin
901be0ae33 Merge "camera2: Update Face class." into klp-dev 2013-09-16 22:32:11 +00:00
Igor Murashkin
8f64e3cd42 am 14297141: am 5cf86aa7: Merge "media: Update ImageReader to remove MaxImagesAcquiredException" into klp-dev 
* commit '142971418c8e9ca539dae40f3c2532956f258e6b':
  media: Update ImageReader to remove MaxImagesAcquiredException
 2013-09-16 14:08:23 -07:00
Igor Murashkin
5cf86aa756 Merge "media: Update ImageReader to remove MaxImagesAcquiredException" into klp-dev 2013-09-16 21:02:32 +00:00
Alan Viverette
599d2a49e8 Fix default style attr in DialogPreference subclass constructors 
BUG: 10751709
Change-Id: Ia7fa91e52881b46d39711d2adc43330014234a55
 2013-09-16 13:48:29 -07:00
Igor Murashkin
5454e3ddcc am 720b1fce: am 26cb5fd5: Merge "media: Update ImageReader APIs" into klp-dev 
* commit '720b1fcecd6c21bf4fbe6d3822e52c8a092b93c4':
  media: Update ImageReader APIs
 2013-09-16 13:24:58 -07:00
Igor Murashkin
26cb5fd5ff Merge "media: Update ImageReader APIs" into klp-dev 2013-09-16 20:19:15 +00:00
Martijn Coenen
0754cb7586 am 1f8d7f61: am 370b593c: Merge "Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE." into klp-dev 
* commit '1f8d7f61c07faa7ad566fe2329dcf7923f6221d0':
  Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE.
 2013-09-16 10:37:45 -07:00
Martijn Coenen
370b593c37 Merge "Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE." into klp-dev 2013-09-16 17:31:40 +00:00
Michael Jurka
6f11e3254e am 9d4d14fa: am 276e6c7a: Merge "Add new intent/method for cropping and setting wallpapers" into klp-dev 
* commit '9d4d14fa292e4ef7beb66c20b0b2c139b81d3c8f':
  Add new intent/method for cropping and setting wallpapers
 2013-09-14 05:32:00 -07:00
Michael Jurka
276e6c7a89 Merge "Add new intent/method for cropping and setting wallpapers" into klp-dev 2013-09-14 12:25:51 +00:00
Igor Murashkin
e3351f1942 media: Update ImageReader to remove MaxImagesAcquiredException 
* acquiring images now throws IllegalStateException instead of
    MaxImagesAcquiredException

Bug: 10691447
Change-Id: I7ce68f990fb96703705b9181012a28633fea0b7a
 2013-09-13 23:27:44 -07:00
Igor Murashkin
7a36a0fbb0 camera2: Add key enumeration functionality to CameraMetadata 
* Add a way to enumerate all currently set keys in CameraMetadata
* Add a way to enumerate all available keys for CaptureRequest
* Add a way to enumerate all available keys for CaptureResult
* No way to enumerate all keys for CameraProperties, since it would be
  identical to all the currently set keys.

Bug: 10360518
Change-Id: I3a90f8cc385db14a675e4ff876ae93d906ff06bf
 2013-09-13 19:00:15 -07:00
Alan Viverette
d17e719da0 Merge "Clean up layout constructors, make them consistent" 2013-09-14 01:22:45 +00:00
Igor Murashkin
b779ac1e2e camera2: Update Face class. 
- Move Face to be outer class. Enables Parcelable-izing it later.
- Add static public constants for field values.
- Add @hide constructors.
- Rename methods returning Point to have Position suffix.
- Add new key android.statistics.faces (CaptureResult#STATISTICS_FACES)

Bug: 10360518
Bug: 10549293
Change-Id: I067f06f0426114b2c3a3266ca7e00e6cb1d89046
 2013-09-13 17:42:26 -07:00
Dianne Hackborn
e054986657 am 5b7359aa: am 76adfd71: Merge "Fix issue #10461477: KLP API Review: Debug.MemoryInfo" into klp-dev 
* commit '5b7359aa442a120c2853a05bc987c501da659df2':
  Fix issue #10461477: KLP API Review: Debug.MemoryInfo
 2013-09-13 17:32:18 -07:00
Rachad Alao
1f54af0996 am 00b3f942: am 4fe6429b: Merge "Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG" into klp-dev 
* commit '00b3f942e45f08b4f1e86a6c9c8cdaecf4efecc4':
  Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG
 2013-09-13 17:30:45 -07:00
Jeff Sharkey
be9e10a26d am 56cb98e8: am 12c7a0c9: Merge "More UX updates around picking images." into klp-dev 
* commit '56cb98e8f122f202f76e9b9cc072a72b80ef6600':
  More UX updates around picking images.
 2013-09-13 17:30:41 -07:00
Jeff Sharkey
4c7c51480e am f5513f41: am 0bf2ed90: Merge "Move search to roots; Documents root; hide empty." into klp-dev 
* commit 'f5513f41fe041bef29ec70abdce7cc6f582a11c2':
  Move search to roots; Documents root; hide empty.
 2013-09-13 17:22:41 -07:00
Dianne Hackborn
3fa8969021 Fix issue #10461477: KLP API Review: Debug.MemoryInfo 
Oops.

Change-Id: I2143790af9e6649dba8d74618358c47232cf6cc4
 2013-09-13 17:20:00 -07:00
Rachad Alao
4fe6429ba2 Merge "Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG" into klp-dev 2013-09-13 23:44:44 +00:00
Jeff Sharkey
f6db154975 More UX updates around picking images. 
When picking images or videos, hide the titles in recents, since the
thumbnails should speak for themselves.  Also respect new flag that
allows a directory to request their titles be hidden.

Show directory icon hint in grid mode when showing a thumbnail, to
remind user it's a directory.

Filter directories out of recents.  Hide most action bar icons on
phones, even when room.  Only show drawer on first launch.  Hide most
drawer headers to match spec.

Bug: 10710331
Change-Id: I0ef1973ddd62750f57345336388366eda1449720
 2013-09-13 16:02:14 -07:00
Zhijun He
bbae94a02e Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG 
It collides with HAL ZSL template, rename it to TEMPLATE_ZERO_SHUTTER_LAG and
hide it for now.

Bug: 10690122
Change-Id: I793154849aa7aa4bf4874e2ff3f3890dd05b1f9e
 2013-09-13 13:27:03 -07:00
Jeff Sharkey
3e1189b359 Move search to roots; Documents root; hide empty. 
Documents searches now happen root-wide, instead of only under a
subdirectory.  Updates abstract class and flags to match.  Add flag
for a root to indicate it's empty, and hide empty roots in UI unless
creating.

Define "Documents" public directory and storage backend to contain
files.

Bug: 10712057, 10710865, 10710758
Change-Id: I8716367568969f9cb1d83927b2bf5a7013809350
 2013-09-13 11:35:04 -07:00
Michael Jurka
e8d1bf7a43 Add new intent/method for cropping and setting wallpapers 
Also, create a system fallback WallpaperCropper

Bug: 4225598

Change-Id: I6bc6d5a3bb3df1dc00f3db701978aa172020c568
 2013-09-13 17:04:46 +02:00
Sungsoo Lim
42a1390499 Update api/current.txt 
Needed to run make update-api after
the merge of http://goo.gl/6RC3I4

Change-Id: If6cf3a520ff14c37a2ba317b799d246be2b620af
 2013-09-13 20:48:12 +09:00
Kenny Root
bd51158d61 resolved conflicts for merge of aca95ca0 to master 
Change-Id: I91adf923288ca724a8040ecf887e28e42ad7e259
 2013-09-12 21:49:35 -07:00
Svetoslav
90ce2f3f52 am 9282b9ac: am b72ff5aa: Merge "Remove unneeded print APIs and update the min margins APIs." into klp-dev 
* commit '9282b9ac8eda1591bb54b46ddc4e88da1c2f0c56':
  Remove unneeded print APIs and update the min margins APIs.
 2013-09-12 21:42:28 -07:00
Alan Viverette
2a65a2839e Merge "Add live region politeness to View, AccessibilityNodeInfo" into klp-dev 2013-09-13 01:45:10 +00:00
Selim Gurun
da7d642253 Publish Print Api for Webview 
Bug:10652036

Change-Id: Ibcc7e48f4e4ce1bc437c0d3fb89d3d66a90dca64

This is a cherry-pick of a5c86c644bce5f9d472541b2d1ddc1b39299f004
to prevent a automerger failure.

Conflicts:
	core/java/android/webkit/WebView.java
	core/java/android/webkit/WebViewClassic.java
	core/java/android/webkit/WebViewProvider.java
 2013-09-12 18:12:16 -07:00
Alan Viverette
77e9a28e2f Add live region politeness to View, AccessibilityNodeInfo 
Alters the content change API to contain a bit mask of types of
changes represented by the event. Live regions send CONTENT_CHANGED
events immediately. Removes unused APIs for EXPANDABLE/EXPANDED.

BUG: 10527284
Change-Id: I21523e85e47df23706976dc0a8bf615f83072c04
 2013-09-12 17:16:09 -07:00
Svetoslav
651dd4e6ee Remove unneeded print APIs and update the min margins APIs. 
1. Removed unneeded code in Resolution that was storing its
   label as resource and package name. We do not have predefined
   resolutions, therefore we always persist the label.

2. Renamed the print attribute margins to minMargins to reflect
   that these are the minimal margins the printer support. Updated
   the docs as well.

3. Renamed the create method of all builder to build.

bug:10727487

Change-Id: Ie72ab8aaa5215b8bd2853885011b3b4efa4deb2e
 2013-09-12 16:58:58 -07:00
Igor Murashkin
5e712064df media: Update ImageReader APIs 
Bug: 10461757
Change-Id: Ic04e4c41965e3d417b29004f3f08e0cd56b8f4cb
 2013-09-12 16:57:57 -07:00
Chet Haase
ebcb9ecf2b am 9501a452: am e850c973: Merge "Hide translucent activity conversion API" into klp-dev 
* commit '9501a452af30dd15559804193c8183bbaa42a669':
  Hide translucent activity conversion API
 2013-09-12 16:44:24 -07:00
Selim Gurun
76ffaa5808 Merge "Publish Print Api for Webview" into klp-dev 2013-09-12 23:22:29 +00:00
Santos Cordon
798363894d Add permissions for the InCallUI Split. 
Change-Id: Ic1023adba939c82e9bce844c104f85821f21f43c
 2013-09-12 15:05:53 -07:00
Chet Haase
e850c973b0 Merge "Hide translucent activity conversion API" into klp-dev 2013-09-12 19:41:33 +00:00
Eino-Ville Talvala
0f05de62e7 am db0e1cf1: am 2d861e87: Merge "Camera2: Fix build: Add new key to API" into klp-dev 
* commit 'db0e1cf14a53b4f4885123966984ef80d32331ed':
  Camera2: Fix build: Add new key to API
 2013-09-12 12:12:44 -07:00
Eino-Ville Talvala
2d861e87ae Merge "Camera2: Fix build: Add new key to API" into klp-dev 2013-09-12 19:06:55 +00:00
Eino-Ville Talvala
986b1bd73f Camera2: Fix build: Add new key to API 
Change-Id: Ie44a9e3b1c8d04dd266d39f59a5916ddaf5fca67
 2013-09-12 11:52:45 -07:00
Igor Murashkin
d6b8a4ab4c am ddc74f5e: am 6c621639: Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev 
* commit 'ddc74f5ed1d541ea89964228417eff3d5d6ad071':
  camera_metadata: add android.lens.state MOVING enum value
 2013-09-12 11:32:28 -07:00
Igor Murashkin
6c62163976 Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev 2013-09-12 18:21:15 +00:00
Chet Haase
a9265c1083 am 913c0233: am c0f65209: Merge "Add exclude() methods to Transition" into klp-dev 
* commit '913c023387c319f6c7b1e4878a4d0d07f8624f78':
  Add exclude() methods to Transition
 2013-09-12 11:11:07 -07:00
Chet Haase
c0f652093e Merge "Add exclude() methods to Transition" into klp-dev 2013-09-12 18:07:40 +00:00
Martijn Coenen
b523bfa64d Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE. 
Bug: 10722206
Change-Id: I8b672cd7b9015e1ec88af96ef1fd0774d20b8d17
 2013-09-12 13:44:39 +02:00
Igor Murashkin
9ea4ae67fb camera_metadata: add android.lens.state MOVING enum value 
Bug: 10621609
Change-Id: Ia4fa15db99350f920741f244ae7772520657fdd2
 2013-09-11 21:43:50 -07:00
Selim Gurun
dde1f8b01b am 1e763fd2: am e4fdc847: Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 
* commit '1e763fd280b3dc555e6a0a3a6458fbdb9a43e096':
  Revert "Add permissions for the InCallUI Split."
 2013-09-11 18:08:56 -07:00
Selim Gurun
e4fdc84794 Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 2013-09-12 01:02:45 +00:00
Selim Gurun
41b9ef9c4e Revert "Add permissions for the InCallUI Split." 
This reverts commit 4f7ffa90d117e499786c77bccefdef88c1714668.

Change-Id: If07f7dd0b416c070398593e2d5a15b3557c1f323
 2013-09-12 00:57:34 +00:00
Lajos Molnar
c4eae8ec47 am 5481e5fe: am 03cd51cd: Merge "MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT" into klp-dev 
* commit '5481e5fe30e3708f8a7a9ea8a1dabfa4ae050370':
  MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT
 2013-09-11 17:31:00 -07:00