144264 Commits

Author SHA1 Message Date
Craig Mautner
d4da3853ad am 506d2d2a: am 39225289: Add empty ArrayList check.
* commit '506d2d2a32bff5813b7c1017145efa30673d6181':
  Add empty ArrayList check.
2014-07-22 18:17:23 +00:00
Behdad Esfahbod
d4c18540bb am 0abd9ade: am 3c8b2dfb: Add android.Paint that inherits SkPaint
* commit '0abd9ade5a488151c0fffd859f9f670d7f9f8552':
  Add android.Paint that inherits SkPaint
2014-07-22 18:17:18 +00:00
Craig Mautner
d426d9551f am 39225289: Add empty ArrayList check.
* commit '392252897674c303421b9b2051e20d6bd1767c46':
  Add empty ArrayList check.
2014-07-22 18:13:24 +00:00
Behdad Esfahbod
bbbcc2e9f3 am 3c8b2dfb: Add android.Paint that inherits SkPaint
* commit '3c8b2dfb331a492e8e2c8ccaec13e9f736da36ba':
  Add android.Paint that inherits SkPaint
2014-07-22 18:13:20 +00:00
Craig Mautner
f14e5a2fad Add empty ArrayList check.
Fixes bug 15768779.

Change-Id: I3e4c48aa0fff99025e9ba1725e3d1f3523749dbd
2014-07-22 18:09:45 +00:00
Behdad Esfahbod
6ba30b85dd Add android.Paint that inherits SkPaint
The idea is that extra paint parameters that only affect text layout
(not rendering) will go in android.Paint instead of going into
SkPaintOptionsAndroid.  We will eventually move those out of SkPaint
too.

This is currently implemented in PaintImpl.cpp.  Will be renamed when
current Paint.cpp that has JNI bits is moved to android_graphics_Paint.cpp.

Change-Id: Iba66c34dea5da503a13b9c864cb9f2211ac4ba7d
2014-07-22 14:01:09 -04:00
George Mount
61afeca09f am 8793b878: am 094d74f4: API Council: Change docs and constant names.
* commit '8793b878d247e63151293d54a02a2c82004887cd':
  API Council: Change docs and constant names.
2014-07-22 17:39:10 +00:00
Robert Ly
a3e56ab0f0 am cb325ced: am cb9db25c: am 47495df6: am fb8e254a: am 1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs
* commit 'cb325ceddf53b4b1bdc1ad1c7cc4b2bff818446e':
  docs: update links and add new wear design materials
2014-07-22 17:39:06 +00:00
Robert Ly
07c0885599 am d43ca68e: am 62c3cd92: am 817a31af: am c9cf4521: am 0b5f9c2f: docs: remove android translation plugin doc
* commit 'd43ca68eb121c919244b72cfbc53e3a67a0c6404':
  docs: remove android translation plugin doc
2014-07-22 17:39:02 +00:00
Yin-Chia Yeh
acf705c796 am 476e6a8e: am cca8d422: camera2: minor doc update
* commit '476e6a8eecc8d2991e115298135e731e7341dce0':
  camera2: minor doc update
2014-07-22 17:38:57 +00:00
George Mount
081023c101 am 094d74f4: API Council: Change docs and constant names.
* commit '094d74f4d6b8f94b94f6c3d18467531cbd52c3b1':
  API Council: Change docs and constant names.
2014-07-22 17:32:03 +00:00
Robert Ly
598bd9ca5c am cb9db25c: am 47495df6: am fb8e254a: am 1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs
* commit 'cb9db25c376d6809ae7fd2c8e0fd515607864770':
  docs: update links and add new wear design materials
2014-07-22 17:31:59 +00:00
Robert Ly
a281cf2076 am 62c3cd92: am 817a31af: am c9cf4521: am 0b5f9c2f: docs: remove android translation plugin doc
* commit '62c3cd92946c166b4d446d0caa67e3e29a5b17dc':
  docs: remove android translation plugin doc
2014-07-22 17:31:55 +00:00
Yin-Chia Yeh
2239fe0fbf am cca8d422: camera2: minor doc update
* commit 'cca8d422ecd16a1c4e29e7cc71624ccc845c839a':
  camera2: minor doc update
2014-07-22 17:31:51 +00:00
destradaa
68ea3933f0 am ca5ddb3f: am 75c07aec: Merge "Add uncertainty for GPS received TOW field. b/16463499" into lmp-dev
* commit 'ca5ddb3f93039552fa98c56bc8c09071ab0a921e':
  Add uncertainty for GPS received TOW field. b/16463499
