44127 Commits

Author SHA1 Message Date
Zhijun He
549a95902a am 58216c26: Camera2: return CaptureResult.STATISTICS_FACES
* commit '58216c2650c9536f93467d6ab347ca3f7720dedd':
  Camera2: return CaptureResult.STATISTICS_FACES
2013-10-15 10:15:37 -07:00
Zhijun He
58216c2650 Camera2: return CaptureResult.STATISTICS_FACES
Changes included in this CL:

- remove the WAR for face detect mode null case.
- make the sanity check assert to warnings.
- make number of faces to be the minimal length of face metadata array length to
avoid out of bound access, since we relax the sanity check.

Bug: 11206459
Change-Id: Ifd9f7f79617039c1b3ad631f202b48076d775e09
2013-10-15 07:46:53 -07:00
Torne (Richard Coles)
c5f742d4de am 94c0057d: Delete the old WebView.
* commit '94c0057d67c2e0a4b88a4f735388639210260d0e':
  Delete the old WebView.
2013-10-15 03:39:48 -07:00
Torne (Richard Coles)
a1ba29acc4 am d892afc8: Remove support for switching WebView.
* commit 'd892afc88d3c67a7fe1c9550bfa7a452051d031d':
  Remove support for switching WebView.
2013-10-15 03:39:45 -07:00
Torne (Richard Coles)
94c0057d67 Delete the old WebView.
Delete all the Java classes used only by the old WebView implementation,
and also sections of common classes that were only needed for the old
WebView.

Bug: 10427705
Change-Id: I02549a71104b35d86d99058c71f43e054730ec7d
2013-10-15 11:18:51 +01:00
Torne (Richard Coles)
d892afc88d Remove support for switching WebView.
WebViewFactory remains as an abstraction layer, but will now always
creates Chromium WebView instances.

Bug: 10427705
Change-Id: I045e43eb35462567fecd29d04e7b61902baef547
2013-10-15 11:18:50 +01:00
Eino-Ville Talvala
a7833f861e am bf9b087b: Merge "Camera2: Fix face rectangle coordinate mapping, and use Key.equals" into klp-dev
* commit 'bf9b087be081ff04df569c03c55e2daab47913cd':
  Camera2: Fix face rectangle coordinate mapping, and use Key.equals
2013-10-14 23:45:20 -07:00
Eino-Ville Talvala
bf9b087be0 Merge "Camera2: Fix face rectangle coordinate mapping, and use Key.equals" into klp-dev 2013-10-15 06:41:59 +00:00
Michael Jurka
a09c20a230 am a457211a: Merge "Fix getBuiltInWallpaper method" into klp-dev
* commit 'a457211af55b2ad5bc58f4228ceb147ac22c92b0':
  Fix getBuiltInWallpaper method
2013-10-14 20:51:29 -07:00
Michael Jurka
a457211af5 Merge "Fix getBuiltInWallpaper method" into klp-dev 2013-10-15 03:49:13 +00:00
Michael Jurka
0539153e77 Fix getBuiltInWallpaper method 2013-10-14 20:45:02 -07:00
John Spurlock
30408434d3 am f8033360: Merge "Give IMEs the entire screen to use for measuring purposes." into klp-dev
* commit 'f803336028e1a183facec1a526268f2bcf54e16b':
  Give IMEs the entire screen to use for measuring purposes.
2013-10-14 18:30:13 -07:00
John Spurlock
f803336028 Merge "Give IMEs the entire screen to use for measuring purposes." into klp-dev 2013-10-15 01:27:42 +00:00
Eino-Ville Talvala
615b75f335 Camera2: Fix face rectangle coordinate mapping, and use Key.equals
- Faces are reported differently from other rectangles, so the mapping
  has to be specialized for them

- Use Key.equals for key comparison.

Bug: 11206459
Change-Id: I9a2a408dad981c2911048191ec30977020953146
2013-10-14 18:20:43 -07:00
John Spurlock
f8508272ad Give IMEs the entire screen to use for measuring purposes.
IMEs recently gained the ability to layout out under the nav bar,
but our core measuring logic does not give height=WRAP_CONTENT windows
the entire screen height when computing desired window height.

