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

44927 Commits

Author SHA1 Message Date
Baligh Uddin
e608f6d26e Import translations. DO NOT MERGE 
Change-Id: Idf3c804dad4f6a6acbfbf176b06ffacfe30345cf
Auto-generated-cl: translation import

Conflicts:
	core/res/res/values-af/strings.xml
	core/res/res/values-am/strings.xml
	core/res/res/values-ar/strings.xml
	core/res/res/values-be/strings.xml
	core/res/res/values-bg/strings.xml
	core/res/res/values-ca/strings.xml
	core/res/res/values-cs/strings.xml
	core/res/res/values-da/strings.xml
	core/res/res/values-de/strings.xml
	core/res/res/values-el/strings.xml
	core/res/res/values-en-rGB/strings.xml
	core/res/res/values-en-rIN/strings.xml
	core/res/res/values-es-rUS/strings.xml
	core/res/res/values-es/strings.xml
	core/res/res/values-et-rEE/strings.xml
	core/res/res/values-fa/strings.xml
	core/res/res/values-fi/strings.xml
	core/res/res/values-fr-rCA/strings.xml
	core/res/res/values-fr/strings.xml
	core/res/res/values-hi/strings.xml
	core/res/res/values-hr/strings.xml
	core/res/res/values-hu/strings.xml
	core/res/res/values-hy-rAM/strings.xml
	core/res/res/values-in/strings.xml
	core/res/res/values-it/strings.xml
	core/res/res/values-iw/strings.xml
	core/res/res/values-ja/strings.xml
	core/res/res/values-ka-rGE/strings.xml
	core/res/res/values-km-rKH/strings.xml
	core/res/res/values-ko/strings.xml
	core/res/res/values-lo-rLA/strings.xml
	core/res/res/values-lt/strings.xml
	core/res/res/values-lv/strings.xml
	core/res/res/values-mn-rMN/strings.xml
	core/res/res/values-ms-rMY/strings.xml
	core/res/res/values-nb/strings.xml
	core/res/res/values-nl/strings.xml
	core/res/res/values-pl/strings.xml
	core/res/res/values-pt-rPT/strings.xml
	core/res/res/values-pt/strings.xml
	core/res/res/values-rm/strings.xml
	core/res/res/values-ro/strings.xml
	core/res/res/values-ru/strings.xml
	core/res/res/values-sk/strings.xml
	core/res/res/values-sl/strings.xml
	core/res/res/values-sr/strings.xml
	core/res/res/values-sv/strings.xml
	core/res/res/values-sw/strings.xml
	core/res/res/values-th/strings.xml
	core/res/res/values-tl/strings.xml
	core/res/res/values-tr/strings.xml
	core/res/res/values-uk/strings.xml
	core/res/res/values-vi/strings.xml
	core/res/res/values-zh-rCN/strings.xml
	core/res/res/values-zh-rHK/strings.xml
	core/res/res/values-zh-rTW/strings.xml
	core/res/res/values-zu/strings.xml
 2013-10-15 14:44:35 -07:00
Zhijun He
2c31cf7cc4 am 549a9590: am 58216c26: Camera2: return CaptureResult.STATISTICS_FACES 
* commit '549a95902a20c8a96167215982c282264e47d3ed':
  Camera2: return CaptureResult.STATISTICS_FACES
 2013-10-15 10:18:44 -07:00
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)
f96b93e22c Resolved conflicts for merge of c5f742d4 to klp-dev-plus-aosp 
Change-Id: Ieeb9460a66ca761ae347fecff671ce54dfbc9cdf
 2013-10-15 11:49:09 +01:00
Torne (Richard Coles)
db931a3b2b am a1ba29ac: am d892afc8: Remove support for switching WebView. 
* commit 'a1ba29acc4a6709f74fb7fefdcdb66adc71c849a':
  Remove support for switching WebView.
 2013-10-15 03:41:34 -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
