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

Chris Craik [Fri, 12 Dec 2014 04:25:43 +0000 (04:25 +0000)]

am 63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-dev
automerge: 00905a9

* commit '00905a984c07ffc9960ce83548631c59aae37ec6':
Correct layer size formatting in trace

commit | commitdiff | tree

Craig Mautner [Fri, 12 Dec 2014 04:24:34 +0000 (04:24 +0000)]

am 72b047c6: Merge "Don\'t apply animations to windows that are showing" into lmp-mr1-dev
automerge: 922f8e2

* commit '922f8e2c0f58e57d02ab136f24f135553e6d9720':
Don't apply animations to windows that are showing

commit | commitdiff | tree

David Friedman [Fri, 12 Dec 2014 04:23:07 +0000 (04:23 +0000)]

am e84bf9fd: am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs
automerge: e90a170

* commit 'e90a170f67f91d9b0166ac4f0de07f63207b1bce':
Adds link to related video.

commit | commitdiff | tree

Alan Viverette [Fri, 12 Dec 2014 04:21:42 +0000 (04:21 +0000)]

am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev
automerge: 4b7f724

* commit '4b7f724fb23166f892781ae7daa2df76bede2134':
Improve time picker accessibility

commit | commitdiff | tree

Winson Chung [Fri, 12 Dec 2014 04:20:19 +0000 (04:20 +0000)]

am 47d9a58c: Merge "Fixing issue with old thumbnails on first launch of app. (Bug 18718114)" into lmp-mr1-dev
automerge: 8c8c99c

* commit '8c8c99cf0873e10f19d79bfe79d8ea56848dadb4':
Fixing issue with old thumbnails on first launch of app. (Bug 18718114)

commit | commitdiff | tree

Joe Fernandez [Fri, 12 Dec 2014 04:19:03 +0000 (04:19 +0000)]

am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
automerge: a878256

* commit 'a878256b59e1766ce918257dbfe343b0d3d0ec2d':
docs: studio basics haxm updates

commit | commitdiff | tree

Ricardo Cervera [Fri, 12 Dec 2014 04:17:41 +0000 (04:17 +0000)]

am af7070e6: am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
automerge: 575c8c9

* commit '575c8c9fcdc2ee8ed614ac9b6a4992fffe8ccea4':
docs: Fixes to watch faces docs.

commit | commitdiff | tree

Rich Slogar [Fri, 12 Dec 2014 04:16:30 +0000 (04:16 +0000)]

am 0564cee3: am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs
automerge: 51f1c26

* commit '51f1c26b5b4b2c514fd5a4ca11de98542ccd4166':
docs: studio bundle update

commit | commitdiff | tree

Joe Fernandez [Fri, 12 Dec 2014 04:14:43 +0000 (04:14 +0000)]

am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs
automerge: cc08e61

* commit 'cc08e619d6a946b58b2aae857e3190b5996c07b8':
docs: platform updates for api 21

commit | commitdiff | tree

Joe Fernandez [Fri, 12 Dec 2014 04:13:20 +0000 (04:13 +0000)]

am e3bac3bc: am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs
automerge: 11bccb1

* commit '11bccb1ebe457bc3cca582320d13a459920425d9':
docs: sdk tools 24.0.1 revisions

commit | commitdiff | tree

Andrew Solovay [Fri, 12 Dec 2014 04:11:53 +0000 (04:11 +0000)]

am 13e0a650: am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes"
automerge: fe96791

* commit 'fe967912faf8ddf79d9eab794c4a2417758b716d':
docs: Added info about managed profiles to "Android 5.0 Changes"

commit | commitdiff | tree

Ruben Brunk [Fri, 12 Dec 2014 04:09:55 +0000 (04:09 +0000)]

am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev
automerge: 81b381b

* commit '81b381b82e83ec742a8a6541dabbc63dae087c0a':
camera2: Fix LEGACY YUV production and orientation.

commit | commitdiff | tree

Jason Monk [Fri, 12 Dec 2014 04:08:33 +0000 (04:08 +0000)]

am 7d8ccb41: Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev
automerge: 70cf2f7

* commit '70cf2f72f2e19570d81c1365164313437b38ffd5':
Fix crash in BluetoothControllerImpl

