44769 Commits

Author SHA1 Message Date
Alex Ray
bb478e6da0 am 783d3c1e: am 69c66f42: Merge "camera2: describe non-full hw level optional tag entries" into klp-dev
* commit '783d3c1ed1989e820437fec4224079d8c860ad36':
  camera2: describe non-full hw level optional tag entries
2013-10-07 16:31:24 -07:00
Alex Ray
783d3c1ed1 am 69c66f42: Merge "camera2: describe non-full hw level optional tag entries" into klp-dev
* commit '69c66f4203b1c6e76e457bfaa9e0854c5d7cd832':
  camera2: describe non-full hw level optional tag entries
2013-10-07 16:28:58 -07:00
Adam Powell
266b3026c4 am 20ba658b: am 31049d76: Use SCREEN Xfermode for keyguard badges; update SeekBar
* commit '20ba658bdb32cb6f02cb12d9f94419e29420f9f5':
  Use SCREEN Xfermode for keyguard badges; update SeekBar
2013-10-07 16:27:29 -07:00
Alex Ray
69c66f4203 Merge "camera2: describe non-full hw level optional tag entries" into klp-dev 2013-10-07 23:25:24 +00:00
Adam Powell
20ba658bdb am 31049d76: Use SCREEN Xfermode for keyguard badges; update SeekBar
* commit '31049d76c55b18a6d9993f0d9687598740b16014':
  Use SCREEN Xfermode for keyguard badges; update SeekBar
2013-10-07 16:25:17 -07:00
Adam Powell
31049d76c5 Use SCREEN Xfermode for keyguard badges; update SeekBar
Plumb through the necessary API features through Drawables and
ImageView but leave it hidden for now pending future API review and
plumbing through the rest of the framework Drawable implementations.

Update SeekBar assets used for keyguard transport control.

Set selected status directly instead of finding views by id.

Bug 10531608
Bug 10784913

Change-Id: Ia38bd04ad1bc26e9e6da1dda8a374c9ba3ceccb3
2013-10-07 16:14:17 -07:00
Igor Murashkin
b7354bab15 am c8093826: am 46ea9b0b: Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev
* commit 'c80938266fcdd14f2bb749d1a9dbb4af7dbde83f':
  camera2: Workaround for null FACE_DETECT_MODE crashing
2013-10-07 15:43:19 -07:00
Igor Murashkin
c80938266f am 46ea9b0b: Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev
* commit '46ea9b0b0451a44fc30a646a6e1c4062f0b3d62d':
  camera2: Workaround for null FACE_DETECT_MODE crashing
2013-10-07 15:41:09 -07:00
Igor Murashkin
46ea9b0b04 Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev 2013-10-07 22:38:37 +00:00
Igor Murashkin
e37885a8a3 camera2: Workaround for null FACE_DETECT_MODE crashing
Bug: 11118679
Change-Id: Id9b055744f6a2f502857b4cc0c5badb46b44a1f8
2013-10-07 15:29:58 -07:00
Svetoslav Ganov
5ffb19aed5 am f30b6474: am c2d6e51d: Merge "The undefined media sizes for both orientations not properly constructed." into klp-dev
* commit 'f30b6474408dd27a6fd13710f352211a8a39669b':
  The undefined media sizes for both orientations not properly constructed.
2013-10-07 15:27:02 -07:00
Svetoslav Ganov
f30b647440 am c2d6e51d: Merge "The undefined media sizes for both orientations not properly constructed." into klp-dev
* commit 'c2d6e51d6c27eb8f3ca917b467e4a6d55d10cdc8':
  The undefined media sizes for both orientations not properly constructed.
2013-10-07 15:24:39 -07:00
Amith Yamasani
77c8831ff6 Don't backup/restore ringer mode
Backing it up might result in restoring a new device to a silent,
or vibrate-only state, which is not a good out-of-box experience.

Bug: 11025824
Change-Id: I5b63fd3da012ffc4253338aae31527302a2d276a
2013-10-07 15:23:16 -07:00
Svetoslav Ganov
c2d6e51d6c Merge "The undefined media sizes for both orientations not properly constructed." into klp-dev 2013-10-07 22:21:52 +00:00
Alan Viverette
5a0f4eccfb Ignore certain WindowManager flags when touch exploration is enabled
Specifically, ignore any flags that alter the visibility of the navigation
bar and transparency.