Since IMEs can be identified by type, let them use the entire screen
height for measuring purposes, to properly handle the cases where
space is constrained, making that unaccounted-for nav bar height
important.

Bug:11215678
Change-Id: I1d0b73454c0c629e7d669b9de70641c7e8c4d333
2013-10-14 21:06:52 -04:00
Dianne Hackborn
827c5af02d am e49a107a: Merge "Fix issue #11223335: APR: Lots of failures in procstats due to..." into klp-dev
* commit 'e49a107a241b77c2361d67796dcb433441d91e37':
  Fix issue #11223335: APR: Lots of failures in procstats due to...
2013-10-14 18:02:15 -07:00
Dianne Hackborn
e49a107a24 Merge "Fix issue #11223335: APR: Lots of failures in procstats due to..." into klp-dev 2013-10-15 01:00:07 +00:00
Michael Jurka
588bfeeaad am f6f545f6: Merge "Fix the build" into klp-dev
* commit 'f6f545f6a7601c9c0b7f6132488cced1d3a0d78b':
  Fix the build
2013-10-14 17:48:00 -07:00
Michael Jurka
f6f545f6a7 Merge "Fix the build" into klp-dev 2013-10-15 00:42:52 +00:00
Michael Jurka
5d1893bafb Fix the build 2013-10-14 17:40:27 -07:00
Michael Jurka
a8b20cf801 am bcfc634d: Merge "Ensure URIs have content:// scheme in WPM" into klp-dev
* commit 'bcfc634db985935fa0a870d63b1bbd904e5bc676':
  Ensure URIs have content:// scheme in WPM
2013-10-14 17:33:18 -07:00
Jeff Sharkey
16c4b8c599 am ddf5a170: Merge "Relax user constraint on storage state." into klp-dev
* commit 'ddf5a170d592614cbc2b7c1d88d906b7683e51d1':
  Relax user constraint on storage state.
2013-10-14 17:29:34 -07:00
Michael Jurka
bcfc634db9 Merge "Ensure URIs have content:// scheme in WPM" into klp-dev 2013-10-15 00:27:50 +00:00
Jeff Sharkey
ddf5a170d5 Merge "Relax user constraint on storage state." into klp-dev 2013-10-15 00:25:23 +00:00
Jeff Sharkey
ac0cb3591a am 8e656df0: Merge "Add extras to AFD, send orientation metadata." into klp-dev
* commit '8e656df0929b352660fd6d6209eabc4267c1941f':
  Add extras to AFD, send orientation metadata.
2013-10-14 17:20:09 -07:00
Martijn Coenen
47936bb8f5 am 7d91cc97: Merge "NFC card emulation API docs." into klp-dev
* commit '7d91cc97d788aae9f3a6ac5540580cc95591e356':
  NFC card emulation API docs.
2013-10-14 17:19:49 -07:00
Robert Greenwalt
87408ffda1 am f64247e4: Merge "Fix change to re-add carrier roaming details." into klp-dev
* commit 'f64247e417ffcffb76bd47af417f4f3623073f88':
  Fix change to re-add carrier roaming details.
2013-10-14 17:19:20 -07:00
Adam Lesinski
461f06f403 am 53a5e317: Merge "Wrap measurement optimization in targetSdk check" into klp-dev
* commit '53a5e3175acb6e2bd23c25c1e4cba0789e47488f':
  Wrap measurement optimization in targetSdk check
2013-10-14 17:19:16 -07:00
Vineeta Srivastava
4967abcf2c am 1680cfd8: Merge "Modify config.xml for tethering APN information." into klp-dev
* commit '1680cfd803d6a435ce4c809075d052da2723ac07':
  Modify config.xml for tethering APN information.
2013-10-14 17:18:21 -07:00
Daniel Sandler
596b1f86ff am dd73ee4d: Add a config resource to enable translucent bars globally.
* commit 'dd73ee4d0a33aa9a423b80471aec6d1ec81a6c82':
  Add a config resource to enable translucent bars globally.
2013-10-14 17:18:15 -07:00
Dianne Hackborn
878deb3c7b Fix issue #11223335: APR: Lots of failures in procstats due to...
...bad cleanup of crashing processes