commit | commitdiff | tree

Amit Mahajan [Fri, 12 Dec 2014 04:05:59 +0000 (04:05 +0000)]

am c5da1d3d: Merge "Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network." into lmp-mr1-dev
automerge: cac8662

* commit 'cac8662943b28663fefc6e5315a7b9acd514bfdb':
Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network.

commit | commitdiff | tree

John Spurlock [Fri, 12 Dec 2014 04:04:40 +0000 (04:04 +0000)]

am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev
automerge: 6f9a717

* commit '6f9a71729f6ba7521ed8461ec8b556a8907743b1':
Zen: Leave zen=none on manual ringer mode stream volume changes.

commit | commitdiff | tree

Chris Craik [Thu, 11 Dec 2014 22:49:46 +0000 (22:49 +0000)]

am 63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-dev

* commit '63c7b24645d94c92dc6dc32d57c23b5167950c8b':
Correct layer size formatting in trace

commit | commitdiff | tree

Chris Craik [Thu, 11 Dec 2014 22:43:16 +0000 (22:43 +0000)]

Merge "Correct layer size formatting in trace" into lmp-mr1-dev

commit | commitdiff | tree

Craig Mautner [Thu, 11 Dec 2014 22:29:58 +0000 (22:29 +0000)]

am 72b047c6: Merge "Don\'t apply animations to windows that are showing" into lmp-mr1-dev

* commit '72b047c6c37ddf860be15b159b9a143be36d7425':
Don't apply animations to windows that are showing

commit | commitdiff | tree

David Friedman [Thu, 11 Dec 2014 22:29:53 +0000 (22:29 +0000)]

am e84bf9fd: am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs

* commit 'e84bf9fddce69f2cc6b9e5f4274419a4122476a2':
Adds link to related video.

commit | commitdiff | tree

Chris Craik [Thu, 11 Dec 2014 22:29:51 +0000 (14:29 -0800)]

Correct layer size formatting in trace

bug:18722704
Change-Id: Icef9aaa62633b2d86ad250f43d4c8fa5cc0b6842

commit | commitdiff | tree

Craig Mautner [Thu, 11 Dec 2014 22:27:52 +0000 (22:27 +0000)]

Merge "Don't apply animations to windows that are showing" into lmp-mr1-dev

commit | commitdiff | tree

David Friedman [Thu, 11 Dec 2014 22:21:16 +0000 (22:21 +0000)]

am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs

* commit 'd0d76540ae937d6773793ba053e81ee3667d0ba6':
Adds link to related video.

commit | commitdiff | tree

Alan Viverette [Thu, 11 Dec 2014 22:19:07 +0000 (22:19 +0000)]

am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev

* commit 'ff44188309fca037892d0ded64cfee04a3a71c42':
Improve time picker accessibility

commit | commitdiff | tree

Alan Viverette [Thu, 11 Dec 2014 22:11:54 +0000 (22:11 +0000)]

Merge "Improve time picker accessibility" into lmp-mr1-dev

commit | commitdiff | tree

David Friedman [Thu, 11 Dec 2014 22:10:48 +0000 (22:10 +0000)]

am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs

* commit 'c82392df7caa12836d97650c7528f216d3c2b76f':
Adds link to related video.

commit | commitdiff | tree

David Friedman [Thu, 11 Dec 2014 22:03:42 +0000 (22:03 +0000)]

am 1ab615b3: Merge "Adds link to related video." into lmp-docs

* commit '1ab615b3e6a7ae820fde4ba067f76dff635f3639':
Adds link to related video.

commit | commitdiff | tree

David Friedman [Thu, 11 Dec 2014 21:55:23 +0000 (21:55 +0000)]

Merge "Adds link to related video." into lmp-docs

commit | commitdiff | tree

Winson Chung [Thu, 11 Dec 2014 21:27:54 +0000 (21:27 +0000)]

am 47d9a58c: Merge "Fixing issue with old thumbnails on first launch of app. (Bug 18718114)" into lmp-mr1-dev

* commit '47d9a58ce15007f79bc094d9b1599e41d51670a3':
Fixing issue with old thumbnails on first launch of app. (Bug 18718114)