BUG: 11082573
Change-Id: I17264dc55a1c6c3cb9b9cf92d5121799cecee5b8
2013-10-07 15:12:57 -07:00
Zhijun He
da7a00a208 am e32e311a: am c37a5ab5: Merge "Camera2: fix Face class java doc build break" into klp-dev
* commit 'e32e311a1159d03cda7791880bb5a32ca1d5e37f':
  Camera2: fix Face class java doc build break
2013-10-07 15:12:19 -07:00
Jeff Sharkey
9d1383c61c am 5e02e0a9: am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev
* commit '5e02e0a9e1e075e3d451d929b0a67bf280c432ed':
  Add <intent-filter> support to <provider>.
2013-10-07 15:12:16 -07:00
Eino-Ville Talvala
fa117b44bf am 474c79e8: am ad45fa64: Merge "Camera2: Fire all callbacks" into klp-dev
* commit '474c79e80afd18c91f3fc657dfacfc5a168e2ff2':
  Camera2: Fire all callbacks
2013-10-07 15:12:05 -07:00
Zhijun He
e32e311a11 am c37a5ab5: Merge "Camera2: fix Face class java doc build break" into klp-dev
* commit 'c37a5ab54e5e3ad3bb816d7c9e2b923af6f74f73':
  Camera2: fix Face class java doc build break
2013-10-07 14:58:04 -07:00
Zhijun He
c37a5ab54e Merge "Camera2: fix Face class java doc build break" into klp-dev 2013-10-07 21:53:28 +00:00
Jeff Sharkey
5e02e0a9e1 am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev
* commit 'bcc77b502b56d4b91610adfa10c657003c9c820d':
  Add <intent-filter> support to <provider>.
2013-10-07 14:44:52 -07:00
Jeff Sharkey
bcc77b502b Merge "Add <intent-filter> support to <provider>." into klp-dev 2013-10-07 21:41:45 +00:00
Zhijun He
04eceec132 Camera2: fix Face class java doc build break
Bug: 10406212
Change-Id: Ida4da1ee3f67e176e04d07f569e153d671fa9e40
2013-10-07 14:35:57 -07:00
Leon Scroggins III
f65183fd76 Do not attempt to decode NULL SkData.
NewFromFD fails if mmap fails. In that case, it returns a NULL
SkData. SkMemoryStream handles NULL input by calling SkData::NewEmpty,
which is not threadsafe. If the SkMemoryStream were to get some
busted SkData, its call to read might fail. Sidestep this problem
by not creating the SkMemoryStream if the SkData is NULL, skipping
the call to SkData::NewEmpty.

BUG:11028218
Change-Id: Id70299bef1c85ffb5d17102fdb5ea071b0bee68a
2013-10-07 17:30:47 -04:00
Jeff Sharkey
85f5f81320 Add <intent-filter> support to <provider>.
For the new documents work, we're only interested in the subset of
ContentProviders that actually implement DocumentsContract.  Instead
of returning all providers, add <intent-filter> support to make it
easier to limit the set of returned ProviderInfo.

Define a well-known action for DocumentsProviders, and start using it
when querying for roots.  Continue supporting the old <meta-data>
approach until all apps have been updated.

Bug: 8599233
Change-Id: I05f049bba21311f5421738002f99ee214447c909
2013-10-07 14:19:13 -07:00
Eino-Ville Talvala
474c79e80a am ad45fa64: Merge "Camera2: Fire all callbacks" into klp-dev
* commit 'ad45fa64382fa00778ff8ddfd1ac65d81fd55404':
  Camera2: Fire all callbacks
2013-10-07 14:13:22 -07:00
Eino-Ville Talvala
ad45fa6438 Merge "Camera2: Fire all callbacks" into klp-dev 2013-10-07 21:10:41 +00:00
Rachad Alao
5be2d2af80 am 0ed8c93c: am 00fb27dd: Merge "Camera2: add metadata override" into klp-dev
* commit '0ed8c93cffec6b4d0c1e86599365074b1b2c3f1f':
  Camera2: add metadata override
2013-10-07 13:46:05 -07:00
Rachad Alao
0ed8c93cff am 00fb27dd: Merge "Camera2: add metadata override" into klp-dev
* commit '00fb27dda8c74229ea55b524063410842ba4a21e':
  Camera2: add metadata override
