Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
116,390 Commits 3 Branches 0 Tags
91adc9ff6f30d43eb025d53574e617513be1b305
Commit Graph

32570 Commits

Author SHA1 Message Date
Svetoslav Ganov
91adc9ff6f am 98b07f4e: am b02b14b2: am ef4a6f86: Merge "Do not do a layout and write while a cancellation is in progress." into klp-dev 
* commit '98b07f4e1ea7c5a861c2c66278816ab6c8fd02d1':
  Do not do a layout and write while a cancellation is in progress.
 2013-10-08 09:44:18 -07:00
Svetoslav Ganov
98b07f4e1e am b02b14b2: am ef4a6f86: Merge "Do not do a layout and write while a cancellation is in progress." into klp-dev 
* commit 'b02b14b21e46c531ae726094413f036ae36c56f9':
  Do not do a layout and write while a cancellation is in progress.
 2013-10-08 09:39:08 -07:00
Svetoslav Ganov
ef4a6f8662 Merge "Do not do a layout and write while a cancellation is in progress." into klp-dev 2013-10-08 16:34:27 +00:00
Alan Viverette
550b89e6de am 80fad292: am 6d774ac6: am bdae8148: Merge "Provide example actions in AccessibilityEvent.setAction() docs" into klp-dev 
* commit '80fad292318ac2e1e76435bb8334017a702a62d7':
  Provide example actions in AccessibilityEvent.setAction() docs
 2013-10-07 18:17:37 -07:00
Alan Viverette
80fad29231 am 6d774ac6: am bdae8148: Merge "Provide example actions in AccessibilityEvent.setAction() docs" into klp-dev 
* commit '6d774ac6049de8bf347a735eb67c491bb2623aa1':
  Provide example actions in AccessibilityEvent.setAction() docs
 2013-10-07 18:15:05 -07:00
Alan Viverette
bdae814816 Merge "Provide example actions in AccessibilityEvent.setAction() docs" into klp-dev 2013-10-08 01:09:00 +00:00
Alan Viverette
516f953a82 resolved conflicts for merge of e4ccb864 to master 
Change-Id: I50c41c712c4eb4f68b22777efb2e5d5370536b22
 2013-10-07 18:05:09 -07:00
Alan Viverette
e4ccb864e8 am 1bdbdfbe: am 6930d380: Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev 
* commit '1bdbdfbe6a48113bff2069c8eaf9835f9fd8c9bb':
  Ignore certain WindowManager flags when touch exploration is enabled
 2013-10-07 17:54:42 -07:00
Alan Viverette
6930d3805e Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev 2013-10-08 00:47:23 +00:00
Svetoslav Ganov
db63677c7c Do not do a layout and write while a cancellation is in progress. 
While printing the app gets callbacks to do a layout and a write. Since
these operations can take a very long time they are implemented in a async
fashion. For example, if there is a layout request while we are still doing
a layout, we ask the application to cancel the previous layout. The problem
was that we were not waiting for the cancellation result before calling
the subsequent layout. Hence, the app ends up having to do two layouts at
the same time which breaks the printing contract. Same for write.

bug:11118426

Change-Id: If7b191c44387d88d5cec195d1785a47f986965ba
 2013-10-07 17:13:01 -07:00
Amith Yamasani
632b7dc884 am 6db7f39b: am 1eae6109: am 1b5a2e63: Merge "Don\'t backup/restore ringer mode" into klp-dev 
* commit '6db7f39ba573fd087c79da9585801c3f277ac8fc':
  Don't backup/restore ringer mode
 2013-10-07 17:09:04 -07:00
Amith Yamasani
6db7f39ba5 am 1eae6109: am 1b5a2e63: Merge "Don\'t backup/restore ringer mode" into klp-dev 
* commit '1eae610981ea1d6f7816d333fb98519f2459a254':
  Don't backup/restore ringer mode
 2013-10-07 17:03:00 -07:00
