git.osdn.net Git - android-x86/frameworks-base.git/log

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Robert Ly [Tue, 22 Jul 2014 21:47:17 +0000 (21:47 +0000)]

am b5bf50b8: am 1c08a2ba: am c12d7e3a: am ff428e08: am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs

* commit 'b5bf50b8995415ce1f205d76dc87aae05b65ba5a':
Doc change: add reminder for developers on using ad id.

commit | commitdiff | tree

David Friedman [Tue, 22 Jul 2014 21:47:13 +0000 (21:47 +0000)]

am 83fc010d: am 0514aba5: am 42dbe809: am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs

* commit '83fc010d0ab693fb1d06f89980ae629894a44ade':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.

commit | commitdiff | tree

Chris Craik [Tue, 22 Jul 2014 21:47:09 +0000 (21:47 +0000)]

am c9d4ee79: am 52b2ae22: Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()" into lmp-dev

* commit 'c9d4ee79e73f000987a05d9d27d5eb024e5ba525':
[Bitmap] Add null pointer protection in Bitmap_sameAs()

commit | commitdiff | tree

Alexandra Gherghina [Tue, 22 Jul 2014 21:47:05 +0000 (21:47 +0000)]

am 6ec756fd: am 5f9a77e5: Do Not Merge Per-user API for master sync

* commit '6ec756fd1503ea88bd1ca031eeef733e2a44bfac':
Do Not Merge Per-user API for master sync

commit | commitdiff | tree

Scott Rowe [Tue, 22 Jul 2014 21:47:01 +0000 (21:47 +0000)]

am 487dd79a: am d6900ec2: am 6b2f3ee3: am 2a922cb4: am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs

* commit '487dd79ab28525a3a3c685dd39f09ab0539757a1':
cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12

commit | commitdiff | tree

Igor Murashkin [Tue, 22 Jul 2014 21:46:55 +0000 (21:46 +0000)]

am f555fe55: am 8f9b6d08: Merge "camera2: Add legacy available Request/Result/Characteristics keys" into lmp-dev

* commit 'f555fe554c28bc8f4e094dce502f343d70be4f3e':
camera2: Add legacy available Request/Result/Characteristics keys

commit | commitdiff | tree

Alan Viverette [Tue, 22 Jul 2014 21:46:49 +0000 (21:46 +0000)]

am 11dbd68d: am 290f45f5: Merge "Add popupTheme attr, propagate from ActionBar to ToolBar" into lmp-dev

* commit '11dbd68d68aba1c7f42304544f88fbffe496bb02':
Add popupTheme attr, propagate from ActionBar to ToolBar

commit | commitdiff | tree

Alex Klyubin [Tue, 22 Jul 2014 21:46:43 +0000 (21:46 +0000)]

am 0caaa29e: am 09a76692: Align PSKKeyManager with framework API style.

* commit '0caaa29e5bf388c929e81ed417637f4fe4df52f8':
Align PSKKeyManager with framework API style.

commit | commitdiff | tree

Robert Ly [Tue, 22 Jul 2014 21:39:33 +0000 (21:39 +0000)]

am 1c08a2ba: am c12d7e3a: am ff428e08: am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs

* commit '1c08a2ba917f732c8f4a18862b331f43d64f1505':
Doc change: add reminder for developers on using ad id.

commit | commitdiff | tree

David Friedman [Tue, 22 Jul 2014 21:39:29 +0000 (21:39 +0000)]

am 0514aba5: am 42dbe809: am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs

* commit '0514aba57216b2388f85822b7a39731cd9a9ee7e':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.

commit | commitdiff | tree

Chris Craik [Tue, 22 Jul 2014 21:39:26 +0000 (21:39 +0000)]

am 52b2ae22: Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()" into lmp-dev

* commit '52b2ae22c6e1ede01027c83cad33507cbfceabd9':
[Bitmap] Add null pointer protection in Bitmap_sameAs()

commit | commitdiff | tree

