Chris Craik
774c7b9708
am 8040d6fc: (-s ours) am bfb349e2: Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()"
...
* commit '8040d6fccbcba760c503ab954b79a5a87b49d7b3':
[Bitmap] Add null pointer protection in Bitmap_sameAs()
2014-07-22 19:26:40 +00:00
Andrew Solovay
980957db36
am 925ad384: am 0ff1ecd1: (-s ours) am 3968ae0f: am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs
...
* commit '925ad384007b488205c690c7ca89713c800f3ff1':
DO NOT MERGE
2014-07-22 19:20:25 +00:00
Eric Laurent
8f7be7db03
am 842b6b83: am ae61b950: AudioService: wait for init completed to handle media server restart
...
* commit '842b6b83f10fdab75d4685ac38578ce4627845ca':
AudioService: wait for init completed to handle media server restart
2014-07-22 19:17:12 +00:00
Andrew Solovay
2471498511
am 0ff1ecd1: (-s ours) am 3968ae0f: am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs
...
* commit '0ff1ecd1ece73db8d758f227db9d965ef9598f3b':
DO NOT MERGE
2014-07-22 19:15:58 +00:00
Chris Craik
2923df5382
am 48242d80: am 50a2d633: Merge "[HWUI] Fix invisible views are still shown in popup window"
...
* commit '48242d801c8719f458a615b14b31760ae590006e':
[HWUI] Fix invisible views are still shown in popup window
2014-07-22 19:15:43 +00:00
Chris Craik
8040d6fccb
am bfb349e2: Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()"
...
* commit 'bfb349e2421d5b74701818f6aa486f057b2e5884':
[Bitmap] Add null pointer protection in Bitmap_sameAs()
2014-07-22 19:15:15 +00:00
Eric Laurent
166e3b5097
am ae61b950: AudioService: wait for init completed to handle media server restart
...
* commit 'ae61b950d29a1e2c3237b64513b4b0e6fad77b9b':
AudioService: wait for init completed to handle media server restart
2014-07-22 19:12:49 +00:00
Chris Craik
48242d801c
am 50a2d633: Merge "[HWUI] Fix invisible views are still shown in popup window"
...
* commit '50a2d6339c7a6ee121c4aa52afc4cc027913f3fc':
[HWUI] Fix invisible views are still shown in popup window
2014-07-22 19:11:18 +00:00
Andrew Solovay
0ff1ecd1ec
am 3968ae0f: am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs
...
* commit '3968ae0f70b01592c40c3e0cd31ca5ead953faa0':
DO NOT MERGE
2014-07-22 19:08:45 +00:00
Andrew Solovay
3968ae0f70
am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs
...
* commit 'eb69126c613dfd476fa516df6ae1c2d78e445f0b':
DO NOT MERGE
2014-07-22 19:02:58 +00:00
Andrew Solovay
c96a1f3a6b
am aaf871af: am 9bab0bb0: am 3a14c289: am a2beba70: am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs
...
* commit 'aaf871af2c3a8ab2133d989079776e5e09e2823e':
docs: Removed reference to a sample notepad app.
2014-07-22 19:02:19 +00:00
Sreeram Ramachandran
e0d713afdc
am bae0d23d: am 4463fd65: Merge "Fix WiFi-Direct." into lmp-dev
...
* commit 'bae0d23df8e1461168e229e170247433a3a3ab38':
Fix WiFi-Direct.
2014-07-22 18:57:59 +00:00
Andrew Solovay
14ea1133ac
am 9bab0bb0: am 3a14c289: am a2beba70: am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs
...
* commit '9bab0bb067fdf1c2c899b05e0e0e6411153685fc':
docs: Removed reference to a sample notepad app.
2014-07-22 18:57:32 +00:00
Eric Laurent
eb4b8a27e3
AudioService: wait for init completed to handle media server restart
...
Bug: 16458506.
Change-Id: I25804e6e7209d52fd5dd6c622cae85d1e7d2317f
2014-07-22 11:55:42 -07:00
Andrew Solovay
c3032874dc
am 3a14c289: am a2beba70: am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs
...
* commit '3a14c2890e9821a36399b042261d75ee4dfdf71f':
docs: Removed reference to a sample notepad app.
2014-07-22 18:53:11 +00:00
Sreeram Ramachandran
b12ae58e91
am 4463fd65: Merge "Fix WiFi-Direct." into lmp-dev
...
* commit '4463fd6540f152fe2548a67eb5a34489c11b3f31':
Fix WiFi-Direct.
2014-07-22 18:49:42 +00:00
Andrew Solovay
3a14c2890e
am a2beba70: am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs
...
* commit 'a2beba70b947a948c2a12513c8bdda4d403c2fd6':
docs: Removed reference to a sample notepad app.
2014-07-22 18:47:26 +00:00
Andrew Solovay
a2beba70b9
am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs
...
* commit '170556f82bd009cf5a74a53d7ba61221d74d36e9':
docs: Removed reference to a sample notepad app.
2014-07-22 18:41:21 +00:00
Youngsang Cho
d0b0cbaf1a
am e9098289: am 6e65fe21: Merge "Minor comment change of TvContract.Programs.COLUMN_TITLE" into lmp-dev
...
* commit 'e909828949473bf22a5c869987651223a55db362':
Minor comment change of TvContract.Programs.COLUMN_TITLE
2014-07-22 18:39:30 +00:00
Youngsang Cho
3b1756f958
am 6e65fe21: Merge "Minor comment change of TvContract.Programs.COLUMN_TITLE" into lmp-dev
...
* commit '6e65fe21827d51ec393b9d1be3f2440379cb215f':
Minor comment change of TvContract.Programs.COLUMN_TITLE
2014-07-22 18:34:11 +00:00
Craig Mautner
91bf127892
am 581feb87: am 90ac517c: Create API for launching from recents
...
* commit '581feb87f8a0bcfd14b2b28fd9f06f4e162f10b6':
Create API for launching from recents
2014-07-22 18:22:10 +00:00
Craig Mautner
92d0636a0d
am 90ac517c: Create API for launching from recents
...
* commit '90ac517c8636ce8cbb0afe2fc03836b23206f72a':
Create API for launching from recents
2014-07-22 18:17:47 +00:00
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
dc00cbe2c1
Create API for launching from recents
...
Relaunch apps from recents using the same uid and package as was used
in the original launch.
Fixes bug 16358208.
Change-Id: I340800bfee79926b197929360d69f1d570bbf1eb
2014-07-22 18:13:34 +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