We now have a special path for crashing processes, to silently
clean up their state.

Also some tweaks to Log/Slog.wtf to get better stack crawl
summaries in APR.

Change-Id: Ieced26989907a6e7615b6fa033813fced78d7474
2013-10-14 17:15:40 -07:00
Jeff Sharkey
8e656df092 Merge "Add extras to AFD, send orientation metadata." into klp-dev 2013-10-15 00:00:20 +00:00
Adam Lesinski
bba72d13af Ensure URIs have content:// scheme in WPM
getCropAndSetWallpaperIntent should only accept URIs with
the content:// scheme, so that the receiving application
doesn't crash opening a file it can't access.

bug:11173560
Change-Id: I855496633b646373db757e9d8e6e425568103b8b
2013-10-14 16:51:56 -07:00
Jeff Sharkey
a6d1999529 Relax user constraint on storage state.
Otherwise we wtf() when called various places in the system.

Bug: 11223886
Change-Id: I514d28603db02e3debd4af1cf20049af0c7399f4
2013-10-14 16:43:42 -07:00
Martijn Coenen
7d91cc97d7 Merge "NFC card emulation API docs." into klp-dev 2013-10-14 23:30:21 +00:00
Jeff Sharkey
c1c8f3f97d Add extras to AFD, send orientation metadata.
AssetFileDescriptor augments a ParcelFileDescriptor with details
about how it should be interpreted, so extend it to support a Bundle
of extras.  Then use these extras to share thumbnail orientation
metadata.

The raw image data of EXIF thumbnails matches the orientation of
the enclosing image, but the thumbnail data doesn't repeat the EXIF
flags.  This meant that receivers of openDocumentThumbnail() would
get an image that needed to be transformed, but without enough
context to actually transform it.

Instead of transforming and recompressing the image on the fly on
the provider side, send a transformation hint that the receiver
side can interpret.

Bug: 11205688
Change-Id: Ibc5a7ad002377a55e6ffcb5ac5c8829841002e06
2013-10-14 15:28:19 -07:00
Robert Greenwalt
f64247e417 Merge "Fix change to re-add carrier roaming details." into klp-dev 2013-10-14 22:11:02 +00:00
Adam Lesinski
53a5e3175a Merge "Wrap measurement optimization in targetSdk check" into klp-dev 2013-10-14 22:06:07 +00:00
Robert Greenwalt
4df84602fd Fix change to re-add carrier roaming details.
bug:11176211
Change-Id: Ibde8bd4b98df781a3c851d97a893da88c161d98b
2013-10-14 14:50:33 -07:00
Adam Lesinski
cf18b47ed4 Wrap measurement optimization in targetSdk check
A measurement optimization has exposed some apps that are relying
on incidental layout requests to have themselves update. With the
optimization enabled, these apps break.

Apps targetted at older versions of Android should not
break due to this optimization.

bug:11192311
Change-Id: Id5fc7f83ec2cb1541d3d0d16f951cd57c0afaccd
2013-10-14 13:32:02 -07:00
Vineeta Srivastava
1680cfd803 Merge "Modify config.xml for tethering APN information." into klp-dev 2013-10-14 19:57:30 +00:00
kenneeth.ryu
16359089ea Modify config.xml for tethering APN information.
1. Remove Tethering profile for Spain Orange(214-03). Because Orange and Euskaltel use same MCC-MNC but have separate tethering APN.
- Spain Orange(214-03) use "internet" apn.
- Spain Euskaltel(214-03) use "internet.euskaltel.mobi" apn.

2. Remove Tethering profile for Spain Telefonica(214-07). Because Telefonica and Jazztel use same MCC-MNC but have separate tethering APN.
- Spain Telefonica (214-07) use "movistar.es" apn.
- Spain Jazztel (214-07) use "jazzinternet" apn.

3. Remove Tethering profile for France Orange(208-01). Because Orange and Carrefour/NRJ/Tele2/Virgin/use same MCC-MNC but have separate tethering APN.
- France Orange (208-01) use "orange.fr" apn.
- France Carrefour (208-01) use "ofnew.fr" apn.