Alex Ray
e3a8a0f573 am bb478e6d: am 783d3c1e: am 69c66f42: Merge "camera2: describe non-full hw level optional tag entries" into klp-dev 
* commit 'bb478e6da0a80da5a9dd00a005d00c40e31cfc18':
  camera2: describe non-full hw level optional tag entries
 2013-10-07 17:01:21 -07:00
Adam Powell
80da140cc4 am 266b3026: am 20ba658b: am 31049d76: Use SCREEN Xfermode for keyguard badges; update SeekBar 
* commit '266b3026c42ed3ba0feedd9abe3e3bb6932c2f23':
  Use SCREEN Xfermode for keyguard badges; update SeekBar
 2013-10-07 17:01:16 -07:00
Amith Yamasani
1b5a2e630a Merge "Don't backup/restore ringer mode" into klp-dev 2013-10-07 23:57:36 +00:00
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
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
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
3f7da6a32c am b7354bab: am c8093826: am 46ea9b0b: Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev 
* commit 'b7354bab1500f7eec9360fbabf0474af0dfaad68':
  camera2: Workaround for null FACE_DETECT_MODE crashing
 2013-10-07 15:46:46 -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
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
82fb4460a4 am 5ffb19ae: am f30b6474: am c2d6e51d: Merge "The undefined media sizes for both orientations not properly constructed." into klp-dev 
* commit '5ffb19aed5826bd78ca5861ffffaa814d8e4169a':
  The undefined media sizes for both orientations not properly constructed.
 2013-10-07 15:28:19 -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
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
Zhijun He
f3441f8a42 am da7a00a2: am e32e311a: am c37a5ab5: Merge "Camera2: fix Face class java doc build break" into klp-dev 
* commit 'da7a00a208de6dcfbadc1651b50875592616fca3':
  Camera2: fix Face class java doc build break
 2013-10-07 15:16:17 -07:00
Jeff Sharkey
5b6372171c am 9d1383c6: am 5e02e0a9: am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev 
* commit '9d1383c61ca0932cb36b104a89c32db15de6a10e':
  Add <intent-filter> support to <provider>.
 2013-10-07 15:16:14 -07:00
Eino-Ville Talvala
02e8bbf918 am fa117b44: am 474c79e8: am ad45fa64: Merge "Camera2: Fire all callbacks" into klp-dev 
* commit 'fa117b44bf43868bc97b2d3795f1e033f4899351':
  Camera2: Fire all callbacks
 2013-10-07 15:16:07 -07: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
c37a5ab54e Merge "Camera2: fix Face class java doc build break" into klp-dev 2013-10-07 21:53:28 +00: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
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
ad45fa6438 Merge "Camera2: Fire all callbacks" into klp-dev 2013-10-07 21:10:41 +00:00
Rachad Alao
fe2ed8859a am 5be2d2af: am 0ed8c93c: am 00fb27dd: Merge "Camera2: add metadata override" into klp-dev 
* commit '5be2d2af80716c08b8626046df8977dbf925df85':
  Camera2: add metadata override
 2013-10-07 13:47:54 -07: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
00fb27dda8 Merge "Camera2: add metadata override" into klp-dev 2013-10-07 20:40:22 +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
2b5a190d2d am 64157f23: am 1fc7bd3e: am 619fc89a: Merge "Fix transparent -> translucent reference in private docs." into klp-dev 
* commit '64157f23d808f44d304020c7e0c43dfc42b398e8':
  Fix transparent -> translucent reference in private docs.
 2013-10-07 10:15:58 -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
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
13431ad822 am 4818db0f: am b88ede00: am d5102f19: Merge "Transparent system ui flags -> Translucent WM flags." into klp-dev 
* commit '4818db0fc5dec465a2cdb76c0faff4750a3a3fff':
  Transparent system ui flags -> Translucent WM flags.
 2013-10-06 19:22:46 -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