c80477e712 am a7833f86: am bf9b087b: Merge "Camera2: Fix face rectangle coordinate mapping, and use Key.equals" into klp-dev 
* commit 'a7833f861e303d9dea2cf54ceb519ff937f68367':
  Camera2: Fix face rectangle coordinate mapping, and use Key.equals
 2013-10-14 23:48:29 -07: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
a0ce8c92cf am a09c20a2: am a457211a: Merge "Fix getBuiltInWallpaper method" into klp-dev 
* commit 'a09c20a23038c1d77ae3d511da18a377572aed0c':
  Fix getBuiltInWallpaper method
 2013-10-14 20:57:22 -07: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
5a87a4e355 am 30408434: am f8033360: Merge "Give IMEs the entire screen to use for measuring purposes." into klp-dev 
* commit '30408434d3c04efa2b4a18838f9dfe0b5760f4ef':
  Give IMEs the entire screen to use for measuring purposes.
 2013-10-14 19:02:03 -07:00
Dianne Hackborn
9aded5abd6 am 827c5af0: am e49a107a: Merge "Fix issue #11223335: APR: Lots of failures in procstats due to..." into klp-dev 
* commit '827c5af02de29424ea80f1ccfe525e681d0b74f0':
  Fix issue #11223335: APR: Lots of failures in procstats due to...
 2013-10-14 19:01:55 -07:00
Michael Jurka
7ec3a98110 am 588bfeea: am f6f545f6: Merge "Fix the build" into klp-dev 
* commit '588bfeeaad627985163c8bcd76d4815b1ebce13a':
  Fix the build
 2013-10-14 19:01:47 -07:00
Michael Jurka
21bd2e5b0a am a8b20cf8: am bcfc634d: Merge "Ensure URIs have content:// scheme in WPM" into klp-dev 
* commit 'a8b20cf801f841511979f440ab05b4f93a9c8ecb':
  Ensure URIs have content:// scheme in WPM
 2013-10-14 19:01:38 -07:00
Jeff Sharkey
881cde3358 am 16c4b8c5: am ddf5a170: Merge "Relax user constraint on storage state." into klp-dev 
* commit '16c4b8c5999b4365bde5ad7c2f00337cee988dab':
  Relax user constraint on storage state.
 2013-10-14 19:01:30 -07:00
Jeff Sharkey
25b99efb32 am ac0cb359: am 8e656df0: Merge "Add extras to AFD, send orientation metadata." into klp-dev 
* commit 'ac0cb3591a637533c1f0329fd00a621fbe1fd997':
  Add extras to AFD, send orientation metadata.
 2013-10-14 19:00:51 -07:00
Martijn Coenen
e7a81e7a87 am 47936bb8: am 7d91cc97: Merge "NFC card emulation API docs." into klp-dev 
* commit '47936bb8f5192496b8007009f8732a9d7194b2ac':
  NFC card emulation API docs.
 2013-10-14 19:00:44 -07:00
Robert Greenwalt
6becff179d am 87408ffd: am f64247e4: Merge "Fix change to re-add carrier roaming details." into klp-dev 
* commit '87408ffda1d101efb2cc56b657468318374488d9':
  Fix change to re-add carrier roaming details.
 2013-10-14 19:00:32 -07:00
Adam Lesinski
04e2a47ab7 am 461f06f4: am 53a5e317: Merge "Wrap measurement optimization in targetSdk check" into klp-dev 
* commit '461f06f4037849d5075d947852306bafdf0e949c':
  Wrap measurement optimization in targetSdk check
 2013-10-14 19:00:28 -07:00
Vineeta Srivastava
26e9f9254a am 4967abcf: am 1680cfd8: Merge "Modify config.xml for tethering APN information." into klp-dev 
* commit '4967abcf2cce60e5a33e0bb9f0464b0897e65240':
  Modify config.xml for tethering APN information.
 2013-10-14 19:00:13 -07:00
Daniel Sandler
c963dfb27a am 596b1f86: am dd73ee4d: Add a config resource to enable translucent bars globally. 
* commit '596b1f86ff1a3457a514e1d383d14ef0defc4d53':
  Add a config resource to enable translucent bars globally.
 2013-10-14 19:00:10 -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