Alexandra Gherghina [Tue, 22 Jul 2014 21:39:14 +0000 (21:39 +0000)]

am 5f9a77e5: Do Not Merge Per-user API for master sync

* commit '5f9a77e5337c16335abaa586beab900c25014668':
Do Not Merge Per-user API for master sync

commit | commitdiff | tree

Scott Rowe [Tue, 22 Jul 2014 21:39:09 +0000 (21:39 +0000)]

am d6900ec2: am 6b2f3ee3: am 2a922cb4: am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs

* commit 'd6900ec2a6603433e50657a7843966c7d10651ea':
cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12

commit | commitdiff | tree

Igor Murashkin [Tue, 22 Jul 2014 21:39:05 +0000 (21:39 +0000)]

am 8f9b6d08: Merge "camera2: Add legacy available Request/Result/Characteristics keys" into lmp-dev

* commit '8f9b6d08fe8b8fc7d8ad88bb68989ebb13dd7aae':
camera2: Add legacy available Request/Result/Characteristics keys

commit | commitdiff | tree

Alan Viverette [Tue, 22 Jul 2014 21:38:58 +0000 (21:38 +0000)]

am 290f45f5: Merge "Add popupTheme attr, propagate from ActionBar to ToolBar" into lmp-dev

* commit '290f45f5affaedcc1ad07b531f700e9695e48b3f':
Add popupTheme attr, propagate from ActionBar to ToolBar

commit | commitdiff | tree

Alex Klyubin [Tue, 22 Jul 2014 21:38:54 +0000 (21:38 +0000)]

am 09a76692: Align PSKKeyManager with framework API style.

* commit '09a766924c6b1066d63348d2b9dcb3dcdc561a94':
Align PSKKeyManager with framework API style.

commit | commitdiff | tree

Robert Ly [Tue, 22 Jul 2014 21:00:07 +0000 (21:00 +0000)]

am c12d7e3a: am ff428e08: am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs

* commit 'c12d7e3a3dc7b3f8df06f59d7fbeb2da84a1a493':
Doc change: add reminder for developers on using ad id.

commit | commitdiff | tree

David Friedman [Tue, 22 Jul 2014 20:55:55 +0000 (20:55 +0000)]

am 42dbe809: am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs

* commit '42dbe80914b67841c2a8fe93fef8b80e58155684':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.

commit | commitdiff | tree

Robert Ly [Tue, 22 Jul 2014 20:53:20 +0000 (20:53 +0000)]

am ff428e08: am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs

* commit 'ff428e08a5350153c5f9476551930b0eefdfcd06':
Doc change: add reminder for developers on using ad id.

commit | commitdiff | tree

David Friedman [Tue, 22 Jul 2014 20:49:09 +0000 (20:49 +0000)]

am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs

* commit 'af001f9410bf0a45282b2f0ab7c4c3bf77645697':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.

commit | commitdiff | tree

Robert Ly [Tue, 22 Jul 2014 20:49:05 +0000 (20:49 +0000)]

am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs

* commit 'c57c08298364e93ca4399d184bdba2657f72b11c':
Doc change: add reminder for developers on using ad id.

commit | commitdiff | tree

David Friedman [Tue, 22 Jul 2014 20:45:11 +0000 (20:45 +0000)]

am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs

* commit '170b09535d21c7c50051e391b8f7a61678872c2b':
Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.

commit | commitdiff | tree

Alexandra Gherghina [Tue, 15 Jul 2014 22:11:48 +0000 (23:11 +0100)]

Do Not Merge Per-user API for master sync

Change-Id: I6a8088eb3bfddae4c8e38904dd26baf3c7c09c9e
(cherry picked from commit 222aea8bd997807784dc99ca53f63280d384fdf0)

commit | commitdiff | tree

Scott Rowe [Tue, 22 Jul 2014 20:12:08 +0000 (20:12 +0000)]

am 6b2f3ee3: am 2a922cb4: am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs

* commit '6b2f3ee3b9954b4b834d6729265acd33ef232b9c':
cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12

commit | commitdiff | tree

Scott Rowe [Tue, 22 Jul 2014 20:08:02 +0000 (20:08 +0000)]

am 2a922cb4: am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs

* commit '2a922cb45a0cb33ef575e39ac8ca4dc8500e03ba':
cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12

commit | commitdiff | tree

Scott Rowe [Tue, 22 Jul 2014 20:03:19 +0000 (20:03 +0000)]

am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs

* commit '40b5d8a0e5aad92c07420541fd186f9f96495845':
cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12

commit | commitdiff | tree

Alex Klyubin [Mon, 21 Jul 2014 17:09:58 +0000 (10:09 -0700)]

Align PSKKeyManager with framework API style.

This CL adjusts android.net.PSKKeyManager as follows:
* Renamed to PskKeyManager to follow naming conventions.
* Changed from interface to abstract class with default
implementations for all methods.

Bug: 16403305
Bug: 15073623
Change-Id: Iefce26b394d4a753412315dad554b5342f3f0b44

commit | commitdiff | tree

Jason Monk [Tue, 22 Jul 2014 19:43:37 +0000 (19:43 +0000)]

am 4a6da95d: am d8288538: Merge "Implement hotspot tile" into lmp-dev

* commit '4a6da95d7b966d77820c56a3c1bd814add177754':
Implement hotspot tile

commit | commitdiff | tree

Jason Monk [Tue, 22 Jul 2014 19:40:00 +0000 (19:40 +0000)]

am d8288538: Merge "Implement hotspot tile" into lmp-dev

* commit 'd82885384d4de3aed8cebc694c702f1e21d33c0a':
Implement hotspot tile

commit | commitdiff | tree

Andrew Solovay [Tue, 22 Jul 2014 19:31:12 +0000 (19:31 +0000)]

am c15901e3: am 925ad384: am 0ff1ecd1: (-s ours) am 3968ae0f: am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs

* commit 'c15901e3d8b08e75e64ffa5f479b5d934ad92a9b':
DO NOT MERGE

commit | commitdiff | tree

Chris Craik [Tue, 22 Jul 2014 19:26:40 +0000 (19:26 +0000)]

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()

commit | commitdiff | tree

Andrew Solovay [Tue, 22 Jul 2014 19:20:25 +0000 (19:20 +0000)]

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

commit | commitdiff | tree

Eric Laurent [Tue, 22 Jul 2014 19:17:12 +0000 (19:17 +0000)]

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

commit | commitdiff | tree

Andrew Solovay [Tue, 22 Jul 2014 19:15:58 +0000 (19:15 +0000)]

am 0ff1ecd1: (-s ours) am 3968ae0f: am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs

* commit '0ff1ecd1ece73db8d758f227db9d965ef9598f3b':
DO NOT MERGE

commit | commitdiff | tree

Chris Craik [Tue, 22 Jul 2014 19:15:43 +0000 (19:15 +0000)]

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

commit | commitdiff | tree

Chris Craik [Tue, 22 Jul 2014 19:15:15 +0000 (19:15 +0000)]

am bfb349e2: Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()"

* commit 'bfb349e2421d5b74701818f6aa486f057b2e5884':
[Bitmap] Add null pointer protection in Bitmap_sameAs()

commit | commitdiff | tree

Eric Laurent [Tue, 22 Jul 2014 19:12:49 +0000 (19:12 +0000)]

am ae61b950: AudioService: wait for init completed to handle media server restart

* commit 'ae61b950d29a1e2c3237b64513b4b0e6fad77b9b':
AudioService: wait for init completed to handle media server restart

commit | commitdiff | tree

Chris Craik [Tue, 22 Jul 2014 19:11:18 +0000 (19:11 +0000)]

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

commit | commitdiff | tree

Andrew Solovay [Tue, 22 Jul 2014 19:08:45 +0000 (19:08 +0000)]