2014-07-22 17:30:50 +00:00
Baligh Uddin
9c1d1ffaf3 am aa810a56: (-s ours) am 05e56aec: (-s ours) am d74d7397: (-s ours) am 43f783fd: (-s ours) Import translations. DO NOT MERGE
* commit 'aa810a567272968401c466659beac84239c82f1c':
  Import translations. DO NOT MERGE
2014-07-22 17:30:46 +00:00
George Mount
ad88e1b1b2 API Council: Change docs and constant names.
Bug 16401545

Changed doc for ChangeImageTransform.
Changed IN/OUT to MODE_IN/MODE_OUT.
Changed mode to flag attribute.
Change-Id: Ia2ae9930f9725871c9b1d80b758a3a0808a8f0c6
2014-07-22 17:29:14 +00:00
destradaa
e875ba1524 am 75c07aec: Merge "Add uncertainty for GPS received TOW field. b/16463499" into lmp-dev
* commit '75c07aec81fc9aa3c290918578674be29a15ae26':
  Add uncertainty for GPS received TOW field. b/16463499
2014-07-22 17:27:19 +00:00
Baligh Uddin
7dc806e80e am 05e56aec: (-s ours) am d74d7397: (-s ours) am 43f783fd: (-s ours) Import translations. DO NOT MERGE
* commit '05e56aec2cae6a70e3c70c193613c956552ab238':
  Import translations. DO NOT MERGE
2014-07-22 17:27:15 +00:00
Robert Ly
cf068e7799 am 47495df6: am fb8e254a: am 1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs
* commit '47495df6a6797704919af3ea4a695cf7b2c53f00':
  docs: update links and add new wear design materials
2014-07-22 17:27:08 +00:00
Robert Ly
451a640c10 am 817a31af: am c9cf4521: am 0b5f9c2f: docs: remove android translation plugin doc
* commit '817a31afa3195b707526bb6d14339720d943549e':
  docs: remove android translation plugin doc
2014-07-22 17:27:00 +00:00
Yin-Chia Yeh
f8f37002c0 camera2: minor doc update
Doc update reflecting the minor spec change.

Change-Id: I7a1cf766fe6bee4dd08fd19f03778ce8a6ce2dde
2014-07-22 17:26:30 +00:00
Geoff Mendal
9115e535a6 am 9d1dd586: am 6e8aa46d: Merge commit \'e959e4a0\' into lmp-dev
* commit '9d1dd586ef1b992eaf6f4c6ec8cd210bcdf6c4f6':
  Revert "Wait for all windows to draw before turning screen on"
2014-07-22 17:26:03 +00:00
Geoff Mendal
49ea9c56da am 6e8aa46d: Merge commit \'e959e4a0\' into lmp-dev
* commit '6e8aa46d6a14d805b61f7edb072f85e416868031':
  Revert "Wait for all windows to draw before turning screen on"
2014-07-22 17:19:07 +00:00
Robert Ly
47495df6a6 am fb8e254a: am 1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs
* commit 'fb8e254a1a66fc707a1c52d4cced699339f15685':
  docs: update links and add new wear design materials
2014-07-22 17:18:52 +00:00
Robert Ly
817a31afa3 am c9cf4521: am 0b5f9c2f: docs: remove android translation plugin doc
* commit 'c9cf452179ed6c413712607fd60ba2eaa910d95b':
  docs: remove android translation plugin doc
2014-07-22 17:18:47 +00:00
Baligh Uddin
9f184b28d2 am d74d7397: (-s ours) am 43f783fd: (-s ours) Import translations. DO NOT MERGE
* commit 'd74d7397ef9fa085ae8a25a6c89eb9caccb43d40':
  Import translations. DO NOT MERGE
2014-07-22 17:18:28 +00:00
Sandeep Siddhartha
6efdcebaa3 am 9f0b328e: am 8672899c: Merge "AlwaysOnHotwordDetector needs to reflect enrollment changes" into lmp-dev
* commit '9f0b328e04f62c584cd34c33e0b922628933a5de':
  AlwaysOnHotwordDetector needs to reflect enrollment changes
2014-07-22 17:17:46 +00:00
Geoff Mendal
af13b025e9 Merge commit 'e959e4a0' into lmp-dev
Conflicts:
	services/core/java/com/android/server/wm/WindowManagerService.java
2014-07-22 10:14:35 -07:00
Robert Ly
fb8e254a1a am 1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs
* commit '1c723ea84ee4299fa07687cb2881e3695bd14d3c':
  docs: update links and add new wear design materials
2014-07-22 17:12:14 +00:00
Robert Ly
c9cf452179 am 0b5f9c2f: docs: remove android translation plugin doc
* commit '0b5f9c2f6890ed8aa16d1cb630aa415bf7c908c0':
  docs: remove android translation plugin doc