4. Remove Tethering profile for UK T-Mobile(234-33). Because T-Mobile and Orange were merger so doesn't use "consumerbroadband" apn for tethering anymore.

5. Remove Tethering profile for HK 1O1O(454-00). Because 1O1O and NWMOBILE use same MCC-MNC but have separate tethering APN.
- HK 1O1O(454-00) use "lte.internet" apn.
- HK NWMOBILE(454-00) use "NWMOBILE" apn.

6. Remove Tethering profile for HK 3(454-03). Because 3 LTE and 3G have separate tethering apn.
- HK 3 LTE use "lte.three.com.hk" apn.
- HK 3 3G use "mobile.three.com.hk" apn.

7. Update Tethering profile for Orange(340-01). The format of tethering profile was wrong.

8. Add Tethering profile for Mexico Iusacell(334-050).

9. Add Tethering profile for Portugal Optimus(268-03).

Bug: 11176211

Change-Id: I453ff8b745ee4f483bfdd6c362bd67ce50ba8b7a

Conflicts:
	core/res/res/values-mcc234-mnc33/config.xml
2013-10-14 12:33:37 -07:00
Martijn Coenen
35bf628852 NFC card emulation API docs.
Bug: 10550319
Change-Id: I3023639d728aa76af89d15e0491b86c7c641648e
2013-10-14 20:58:53 +02:00
Daniel Sandler
dd73ee4d0a Add a config resource to enable translucent bars globally.
Setting config_enableTranslucentDecor to false will not
prevent clients from adding FLAG_TRANSLUCENT_NAVIGATION or
STATUS to the window or using the TransluentDecor themes,
but it will prevent View.STATUS_BAR_TRANSLUCENT and
View.NAVIGATION_BAR_TRANSLUCENT from being propagated to the
SystemUI so these requests will not be honored.

Bug: 11182618
Change-Id: I8be6a3a565acf0987ff12f18f1c7e67c96d563c3
2013-10-14 14:52:44 -04:00
John Spurlock
fc2ecd5e3f am 774e8ad8: Merge "Implement new SYSTEM_UI_FLAG_IMMERSIVE_STICKY." into klp-dev
* commit '774e8ad88331f82994e38d721418da556ce9edea':
  Implement new SYSTEM_UI_FLAG_IMMERSIVE_STICKY.
2013-10-14 10:26:08 -07:00
John Spurlock
774e8ad883 Merge "Implement new SYSTEM_UI_FLAG_IMMERSIVE_STICKY." into klp-dev 2013-10-14 17:21:33 +00:00
John Spurlock
f1a36648ca Implement new SYSTEM_UI_FLAG_IMMERSIVE_STICKY.
Migrate transient bar mode to IMMERSIVE_STICKY, and
introduce new behavior for IMMERSIVE: namely the
opaque bars are revealed by clearing the flags on swipe.

Remove low-profile optimization that confuses api demos
and other apps using low-profile as a signal.

TransientNavigationConfirmation renamed to
ImmersiveModeConfirmation, and its associated resources,
since the confirmation is now shown when the nav bar is
shown in either of the two immersive modes.

Remove unused Toast.makeBar and associated hidden framework
bits now that the confirmation uses a cling instead.

Bug:11062108
Change-Id: Iae49d31973940b9bee9f5b1827756db5eaa76aa3
2013-10-14 13:11:21 -04:00
Victoria Lease
677687c208 am edbab7b5: Merge "no layout = no visibility" into klp-dev
* commit 'edbab7b58227e66c2cc4e868bba314020ef52080':
  no layout = no visibility
2013-10-14 10:10:08 -07:00
Victoria Lease
edbab7b582 Merge "no layout = no visibility" into klp-dev 2013-10-14 17:08:10 +00:00
Daniel Sandler
782dbb8580 am 69f49434: Merge "Limit transient nav cling to 380dp on large/land devices." into klp-dev
* commit '69f49434ec7240b3b1195b41348ddedba1bd1e98':
  Limit transient nav cling to 380dp on large/land devices.
2013-10-14 06:53:26 -07:00