commit | commitdiff | tree

Winson Chung [Thu, 11 Dec 2014 21:20:40 +0000 (21:20 +0000)]

Merge "Fixing issue with old thumbnails on first launch of app. (Bug 18718114)" into lmp-mr1-dev

commit | commitdiff | tree

Joe Fernandez [Thu, 11 Dec 2014 21:03:11 +0000 (21:03 +0000)]

am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs

* commit '817796940bf79942ccd950cec47815039a2aa15e':
docs: studio basics haxm updates

commit | commitdiff | tree

Ricardo Cervera [Thu, 11 Dec 2014 21:03:06 +0000 (21:03 +0000)]

am af7070e6: am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs

* commit 'af7070e6f0bb2b035b1d2565fdd50b6bde210864':
docs: Fixes to watch faces docs.

commit | commitdiff | tree

Rich Slogar [Thu, 11 Dec 2014 21:02:44 +0000 (21:02 +0000)]

am 0564cee3: am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs

* commit '0564cee3c7537c916c74e560e2160b0f0657a9eb':
docs: studio bundle update

commit | commitdiff | tree

Joe Fernandez [Thu, 11 Dec 2014 21:02:37 +0000 (21:02 +0000)]

am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs

* commit '07877955bef2132ea5e8d02662a7f0ca1aad5f7d':
docs: platform updates for api 21

commit | commitdiff | tree

Joe Fernandez [Thu, 11 Dec 2014 21:02:32 +0000 (21:02 +0000)]

am e3bac3bc: am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs

* commit 'e3bac3bc8f015a1ee8238fef7ca155fb432beb51':
docs: sdk tools 24.0.1 revisions

commit | commitdiff | tree

Andrew Solovay [Thu, 11 Dec 2014 21:02:26 +0000 (21:02 +0000)]

am 13e0a650: am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes"

* commit '13e0a6505fd049a8df47aa8fa01b7c8c3120dea1':
docs: Added info about managed profiles to "Android 5.0 Changes"

commit | commitdiff | tree

Chih-hung Hsieh [Thu, 11 Dec 2014 21:02:08 +0000 (21:02 +0000)]

am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"

* commit 'b0dd6d3a8a7f11454239facf0ee9b2dd2390945e':
Adjust format strings to work on both 32-bit and 64-bit builds

commit | commitdiff | tree

Joe Fernandez [Thu, 11 Dec 2014 20:55:53 +0000 (20:55 +0000)]

am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs

* commit 'c9014b6d59cae3602027a5ea373d436a7e78b71c':
docs: studio basics haxm updates

commit | commitdiff | tree

Ricardo Cervera [Thu, 11 Dec 2014 20:55:49 +0000 (20:55 +0000)]

am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs

* commit '64d97cb2ad6bfd10511067f178ba8a1ccf9ba452':
docs: Fixes to watch faces docs.

commit | commitdiff | tree

Rich Slogar [Thu, 11 Dec 2014 20:55:45 +0000 (20:55 +0000)]

am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs

* commit 'b490f297101bcf31f56278d21d5f56a5e5998a58':
docs: studio bundle update

commit | commitdiff | tree

Joe Fernandez [Thu, 11 Dec 2014 20:55:35 +0000 (20:55 +0000)]

am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs

* commit '5c518b7f01345a414cd260db7762bdb0aa73b55b':
docs: platform updates for api 21

commit | commitdiff | tree

Joe Fernandez [Thu, 11 Dec 2014 20:55:29 +0000 (20:55 +0000)]

am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs

* commit 'b64545c83a526d17ccbce2d110a06f3789dd4ad8':
docs: sdk tools 24.0.1 revisions

commit | commitdiff | tree

Andrew Solovay [Thu, 11 Dec 2014 20:55:23 +0000 (20:55 +0000)]

am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes"

* commit 'a97053fd0ba37feb7382fd30498a6a5e93c52a9e':
docs: Added info about managed profiles to "Android 5.0 Changes"

commit | commitdiff | tree

Chih-hung Hsieh [Thu, 11 Dec 2014 20:54:56 +0000 (20:54 +0000)]

am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"

* commit '4c23a0ec161891a1248b7aea67fbfd1d00bbd199':
Adjust format strings to work on both 32-bit and 64-bit builds