am 3968ae0f: am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs

* commit '3968ae0f70b01592c40c3e0cd31ca5ead953faa0':
DO NOT MERGE

commit | commitdiff | tree

Andrew Solovay [Tue, 22 Jul 2014 19:02:58 +0000 (19:02 +0000)]

am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs

* commit 'eb69126c613dfd476fa516df6ae1c2d78e445f0b':
DO NOT MERGE

commit | commitdiff | tree

Andrew Solovay [Tue, 22 Jul 2014 19:02:19 +0000 (19:02 +0000)]

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.

commit | commitdiff | tree

Sreeram Ramachandran [Tue, 22 Jul 2014 18:57:59 +0000 (18:57 +0000)]

am bae0d23d: am 4463fd65: Merge "Fix WiFi-Direct." into lmp-dev

* commit 'bae0d23df8e1461168e229e170247433a3a3ab38':
Fix WiFi-Direct.

commit | commitdiff | tree

Andrew Solovay [Tue, 22 Jul 2014 18:57:32 +0000 (18:57 +0000)]

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.

commit | commitdiff | tree

Eric Laurent [Mon, 21 Jul 2014 20:10:07 +0000 (13:10 -0700)]

AudioService: wait for init completed to handle media server restart

Bug: 16458506.
Change-Id: I25804e6e7209d52fd5dd6c622cae85d1e7d2317f

commit | commitdiff | tree

Andrew Solovay [Tue, 22 Jul 2014 18:53:11 +0000 (18:53 +0000)]

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.

commit | commitdiff | tree

Sreeram Ramachandran [Tue, 22 Jul 2014 18:49:42 +0000 (18:49 +0000)]

am 4463fd65: Merge "Fix WiFi-Direct." into lmp-dev

* commit '4463fd6540f152fe2548a67eb5a34489c11b3f31':
Fix WiFi-Direct.

commit | commitdiff | tree

Andrew Solovay [Tue, 22 Jul 2014 18:47:26 +0000 (18:47 +0000)]

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.

commit | commitdiff | tree

Andrew Solovay [Tue, 22 Jul 2014 18:41:21 +0000 (18:41 +0000)]

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.

commit | commitdiff | tree

Youngsang Cho [Tue, 22 Jul 2014 18:39:30 +0000 (18:39 +0000)]

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

commit | commitdiff | tree

Youngsang Cho [Tue, 22 Jul 2014 18:34:11 +0000 (18:34 +0000)]

am 6e65fe21: Merge "Minor comment change of TvContract.Programs.COLUMN_TITLE" into lmp-dev

* commit '6e65fe21827d51ec393b9d1be3f2440379cb215f':
Minor comment change of TvContract.Programs.COLUMN_TITLE

commit | commitdiff | tree

Craig Mautner [Tue, 22 Jul 2014 18:22:10 +0000 (18:22 +0000)]

am 581feb87: am 90ac517c: Create API for launching from recents

* commit '581feb87f8a0bcfd14b2b28fd9f06f4e162f10b6':
Create API for launching from recents

commit | commitdiff | tree

Craig Mautner [Tue, 22 Jul 2014 18:17:47 +0000 (18:17 +0000)]

am 90ac517c: Create API for launching from recents

* commit '90ac517c8636ce8cbb0afe2fc03836b23206f72a':
Create API for launching from recents

commit | commitdiff | tree

Craig Mautner [Tue, 22 Jul 2014 18:17:23 +0000 (18:17 +0000)]

am 506d2d2a: am 39225289: Add empty ArrayList check.

* commit '506d2d2a32bff5813b7c1017145efa30673d6181':
Add empty ArrayList check.

commit | commitdiff | tree

Behdad Esfahbod [Tue, 22 Jul 2014 18:17:18 +0000 (18:17 +0000)]

am 0abd9ade: am 3c8b2dfb: Add android.Paint that inherits SkPaint

* commit '0abd9ade5a488151c0fffd859f9f670d7f9f8552':
Add android.Paint that inherits SkPaint