2013-10-07 13:42:52 -07:00
Rachad Alao
00fb27dda8 Merge "Camera2: add metadata override" into klp-dev 2013-10-07 20:40:22 +00:00
Baligh Uddin
e7f1a0db37 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-07 19:44:02 +00:00
Eino-Ville Talvala
868d904306 Camera2: Fire all callbacks
- Allow configureOutputs to be called when device is
   actively working, and document what happens then.
 - At the managed level, trigger proper sequence of callbacks for
   device state changes, for all the callbacks that are not yet
   managed by the camera service.
 - Restructure CameraManager.openDevice to have the device itself fire the
   initial callbacks.
 - Make CameraDevice.configureOutputs(null) work.
 - Make CameraDeviec.configureOutputs(identical surfaces) work.
 - Ensure proper checking for camera closed state.

Bug: 10360518
Change-Id: I9db348ee9c5ce4d3fe02fd34e779acc85cba68dc
2013-10-07 12:40:49 -07:00
John Spurlock
64157f23d8 am 1fc7bd3e: am 619fc89a: Merge "Fix transparent -> translucent reference in private docs." into klp-dev
* commit '1fc7bd3eb2ee9598665013c843b4bbd26d74fd26':
  Fix transparent -> translucent reference in private docs.
2013-10-07 10:10:18 -07:00
Baligh Uddin
a54d00d3a8 Import translations. DO NOT MERGE
Change-Id: I526647a96dfaad1d0687f84efd9f5b0e7cfcb07b
Auto-generated-cl: translation import
2013-10-07 09:54:02 -07:00
Robert Craig
f97616c7ba Fix App Ops permission mapping structure.
The entry to map the post notification op
to a permission is at the wrong offset
within the sOpPerms array. This patch
fixes the issue.

Change-Id: Ia241d274e484b6a24edbfb17b87bb887b61f1ee1
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2013-10-07 12:43:06 -04:00
John Spurlock
3f7cd517aa Fix transparent -> translucent reference in private docs.
Bug:10781433
Change-Id: I9e71b38df3909c367c80a9a589d28f703d1c9936
2013-10-07 12:25:09 -04:00
Zhijun He
b7bfdc7cf7 Camera2: add metadata override
There are interface difference between managed and native side for some
metadata, like Face and JPEG format. we need override them when they are set/get
between native and managed sides.

Also fix some issues in the CameraMetadataTest.

Bug: 10406212

Change-Id: Ibd8be0415968445e711b3ea89f45e1edfa193ee2
2013-10-07 08:02:25 -07:00
Svetoslav Ganov
b2420c917b The undefined media sizes for both orientations not properly constructed.
We have constants for an app to specify an undefined media size in portrait
and such in landscape. The constants for these media sizes had the width and
height dimesions swapped.

bug:11099831

Change-Id: Ic09227c3a03429fc5a4a157abc15fea87d3ad8be
2013-10-06 19:44:19 -07:00
John Spurlock
4818db0fc5 am b88ede00: am d5102f19: Merge "Transparent system ui flags -> Translucent WM flags." into klp-dev
* commit 'b88ede00ac12fb359b490a5167cd595ebde7e805':
  Transparent system ui flags -> Translucent WM flags.
2013-10-06 19:19:18 -07:00
John Spurlock
d5102f1965 Merge "Transparent system ui flags -> Translucent WM flags." into klp-dev 2013-10-07 02:13:50 +00:00
Chet Haase
cdd59f0e60 am e849cc1b: am febf33fe: Merge "Fix resource-loading code for TransitionSet" into klp-dev
* commit 'e849cc1be608d672d318c5b7e56857ebe296de52':
  Fix resource-loading code for TransitionSet
2013-10-06 18:18:52 -07:00
John Spurlock
bd95740648 Transparent system ui flags -> Translucent WM flags.
Migrate View.SYSTEM_UI_FLAG_TRANSPARENT_(STATUS/NAVIGATION) to
WindowManager.LayoutParams.FLAG_TRANSLUCENT_(STATUS|NAVIGATION).

Add associated public attrs for both new window flags:
  windowTranslucentStatus
  windowTranslucentNavigation