commit | commitdiff | tree

Chih-hung Hsieh [Thu, 11 Dec 2014 20:49:29 +0000 (20:49 +0000)]

Merge "Adjust format strings to work on both 32-bit and 64-bit builds"

commit | commitdiff | tree

Winson Chung [Thu, 11 Dec 2014 19:04:19 +0000 (11:04 -0800)]

Fixing issue with old thumbnails on first launch of app. (Bug 18718114)

Ensure that we always update the thumbnail for the running task, in addition, we
need to be ignoring the running task when doing background preloading since it
will be invalidated anyways.

Change-Id: Ie4f9862dddc29aa71a44e94bbd036c7712487eed

commit | commitdiff | tree

Joe Fernandez [Thu, 11 Dec 2014 19:59:00 +0000 (19:59 +0000)]

am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs

* commit 'ea500a3adf6bcf17ad22f05acd8c3220358f72ce':
docs: studio basics haxm updates

commit | commitdiff | tree

Ruben Brunk [Thu, 11 Dec 2014 19:55:02 +0000 (19:55 +0000)]

am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev

* commit 'f6ed526b3a02bac9c5912a9655e5890f332cefc6':
camera2: Fix LEGACY YUV production and orientation.

commit | commitdiff | tree

Joe Fernandez [Thu, 11 Dec 2014 19:50:39 +0000 (19:50 +0000)]

am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs

* commit '0aa234457737cdb31538711251920aef3a70bb56':
docs: studio basics haxm updates

commit | commitdiff | tree

Ruben Brunk [Thu, 11 Dec 2014 19:48:36 +0000 (19:48 +0000)]

Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev

commit | commitdiff | tree

Ricardo Cervera [Thu, 11 Dec 2014 19:43:25 +0000 (19:43 +0000)]

am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs

* commit '6621a4f6f9c63ff952c5e64a5ae1e41ef5ac5960':
docs: Fixes to watch faces docs.

commit | commitdiff | tree

Joe Fernandez [Thu, 11 Dec 2014 19:43:17 +0000 (19:43 +0000)]

Merge "docs: studio basics haxm updates" into lmp-docs

commit | commitdiff | tree

Ruben Brunk [Thu, 11 Dec 2014 03:12:41 +0000 (19:12 -0800)]

camera2: Fix LEGACY YUV production and orientation.

Bug: 18486140
Change-Id: I119e57315b67d1f485bea7f1682bfc261ae0f934

commit | commitdiff | tree

Ricardo Cervera [Thu, 11 Dec 2014 19:35:41 +0000 (19:35 +0000)]

am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs

* commit '9fe34d9037dc27abb89c64ff75b87fdf9a4eaa8b':
docs: Fixes to watch faces docs.

commit | commitdiff | tree

Ricardo Cervera [Thu, 11 Dec 2014 19:28:39 +0000 (19:28 +0000)]

Merge "docs: Fixes to watch faces docs." into lmp-docs

commit | commitdiff | tree

Jason Monk [Thu, 11 Dec 2014 19:28:28 +0000 (19:28 +0000)]

am 7d8ccb41: Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev

* commit '7d8ccb41fa3756839597cd28cd5710c1b690e17f':
Fix crash in BluetoothControllerImpl

commit | commitdiff | tree

Craig Mautner [Thu, 11 Dec 2014 19:24:32 +0000 (11:24 -0800)]

Don't apply animations to windows that are showing

If a window is showing and not obscured by the keyguard, for
example windows on other displays, don't apply the enter animation.
This prevents jank on secondary displays when the keyguard is
unlocked.

Fixes bug 18689396

Change-Id: I2deb3030e6e887f57af9a5f1d42b1c71f06f7eeb

commit | commitdiff | tree

Jason Monk [Thu, 11 Dec 2014 19:22:17 +0000 (19:22 +0000)]

Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev

commit | commitdiff | tree

Rich Slogar [Thu, 11 Dec 2014 19:17:05 +0000 (19:17 +0000)]

am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs

* commit '5c853c26a879c411a98e1530247a41a856f7784c':
docs: studio bundle update

commit | commitdiff | tree