commit | commitdiff | tree

Craig Mautner [Mon, 21 Jul 2014 00:48:47 +0000 (17:48 -0700)]

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

commit | commitdiff | tree

Craig Mautner [Tue, 22 Jul 2014 18:13:24 +0000 (18:13 +0000)]

am 39225289: Add empty ArrayList check.

* commit '392252897674c303421b9b2051e20d6bd1767c46':
Add empty ArrayList check.

commit | commitdiff | tree

Behdad Esfahbod [Tue, 22 Jul 2014 18:13:20 +0000 (18:13 +0000)]

am 3c8b2dfb: Add android.Paint that inherits SkPaint

* commit '3c8b2dfb331a492e8e2c8ccaec13e9f736da36ba':
Add android.Paint that inherits SkPaint

commit | commitdiff | tree

Craig Mautner [Tue, 22 Jul 2014 18:08:53 +0000 (11:08 -0700)]

Add empty ArrayList check.

Fixes bug 15768779.

Change-Id: I3e4c48aa0fff99025e9ba1725e3d1f3523749dbd

commit | commitdiff | tree

Behdad Esfahbod [Tue, 15 Jul 2014 20:22:32 +0000 (16:22 -0400)]

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

commit | commitdiff | tree

George Mount [Tue, 22 Jul 2014 17:39:10 +0000 (17:39 +0000)]

am 8793b878: am 094d74f4: API Council: Change docs and constant names.

* commit '8793b878d247e63151293d54a02a2c82004887cd':
API Council: Change docs and constant names.

commit | commitdiff | tree

Robert Ly [Tue, 22 Jul 2014 17:39:06 +0000 (17:39 +0000)]

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

commit | commitdiff | tree

Robert Ly [Tue, 22 Jul 2014 17:39:02 +0000 (17:39 +0000)]

am d43ca68e: am 62c3cd92: am 817a31af: am c9cf4521: am 0b5f9c2f: docs: remove android translation plugin doc

* commit 'd43ca68eb121c919244b72cfbc53e3a67a0c6404':
docs: remove android translation plugin doc

commit | commitdiff | tree

Yin-Chia Yeh [Tue, 22 Jul 2014 17:38:57 +0000 (17:38 +0000)]

am 476e6a8e: am cca8d422: camera2: minor doc update

* commit '476e6a8eecc8d2991e115298135e731e7341dce0':
camera2: minor doc update

commit | commitdiff | tree

George Mount [Tue, 22 Jul 2014 17:32:03 +0000 (17:32 +0000)]

am 094d74f4: API Council: Change docs and constant names.

* commit '094d74f4d6b8f94b94f6c3d18467531cbd52c3b1':
API Council: Change docs and constant names.

commit | commitdiff | tree

Robert Ly [Tue, 22 Jul 2014 17:31:59 +0000 (17:31 +0000)]

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

commit | commitdiff | tree

Robert Ly [Tue, 22 Jul 2014 17:31:55 +0000 (17:31 +0000)]

am 62c3cd92: am 817a31af: am c9cf4521: am 0b5f9c2f: docs: remove android translation plugin doc

* commit '62c3cd92946c166b4d446d0caa67e3e29a5b17dc':
docs: remove android translation plugin doc

commit | commitdiff | tree

Yin-Chia Yeh [Tue, 22 Jul 2014 17:31:51 +0000 (17:31 +0000)]

am cca8d422: camera2: minor doc update

* commit 'cca8d422ecd16a1c4e29e7cc71624ccc845c839a':
camera2: minor doc update

commit | commitdiff | tree

destradaa [Tue, 22 Jul 2014 17:30:50 +0000 (17:30 +0000)]

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

commit | commitdiff | tree

Baligh Uddin [Tue, 22 Jul 2014 17:30:46 +0000 (17:30 +0000)]

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

commit | commitdiff | tree

