Igor Murashkin
09de7975fe
am a451b603: am 577d0dac: Merge changes I536021b9,I6eb541c9,I6ac08eca into klp-dev
...
* commit 'a451b6038585a71c5c8c84b019fdf3aa3d58d8f6':
SmartCamera: Fix to build against latest camera2 api
Camera2Tests: update SmartCamera for async api
Camera2Tests: Add SmartCamera App
2013-10-15 17:15:56 -07:00
Jeff Sharkey
f53c1a6841
am f82a387c: am e3924ca4: Merge "Improve OPEN/CREATE_DOC docs." into klp-dev
...
* commit 'f82a387cc7e82a18622465e62370e2c4203839f1':
Improve OPEN/CREATE_DOC docs.
2013-10-15 17:15:44 -07:00
Jeff Sharkey
9f81a1a49c
am 84c8603d: am 3cf56085: Merge "Improve external storage docs on Context." into klp-dev
...
* commit '84c8603da051638b41baabef54bcc0f4cbef9735':
Improve external storage docs on Context.
2013-10-15 17:15:40 -07:00
Michael Wright
ee3674a01b
am 19fa2122: am 6bd7603a: Merge "Force the wallpaper to reload when dimensions change" into klp-dev
...
* commit '19fa212251542ac8f24ec0b24316bb08417cb44e':
Force the wallpaper to reload when dimensions change
2013-10-15 17:15:35 -07:00
Baligh Uddin
754fee0a23
am ffe8b79f: (-s ours) am e1b6b6c5: Bring deleted files from the dead. These files were dropped by the translation pipelines because they do not contain any translated elements, but in reality they are needed.
...
* commit 'ffe8b79f36d7ae997bb75751f2d8b1920eb2cd97':
Bring deleted files from the dead. These files were dropped by the translation pipelines because they do not contain any translated elements, but in reality they are needed.
2013-10-15 17:15:34 -07:00
Igor Murashkin
a451b60385
am 577d0dac: Merge changes I536021b9,I6eb541c9,I6ac08eca into klp-dev
...
* commit '577d0dac1d263c6f403f15c587aaf11983e10e44':
SmartCamera: Fix to build against latest camera2 api
Camera2Tests: update SmartCamera for async api
Camera2Tests: Add SmartCamera App
2013-10-15 17:06:46 -07:00
Igor Murashkin
577d0dac1d
Merge changes I536021b9,I6eb541c9,I6ac08eca into klp-dev
...
* changes:
SmartCamera: Fix to build against latest camera2 api
Camera2Tests: update SmartCamera for async api
Camera2Tests: Add SmartCamera App
2013-10-16 00:01:07 +00:00
Jeff Sharkey
f82a387cc7
am e3924ca4: Merge "Improve OPEN/CREATE_DOC docs." into klp-dev
...
* commit 'e3924ca486fcb95bb8eb06992d841decc1b6065a':
Improve OPEN/CREATE_DOC docs.
2013-10-15 16:48:54 -07:00
Jeff Sharkey
84c8603da0
am 3cf56085: Merge "Improve external storage docs on Context." into klp-dev
...
* commit '3cf56085f1a70c200ffd3389dd91fd284a76b91a':
Improve external storage docs on Context.
2013-10-15 16:48:51 -07:00
Michael Wright
19fa212251
am 6bd7603a: Merge "Force the wallpaper to reload when dimensions change" into klp-dev
...
* commit '6bd7603a56cd671c4523d66c1e7378c27a6ac33c':
Force the wallpaper to reload when dimensions change
2013-10-15 16:45:10 -07:00
Jeff Sharkey
e3924ca486
Merge "Improve OPEN/CREATE_DOC docs." into klp-dev
2013-10-15 23:45:10 +00:00
Jeff Sharkey
3cf56085f1
Merge "Improve external storage docs on Context." into klp-dev
2013-10-15 23:44:54 +00:00
Michael Wright
6bd7603a56
Merge "Force the wallpaper to reload when dimensions change" into klp-dev
2013-10-15 23:40:14 +00:00
Baligh Uddin
15bbb7b731
Merge "Import translations. DO NOT MERGE" into klp-dev-plus-aosp
2013-10-15 23:25:12 +00:00
Jim Miller
3507708905
am d5bda747: am 2cc95775: Merge "Fix possible crash in System UI" into klp-dev
...
* commit 'd5bda747971db5fc2dde78dcc5bb42e62659667d':
Fix possible crash in System UI
2013-10-15 16:17:06 -07:00
Baligh Uddin
ae7bf4d0ab
am d99b9fd3: (-s ours) am 1fcf34d8: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd99b9fd3213fecbf987ab285228f985676ae86e5':
Import translations. DO NOT MERGE
2013-10-15 16:17:03 -07:00
Baligh Uddin
ffe8b79f36
am e1b6b6c5: Bring deleted files from the dead. These files were dropped by the translation pipelines because they do not contain any translated elements, but in reality they are needed.
...
* commit 'e1b6b6c5816b321864b6a5d72a46860fda8fa7cd':
Bring deleted files from the dead. These files were dropped by the translation pipelines because they do not contain any translated elements, but in reality they are needed.
2013-10-15 16:00:13 -07:00
John Spurlock
c5b6267dac
resolved conflicts for merge of e8962d4b to klp-dev-plus-aosp
...
Change-Id: I3b223b9a532f8a154d21d79828b2a95098ab2bd1
2013-10-15 18:59:45 -04:00
Baligh Uddin
e1b6b6c581
Bring deleted files from the dead.
...
These files were dropped by the translation
pipelines because they do not contain any
translated elements, but in reality they
are needed.
Bug: 11226380
2013-10-15 22:47:02 +00:00
Igor Murashkin
69b94f7c55
SmartCamera: Fix to build against latest camera2 api
...
Bug: 10818732
Change-Id: I536021b9663331532e2f4c21a4fc0f3de5da9aa9
2013-10-15 15:23:07 -07:00
Igor Murashkin
bd7f343c75
Camera2Tests: update SmartCamera for async api
...
Change-Id: I6eb541c96ee50756c35e7785fdae63e8e45e2726
2013-10-15 15:11:41 -07:00
Benjamin Hendricks
227b47625d
Camera2Tests: Add SmartCamera App
...
Bug: 10818732
Change-Id: I6ac08ecab3a1e04116be2f7764d0d5d4f29c5cd9
2013-10-15 15:11:34 -07:00
Jim Miller
d5bda74797
am 2cc95775: Merge "Fix possible crash in System UI" into klp-dev
...
* commit '2cc95775750ccd46f3192c05804c38dc04c5d2d6':
Fix possible crash in System UI
2013-10-15 14:47:49 -07:00
Jim Miller
2cc9577575
Merge "Fix possible crash in System UI" into klp-dev
2013-10-15 21:44:48 +00:00
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
Baligh Uddin
d99b9fd321
am 1fcf34d8: (-s ours) Import translations. DO NOT MERGE
...
* commit '1fcf34d8208e4d56a288335a008e069ad895d4b3':
Import translations. DO NOT MERGE
2013-10-15 14:37:49 -07:00
Baligh Uddin
1fcf34d820
Import translations. DO NOT MERGE
...
Change-Id: Idf3c804dad4f6a6acbfbf176b06ffacfe30345cf
Auto-generated-cl: translation import
2013-10-15 14:27:27 -07:00
Jeff Sharkey
adef88a0a9
Improve OPEN/CREATE_DOC docs.
...
Bug: 10936473
Change-Id: I4378aaaf927f114982191efd4f9887dad075390d
2013-10-15 13:54:47 -07:00
Jim Miller
faaa3654d1
Fix possible crash in System UI
...
Fixes bug 11215581
Change-Id: Ic76ad783729316539e8e57feb098d6e823b4ecdf
2013-10-15 13:46:51 -07:00
Michael Wright
b9fca99971
Force the wallpaper to reload when dimensions change
...
Currently it's possible for the home application to suggest new
wallpaper dimensions and the WallpaperService to request the bitmap
between when the new dimensions have been propagated and the old
bitmap has been forgotten. This leads to the WallpaperService
drawing a Bitmap with the old dimensions into a Surface with the new
dimensions.
By forcing the WallpaperManager to forget the old Bitmap immediately
before we reload it, we can ensure that we always have a Bitmap of
the correct size.
Bug: 10853302
Change-Id: I298ac5f3f8bcde54eeb1e45d21bf2ba3cbb618c9
2013-10-15 13:03:44 -07:00
Jeff Sharkey
6feb50b826
Improve external storage docs on Context.
...
Bug: 10461652
Change-Id: I42a3d887418e126f9dc2a9be8060a8eedd425f8e
2013-10-15 13:01:33 -07:00
John Spurlock
e8962d4b2f
am f847c3b0: Merge "Update resource name for renamed string." into klp-dev
...
* commit 'f847c3b014ab49fae6bbbc9dd7aac199b31467df':
Update resource name for renamed string.
2013-10-15 12:44:57 -07:00
John Spurlock
f847c3b014
Merge "Update resource name for renamed string." into klp-dev
2013-10-15 19:34:03 +00:00
Daniel Sandler
08ef4050ed
am de70a7c3: am 709827cd: Merge "Updated rssi assets for quick settings" into klp-dev
...
* commit 'de70a7c3346534855219c4219db8ce4ad9c89214':
Updated rssi assets for quick settings
2013-10-15 11:08:18 -07:00
Daniel Sandler
de70a7c334
am 709827cd: Merge "Updated rssi assets for quick settings" into klp-dev
...
* commit '709827cd69edfd4c293ae80aac4eba647e668873':
Updated rssi assets for quick settings
2013-10-15 11:05:13 -07:00
Daniel Sandler
709827cd69
Merge "Updated rssi assets for quick settings" into klp-dev
2013-10-15 18:02:28 +00:00
Daniel Sandler
987672da64
Updated rssi assets for quick settings
...
Bug: 10641374
Change-Id: I6b1bc9b0e86be331b71614b511026a67bc429031
2013-10-15 13:40:15 -04:00
Svetoslav Ganov
f3430e99d3
am 0ec8b528: am 5a736fcd: Merge "Adding a missing resource file." into klp-dev
...
* commit '0ec8b5282e8c47bbc2b2dcae626f2f5f5bda07c3':
Adding a missing resource file.
2013-10-15 10:22:37 -07:00
Svetoslav Ganov
0ec8b5282e
am 5a736fcd: Merge "Adding a missing resource file." into klp-dev
...
* commit '5a736fcd203f67c1d4d072fc4e96bb123d083800':
Adding a missing resource file.
2013-10-15 10:20:25 -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
Svetoslav Ganov
5a736fcd20
Merge "Adding a missing resource file." into klp-dev
2013-10-15 17:17:31 +00: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
John Spurlock
1ed453a26e
Update resource name for renamed string.
...
Fix translations for recently renamed string.
Also remove old name from symbols.xml. The resource is no
longer referenced in code, and will break builds without
translations.
Bug:11062108
Change-Id: I61977cb1ee5298947b3ee48b5fbd0354727253c0
2013-10-15 11:47:09 -04: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)
13e9158bc2
am 885a301b: am 4a534e00: Merge "Delete BrowserTestPlugin." into klp-dev
...
* commit '885a301b65cb33f2d6c65c4d9e7d43714ffd5db4':
Delete BrowserTestPlugin.
2013-10-15 05:06:44 -07:00
Jason Monk
cc4d2e0fa5
am b46eb904: am c09e5911: Merge "Fix error when PAC set rapidly" into klp-dev
...
* commit 'b46eb9042b25d9b35ae2e05aba7063c8ee4f006c':
Fix error when PAC set rapidly
2013-10-15 05:06:40 -07:00
Torne (Richard Coles)
885a301b65
am 4a534e00: Merge "Delete BrowserTestPlugin." into klp-dev
...
* commit '4a534e00d83e6b41862ea54ca4f6a84d3e105585':
Delete BrowserTestPlugin.
2013-10-15 05:03:37 -07:00
Jason Monk
b46eb9042b
am c09e5911: Merge "Fix error when PAC set rapidly" into klp-dev
...
* commit 'c09e59110272d2613763a54a57e7da7c9f87f369':
Fix error when PAC set rapidly
2013-10-15 05:03:30 -07:00
Torne (Richard Coles)
4a534e00d8
Merge "Delete BrowserTestPlugin." into klp-dev
2013-10-15 11:48:17 +00:00
Jason Monk
c09e591102
Merge "Fix error when PAC set rapidly" into klp-dev
2013-10-15 11:15:01 +00:00