Rich Slogar [Thu, 11 Dec 2014 19:09:39 +0000 (19:09 +0000)]

am d35216ad: Merge "docs: studio bundle update" into lmp-docs

* commit 'd35216ad36aefb121167ad781b25f7a37d5c1e52':
docs: studio bundle update

commit | commitdiff | tree

Rich Slogar [Thu, 11 Dec 2014 19:04:01 +0000 (19:04 +0000)]

Merge "docs: studio bundle update" into lmp-docs

commit | commitdiff | tree

Rich Slogar [Thu, 11 Dec 2014 18:43:11 +0000 (10:43 -0800)]

docs: studio bundle update

Change-Id: I232a61ae6747b879e8a36f8e4942d6a3406c4162

commit | commitdiff | tree

Amit Mahajan [Thu, 11 Dec 2014 18:43:38 +0000 (18:43 +0000)]

am c5da1d3d: Merge "Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network." into lmp-mr1-dev

* commit 'c5da1d3ddfb4e0a8c17ee827765ba5ab7293c500':
Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network.

commit | commitdiff | tree

Amit Mahajan [Thu, 11 Dec 2014 18:39:20 +0000 (18:39 +0000)]

Merge "Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network." into lmp-mr1-dev

commit | commitdiff | tree

John Spurlock [Thu, 11 Dec 2014 18:34:14 +0000 (18:34 +0000)]

am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev

* commit '0537caa1e05a2f60e747559e5251f5771737c54f':
Zen: Leave zen=none on manual ringer mode stream volume changes.

commit | commitdiff | tree

John Spurlock [Thu, 11 Dec 2014 18:27:09 +0000 (18:27 +0000)]

Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev

commit | commitdiff | tree

Jason Monk [Thu, 11 Dec 2014 18:23:18 +0000 (13:23 -0500)]

Fix crash in BluetoothControllerImpl

Bug: 18717777
Change-Id: I396aa8b517054b1fd4c8fea7f0343f138cb261a7

commit | commitdiff | tree

Robert Greenwalt [Thu, 11 Dec 2014 18:07:53 +0000 (18:07 +0000)]

am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev
automerge: 911bcea

* commit '911bceab1ead02fde9ccb6fe2651fee13aca817e':
Add toString in NetworkFactory.

commit | commitdiff | tree

Selim Cinek [Thu, 11 Dec 2014 18:05:37 +0000 (18:05 +0000)]

Merge "Fixed a bug where the pattern may become invisible" into lmp-mr1-dev automerge: f8dc9d7
automerge: efa38cd

* commit 'efa38cd36101d7469e8ed4db03cdebe818bbcfd2':
Fixed a bug where the pattern may become invisible

commit | commitdiff | tree

Selim Cinek [Thu, 11 Dec 2014 18:04:17 +0000 (18:04 +0000)]

Merge "Fixed a bug where the empty shade and dismiss views would animate" into lmp-mr1-dev automerge: 372eb38
automerge: 7988ef9

* commit '7988ef9c4da50f007fde71a121f89e6b9796c69e':
Fixed a bug where the empty shade and dismiss views would animate

commit | commitdiff | tree

Rich Slogar [Thu, 11 Dec 2014 18:03:19 +0000 (10:03 -0800)]

docs: studio basics haxm updates

Change-Id: I2c3ef0dae3a091be27f1cfef13fe385f97781492

commit | commitdiff | tree

Selim Cinek [Thu, 11 Dec 2014 18:02:39 +0000 (18:02 +0000)]

Merge "Fixed a bug where the background could become transparent" into lmp-mr1-dev automerge: 8f51c4c
automerge: 2e34adc

* commit '2e34adc24c9609426d08530b1c5bbec723bd4a19':
Fixed a bug where the background could become transparent

commit | commitdiff | tree

Narayan Kamath [Thu, 11 Dec 2014 18:00:47 +0000 (18:00 +0000)]

am 15cd6302: Merge "Avoid tearing down process groups twice." into lmp-mr1-dev
automerge: 6fe0fd6

* commit '6fe0fd69a1da7c0f548bcda91827d2a9e493c555':
Avoid tearing down process groups twice.

commit | commitdiff | tree