Introduce convenient four new themes that set translucent decor:
  Theme.Holo.NoActionBar.TranslucentDecor
  Theme.Holo.Light.NoActionBar.TranslucentDecor
  Theme.DeviceDefault.NoActionBar.TranslucentDecor
  Theme.DeviceDefault.Light.NoActionBar.TranslucentDecor

Update PhoneWindowManager mechanism to plumb these values back to
SystemUI to drive bar mode state.

The new translucent flags come from the top fullscreen window, not
the focused window, so translucency does not change when opening
dialogs.

Imply some window-level system-ui visibility if one or both of these
new flags are present, specifically:
  FLAG_TRANSLUCENT_STATUS implies LAYOUT_STABLE, LAYOUT_FULLSCREEN
  FLAG_TRANSLUCENT_NAVIGATION implies LAYOUT STABLE, LAYOUT_HIDE_NAV

Rename all associated variable & resource names to use the term
translucent instead of transparent. (Retain the term semi-transparent
for the transient bar style).

Recents activity allowed to inherit translucent decor state via the
new PRIVATE_FLAG_INHERIT_TRANSLUCENT_DECOR.  Compensating changes
to use the full screen area more appropriately.

Update keyguard to use new WM flags.

Update docs and various api artifacts.

Sanity-check fixes:
 - Toasts and alerts given stable layout.
 - Suppress nu-gradient when in transient (hidey) mode.
 - New translucent flags use top-fullscreen window, dialogs don't clear.

Bug:10674960
Bug:11062108
Bug:10987178
Bug:10786445
Bug:10781433
Change-Id: If667a55bea4cf5e008549524b9899197fab55ebe
2013-10-06 16:03:53 -04:00
Chet Haase
febf33fe4b Merge "Fix resource-loading code for TransitionSet" into klp-dev 2013-10-06 19:35:16 +00:00
Chet Haase
aafc91c05a Fix resource-loading code for TransitionSet
The inflation code in TransitionInflater was using the wrong
tag ("set") for TransitionSet. This fix corrects that problem
(changing it to "transitionSet") and documents the correct
tag in the TransitionSet javadocs.

Issue #11085279 Transitions: transition sets loaded from resources don't work

Change-Id: I8aaea9f31bbe368cffcca63d4eb6a5ec06c3ce7b
2013-10-06 12:10:12 -07:00
Victoria Lease
e820087359 am 0d5a719d: am b088c9e0: Merge "reset mShapingPaint\'s SkTypeface before we use it" into klp-dev
* commit '0d5a719dc7f2ca8726f670af3c5b9fdee614ab07':
  reset mShapingPaint's SkTypeface before we use it
2013-10-04 18:01:45 -07:00
Victoria Lease
b088c9e0dd Merge "reset mShapingPaint's SkTypeface before we use it" into klp-dev 2013-10-05 00:55:52 +00:00
Victoria Lease
8450a6ef8b reset mShapingPaint's SkTypeface before we use it
Harfbuzz works in TTF glyph-space, but most of Skia works in
fallback glyph-space. shapeFontRun() helpfully calculates the
baseGlyphCount needed to convert between the two, but leaves
mShapingPaint's SkTypeface set to the specific TTF being shaped
rather than the original SkTypeface that was requested. Needless
to say, this causes all manner of horrific malady when glyph
indices are calculated in one glyph-index-space and then applied
to another.

To fix this issue, I reset mShapingPaint's SkTypeface when done
with the Harfbuzz shaping operation so that the baseGlyphCount only
gets applied once.

Change-Id: Ia886f89d667634e15e5fc8d7af443c9d1ba89622
2013-10-04 17:33:35 -07:00
Svetoslav
133c1faf8c am 67d7af51: am 19565ad1: Merge "Small print API tweaks" into klp-dev
* commit '67d7af514c2a393cbe886ebf5527a0dc45817cfb':
  Small print API tweaks
2013-10-04 16:51:58 -07:00
Svetoslav
19565ad1a1 Merge "Small print API tweaks" into klp-dev 2013-10-04 23:48:37 +00:00
Chet Haase
5c44b36b2a am 3980ae47: am 845d9192: Merge "Enable transitions in lockscreen media controller" into klp-dev
* commit '3980ae478b290bc472f20289b67b6719439b12fa':
  Enable transitions in lockscreen media controller
2013-10-04 16:34:14 -07:00