George Mount [Fri, 18 Jul 2014 22:41:13 +0000 (15:41 -0700)]

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

commit | commitdiff | tree

destradaa [Tue, 22 Jul 2014 17:27:19 +0000 (17:27 +0000)]

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

commit | commitdiff | tree

Baligh Uddin [Tue, 22 Jul 2014 17:27:15 +0000 (17:27 +0000)]

am 05e56aec: (-s ours) am d74d7397: (-s ours) am 43f783fd: (-s ours) Import translations. DO NOT MERGE

* commit '05e56aec2cae6a70e3c70c193613c956552ab238':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Robert Ly [Tue, 22 Jul 2014 17:27:08 +0000 (17:27 +0000)]

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

commit | commitdiff | tree

Robert Ly [Tue, 22 Jul 2014 17:27:00 +0000 (17:27 +0000)]

am 817a31af: am c9cf4521: am 0b5f9c2f: docs: remove android translation plugin doc

* commit '817a31afa3195b707526bb6d14339720d943549e':
docs: remove android translation plugin doc

commit | commitdiff | tree

Yin-Chia Yeh [Tue, 22 Jul 2014 17:23:18 +0000 (10:23 -0700)]

camera2: minor doc update

Doc update reflecting the minor spec change.

Change-Id: I7a1cf766fe6bee4dd08fd19f03778ce8a6ce2dde

commit | commitdiff | tree

Geoff Mendal [Tue, 22 Jul 2014 17:26:03 +0000 (17:26 +0000)]

am 9d1dd586: am 6e8aa46d: Merge commit \'e959e4a0\' into lmp-dev

* commit '9d1dd586ef1b992eaf6f4c6ec8cd210bcdf6c4f6':
Revert "Wait for all windows to draw before turning screen on"

commit | commitdiff | tree

Geoff Mendal [Tue, 22 Jul 2014 17:19:07 +0000 (17:19 +0000)]

am 6e8aa46d: Merge commit \'e959e4a0\' into lmp-dev

* commit '6e8aa46d6a14d805b61f7edb072f85e416868031':
Revert "Wait for all windows to draw before turning screen on"

commit | commitdiff | tree

Robert Ly [Tue, 22 Jul 2014 17:18:52 +0000 (17:18 +0000)]

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

commit | commitdiff | tree

Robert Ly [Tue, 22 Jul 2014 17:18:47 +0000 (17:18 +0000)]

am c9cf4521: am 0b5f9c2f: docs: remove android translation plugin doc

* commit 'c9cf452179ed6c413712607fd60ba2eaa910d95b':
docs: remove android translation plugin doc

commit | commitdiff | tree

Baligh Uddin [Tue, 22 Jul 2014 17:18:28 +0000 (17:18 +0000)]

am d74d7397: (-s ours) am 43f783fd: (-s ours) Import translations. DO NOT MERGE

* commit 'd74d7397ef9fa085ae8a25a6c89eb9caccb43d40':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Sandeep Siddhartha [Tue, 22 Jul 2014 17:17:46 +0000 (17:17 +0000)]

am 9f0b328e: am 8672899c: Merge "AlwaysOnHotwordDetector needs to reflect enrollment changes" into lmp-dev

* commit '9f0b328e04f62c584cd34c33e0b922628933a5de':
AlwaysOnHotwordDetector needs to reflect enrollment changes

commit | commitdiff | tree

Geoff Mendal [Tue, 22 Jul 2014 17:14:35 +0000 (10:14 -0700)]

Merge commit 'e959e4a0' into lmp-dev

Conflicts:
services/core/java/com/android/server/wm/WindowManagerService.java

commit | commitdiff | tree

Robert Ly [Tue, 22 Jul 2014 17:12:14 +0000 (17:12 +0000)]

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

commit | commitdiff | tree

Robert Ly [Tue, 22 Jul 2014 17:12:10 +0000 (17:12 +0000)]

am 0b5f9c2f: docs: remove android translation plugin doc