John Spurlock [Thu, 11 Dec 2014 17:15:19 +0000 (12:15 -0500)]

Zen: Leave zen=none on manual ringer mode stream volume changes.

If the stream volume is changed from the api, leave zen=none
so as not to leave the system in an unexpected state.

Bug: 18084981
Change-Id: I857b3ff87ad4e2aa9aab479529caf13b819f854c

commit | commitdiff | tree

Ricardo Cervera [Wed, 10 Dec 2014 21:05:17 +0000 (13:05 -0800)]

docs: Fixes to watch faces docs.

Bug: 18705470
Bug: 18702859
Bug: 18713266

Change-Id: I67f159f3b54a03f08aa1cd4bf3aa40eec4a34631

commit | commitdiff | tree

Robert Greenwalt [Thu, 11 Dec 2014 17:03:57 +0000 (17:03 +0000)]

am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev

* commit 'bde00a2b5c8c506b79e0724021a0711bde207c25':
Add toString in NetworkFactory.

commit | commitdiff | tree

Robert Greenwalt [Thu, 11 Dec 2014 16:59:12 +0000 (16:59 +0000)]

Merge "Add toString in NetworkFactory." into lmp-mr1-dev

commit | commitdiff | tree

Selim Cinek [Thu, 11 Dec 2014 15:12:37 +0000 (15:12 +0000)]

Merge "Fixed a bug where the pattern may become invisible" into lmp-mr1-dev
automerge: f8dc9d7

* commit 'f8dc9d7b3d496593c6c6dddcd42cae13ac508876':
Fixed a bug where the pattern may become invisible

commit | commitdiff | tree

Selim Cinek [Thu, 11 Dec 2014 15:11:17 +0000 (15:11 +0000)]

Merge "Fixed a bug where the empty shade and dismiss views would animate" into lmp-mr1-dev
automerge: 372eb38

* commit '372eb38c17b8bcd304985d7a36168c175f625016':
Fixed a bug where the empty shade and dismiss views would animate

commit | commitdiff | tree

Selim Cinek [Thu, 11 Dec 2014 15:10:06 +0000 (15:10 +0000)]

Merge "Fixed a bug where the background could become transparent" into lmp-mr1-dev
automerge: 8f51c4c

* commit '8f51c4c5e51e1581ba9892bc095453b8fc315f7b':
Fixed a bug where the background could become transparent

commit | commitdiff | tree

Selim Cinek [Thu, 11 Dec 2014 14:09:42 +0000 (14:09 +0000)]

Merge "Fixed a bug where the pattern may become invisible" into lmp-mr1-dev

commit | commitdiff | tree

Selim Cinek [Thu, 11 Dec 2014 14:08:56 +0000 (14:08 +0000)]

Merge "Fixed a bug where the empty shade and dismiss views would animate" into lmp-mr1-dev

commit | commitdiff | tree

Selim Cinek [Thu, 11 Dec 2014 14:08:08 +0000 (14:08 +0000)]

Merge "Fixed a bug where the background could become transparent" into lmp-mr1-dev

commit | commitdiff | tree

Narayan Kamath [Thu, 11 Dec 2014 10:35:28 +0000 (10:35 +0000)]

am bc59ca4b: am 31462128: Merge "Avoid tearing down process groups twice."

* commit 'bc59ca4bdbd993c1eb5c2a74f9b35857619da285':
Avoid tearing down process groups twice.

commit | commitdiff | tree

Narayan Kamath [Thu, 11 Dec 2014 10:35:19 +0000 (10:35 +0000)]

am 37da3f0d: am 7bd28de5: Merge "Remove some crufty "core" tests."

* commit '37da3f0d28815a5dfbea929fc173d89cb62bd318':
Remove some crufty "core" tests.

commit | commitdiff | tree

Narayan Kamath [Thu, 11 Dec 2014 10:34:09 +0000 (10:34 +0000)]

am 15cd6302: Merge "Avoid tearing down process groups twice." into lmp-mr1-dev

* commit '15cd63027bc8413659114714068a665869a4b3b2':
Avoid tearing down process groups twice.

commit | commitdiff | tree

Narayan Kamath [Thu, 11 Dec 2014 10:28:10 +0000 (10:28 +0000)]