2014-07-22 17:12:10 +00:00
Sandeep Siddhartha
2792c15697 am 8672899c: Merge "AlwaysOnHotwordDetector needs to reflect enrollment changes" into lmp-dev
* commit '8672899cdf1b0b68c7b3a9bc4183c1414f2d4f7e':
  AlwaysOnHotwordDetector needs to reflect enrollment changes
2014-07-22 17:10:06 +00:00
Robert Ly
0b5f9c2f68 docs: remove android translation plugin doc
Change-Id: Ia21049e3250e98a419f5249693b218c1d5e58fd1
2014-07-22 17:07:12 +00:00
Baligh Uddin
621c2b726f am e3e31dfb: (-s ours) am 02acba44: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'e3e31dfbaf77530bfa544be974df64c7e4d486e4':
  Import translations. DO NOT MERGE
2014-07-22 17:00:51 +00:00
Baligh Uddin
fefe57cbad am 18129ca9: (-s ours) am f0b64309: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '18129ca9bcc29b8804d53727fac4fe7a12934980':
  Import translations. DO NOT MERGE
2014-07-22 17:00:46 +00:00
Baligh Uddin
e3f98929b9 am 2e795805: (-s ours) am 5a5d14ae: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '2e795805b62aae89fea4bb7db109bee1949d7ca8':
  Import translations. DO NOT MERGE
2014-07-22 17:00:43 +00:00
Baligh Uddin
63cd86dd44 am b357556d: (-s ours) am 9875afbf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'b357556d477de0e39cdc18380e067e554a8a997b':
  Import translations. DO NOT MERGE
2014-07-22 17:00:39 +00:00
John Spurlock
f1e77e1d4d am f0f5e78b: am e017f0d5: QS: Hide Location, Cast tiles when showing secure keyguard.
* commit 'f0f5e78bc274363db3a859846f4d7c693233e8de':
  QS: Hide Location, Cast tiles when showing secure keyguard.
2014-07-22 17:00:34 +00:00
Baligh Uddin
124adab1fb am 02acba44: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '02acba440250d90519d06a2892d6dd83326c1ead':
  Import translations. DO NOT MERGE
2014-07-22 16:50:16 +00:00
Baligh Uddin
26cd4364f7 am f0b64309: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'f0b643094854060c020750f993cc129f41f48727':
  Import translations. DO NOT MERGE
2014-07-22 16:50:12 +00:00
Baligh Uddin
ecd77cc465 am 5a5d14ae: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '5a5d14ae082191669afc848769f45fd3f34e67f1':
  Import translations. DO NOT MERGE
2014-07-22 16:50:08 +00:00
Baligh Uddin
1b241fceba am 9875afbf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '9875afbf80c85f5c9521d1fd84854c4f0756b16e':
  Import translations. DO NOT MERGE
2014-07-22 16:50:00 +00:00
John Spurlock
bc78aeed7c am e017f0d5: QS: Hide Location, Cast tiles when showing secure keyguard.
* commit 'e017f0d50c1a6a6b60b02764d2a978c1d02e4b88':
  QS: Hide Location, Cast tiles when showing secure keyguard.
2014-07-22 16:49:56 +00:00
Baligh Uddin
d74d7397ef am 43f783fd: (-s ours) Import translations. DO NOT MERGE
* commit '43f783fd7efd3b3d985a58bc3aa3e6136f976a14':
  Import translations. DO NOT MERGE
2014-07-22 16:48:12 +00:00
Baligh Uddin
43f783fd7e Import translations. DO NOT MERGE
Change-Id: Ief6127337c9c4fdbbf15a6214a463822dc39b92c
Auto-generated-cl: translation import
2014-07-22 16:39:39 +00:00
Justin Koh
e959e4a017 am a63272b4: Merge "Revert "Wait for all windows to draw before turning screen on"" into klp-modular-dev
* commit 'a63272b4b5eff16f4d6fae4730b8a7087563181c':
  Revert "Wait for all windows to draw before turning screen on"
2014-07-22 16:31:06 +00:00
John Spurlock
657c62c31e QS: Hide Location, Cast tiles when showing secure keyguard.
Bug:15725186
Bug:15725223
Change-Id: I7c23d8c764f5712ee31d248f4d8fc6d35d0add97
2014-07-22 12:24:37 -04:00
Robert Ly
1c723ea84e Merge "docs: update links and add new wear design materials" into klp-modular-docs 2014-07-22 16:21:19 +00:00
Robert Ly
faaf23b9ac docs: update links and add new wear design materials
Change-Id: Idca24bcb64167b29c235380d0778d62cb1be6477
2014-07-22 10:06:31 -07:00
destradaa
c79dd82e55 Merge "Add uncertainty for GPS received TOW field. b/16463499" into lmp-dev 2014-07-22 16:13:36 +00:00