* commit '0b5f9c2f6890ed8aa16d1cb630aa415bf7c908c0':
docs: remove android translation plugin doc

commit | commitdiff | tree

Sandeep Siddhartha [Tue, 22 Jul 2014 17:10:06 +0000 (17:10 +0000)]

am 8672899c: Merge "AlwaysOnHotwordDetector needs to reflect enrollment changes" into lmp-dev

* commit '8672899cdf1b0b68c7b3a9bc4183c1414f2d4f7e':
AlwaysOnHotwordDetector needs to reflect enrollment changes

commit | commitdiff | tree

Robert Ly [Tue, 22 Jul 2014 15:05:33 +0000 (08:05 -0700)]

docs: remove android translation plugin doc

Change-Id: Ia21049e3250e98a419f5249693b218c1d5e58fd1

commit | commitdiff | tree

Baligh Uddin [Tue, 22 Jul 2014 17:00:51 +0000 (17:00 +0000)]

am e3e31dfb: (-s ours) am 02acba44: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'e3e31dfbaf77530bfa544be974df64c7e4d486e4':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 22 Jul 2014 17:00:46 +0000 (17:00 +0000)]

am 18129ca9: (-s ours) am f0b64309: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '18129ca9bcc29b8804d53727fac4fe7a12934980':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 22 Jul 2014 17:00:43 +0000 (17:00 +0000)]

am 2e795805: (-s ours) am 5a5d14ae: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '2e795805b62aae89fea4bb7db109bee1949d7ca8':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 22 Jul 2014 17:00:39 +0000 (17:00 +0000)]

am b357556d: (-s ours) am 9875afbf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'b357556d477de0e39cdc18380e067e554a8a997b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

John Spurlock [Tue, 22 Jul 2014 17:00:34 +0000 (17:00 +0000)]

am f0f5e78b: am e017f0d5: QS: Hide Location, Cast tiles when showing secure keyguard.

* commit 'f0f5e78bc274363db3a859846f4d7c693233e8de':
QS: Hide Location, Cast tiles when showing secure keyguard.

commit | commitdiff | tree

Baligh Uddin [Tue, 22 Jul 2014 16:50:16 +0000 (16:50 +0000)]

am 02acba44: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '02acba440250d90519d06a2892d6dd83326c1ead':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 22 Jul 2014 16:50:12 +0000 (16:50 +0000)]

am f0b64309: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'f0b643094854060c020750f993cc129f41f48727':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 22 Jul 2014 16:50:08 +0000 (16:50 +0000)]

am 5a5d14ae: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '5a5d14ae082191669afc848769f45fd3f34e67f1':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 22 Jul 2014 16:50:00 +0000 (16:50 +0000)]

am 9875afbf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '9875afbf80c85f5c9521d1fd84854c4f0756b16e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

John Spurlock [Tue, 22 Jul 2014 16:49:56 +0000 (16:49 +0000)]

am e017f0d5: QS: Hide Location, Cast tiles when showing secure keyguard.

* commit 'e017f0d50c1a6a6b60b02764d2a978c1d02e4b88':
QS: Hide Location, Cast tiles when showing secure keyguard.

commit | commitdiff | tree

Baligh Uddin [Tue, 22 Jul 2014 16:48:12 +0000 (16:48 +0000)]

am 43f783fd: (-s ours) Import translations. DO NOT MERGE

* commit '43f783fd7efd3b3d985a58bc3aa3e6136f976a14':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 21 Jul 2014 17:05:50 +0000 (10:05 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ief6127337c9c4fdbbf15a6214a463822dc39b92c
Auto-generated-cl: translation import

commit | commitdiff | tree

Chris Craik [Tue, 22 Jul 2014 19:08:23 +0000 (19:08 +0000)]

Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()"

commit | commitdiff | tree

Chris Craik [Tue, 22 Jul 2014 19:07:19 +0000 (19:07 +0000)]

Merge "[HWUI] Fix invisible views are still shown in popup window"

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.