am 31462128: Merge "Avoid tearing down process groups twice."

* commit '314621287801ba4c71467aad4702114eeb4d9951':
Avoid tearing down process groups twice.

commit | commitdiff | tree

Narayan Kamath [Thu, 11 Dec 2014 10:28:04 +0000 (10:28 +0000)]

am 7bd28de5: Merge "Remove some crufty "core" tests."

* commit '7bd28de5781293b1b2b4224762bd909d097adbda':
Remove some crufty "core" tests.

commit | commitdiff | tree

Narayan Kamath [Thu, 11 Dec 2014 09:15:05 +0000 (09:15 +0000)]

Merge "Avoid tearing down process groups twice."

commit | commitdiff | tree

Narayan Kamath [Thu, 11 Dec 2014 09:14:15 +0000 (09:14 +0000)]

Merge "Remove some crufty "core" tests."

commit | commitdiff | tree

Narayan Kamath [Thu, 11 Dec 2014 09:08:38 +0000 (09:08 +0000)]

Merge "Avoid tearing down process groups twice." into lmp-mr1-dev

commit | commitdiff | tree

Paul Jensen [Thu, 11 Dec 2014 05:49:18 +0000 (05:49 +0000)]

am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev
automerge: d9d48cc

* commit 'd9d48cc9c7ab0d1590918e199917968eafc48288':
Fix several HTTP proxy issues with multinetworking.

commit | commitdiff | tree

Pavel Zhamaitsiak [Thu, 11 Dec 2014 05:47:45 +0000 (05:47 +0000)]

am fda0ff02: Merge "Add missing member to string conversion - helps in debugging." into lmp-mr1-dev
automerge: b07de8d

* commit 'b07de8d172e7c7b663dec0dd14f7d6dba168aa4c':
Add missing member to string conversion - helps in debugging.

commit | commitdiff | tree

Paul Jensen [Thu, 11 Dec 2014 04:55:52 +0000 (04:55 +0000)]

am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev

* commit '2122e14cca3edc5099b90d8768b34d7a0e9fe148':
Fix several HTTP proxy issues with multinetworking.

commit | commitdiff | tree

Pavel Zhamaitsiak [Thu, 11 Dec 2014 04:55:47 +0000 (04:55 +0000)]

am fda0ff02: Merge "Add missing member to string conversion - helps in debugging." into lmp-mr1-dev

* commit 'fda0ff020d2ce63e4010e24d5f4bebf7fbe026c5':
Add missing member to string conversion - helps in debugging.

commit | commitdiff | tree

Paul Jensen [Thu, 11 Dec 2014 04:51:14 +0000 (04:51 +0000)]

Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev

commit | commitdiff | tree

Pavel Zhamaitsiak [Thu, 11 Dec 2014 04:47:19 +0000 (04:47 +0000)]

Merge "Add missing member to string conversion - helps in debugging." into lmp-mr1-dev

commit | commitdiff | tree

vandwalle [Thu, 11 Dec 2014 03:41:48 +0000 (03:41 +0000)]

am b897f013: Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev
automerge: 76dc7a1

* commit '76dc7a1abe2d69013dbc8238292d239ac1287e2c':
adjust network switching thresholds Bug:18589301

commit | commitdiff | tree

smain@google.com [Thu, 11 Dec 2014 03:39:57 +0000 (03:39 +0000)]

am 9a6d1d9f: am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs automerge: e04a9fc
automerge: bac113b

* commit 'bac113bbcbe7780ca658f09019e5118ec851cd07':
add helpouts widget to wave 3 pages

commit | commitdiff | tree

Luan Nguyen [Thu, 11 Dec 2014 03:38:41 +0000 (03:38 +0000)]

am 25964a85: am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index. automerge: 75ec24e
automerge: 8470943

* commit '847094397ebac9ab2c5bb7e11844fd2b533bd209':
docs: Fix link for moved Android Studio index.

commit | commitdiff | tree

vandwalle [Thu, 11 Dec 2014 03:25:00 +0000 (03:25 +0000)]

am b897f013: Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev

* commit 'b897f013b558596964e33b39c0e9678998c281dc':
adjust network switching thresholds Bug:18589301