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

Android Build Merger (Role) [Thu, 27 Jul 2017 00:00:23 +0000 (00:00 +0000)]

Merge "Merge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev am: 3bcdbff889 -s ours am: 6f24c015ef -s ours am: 3c1c07a9fe -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:55:32 +0000 (23:55 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours am: aec51f497c -s ours
am: a204358b18 -s ours

Change-Id: I70f15fc4332019f5bdfb21a7f092be8c968b438e

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:53:53 +0000 (23:53 +0000)]

Merge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev am: 3bcdbff889 -s ours am: 6f24c015ef -s ours
am: 3c1c07a9fe -s ours

Change-Id: I29779b62d8a1601ab58f683de59d4abe28d25149

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 23:52:26 +0000 (23:52 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903 -s ours am: 18b818e2dd -s ours am: 126d4923f4 -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:48:31 +0000 (23:48 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903 -s ours am: 18b818e2dd -s ours
am: 126d4923f4 -s ours

Change-Id: I86fa807f86727c28e368370db742300947711e32

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:42:57 +0000 (23:42 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: a1bde91384 -s ours am: cccb304acf -s ours" into oc-dr1-dev
am: ab60d6b44e -s ours

Change-Id: I887e494fc178972d6941f5c8cbfe64fb0109dd0e

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:38:01 +0000 (23:38 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours
am: aec51f497c -s ours

Change-Id: I2f855bb13f287547ab5f42c05dada215465d0e5c

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 23:37:19 +0000 (23:37 +0000)]

Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545 -s ours am: 611a6ffe29 -s ours" into oc-dr1-dev am: 527cd8b04d -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:34:30 +0000 (23:34 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903 -s ours
am: 18b818e2dd -s ours

Change-Id: Ia30698cfb205b69d5d954ec4f9405fa228aa572e

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:33:28 +0000 (23:33 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545 -s ours am: 611a6ffe29 -s ours" into oc-dr1-dev
am: 527cd8b04d -s ours

Change-Id: Ie638e9dd8e7c50a8b1352199ca46e4157d46f2c3

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:32:44 +0000 (23:32 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125 -s ours" into nyc-mr2-dev am: cd955ca6e5 -s ours am: f66ddc099a -s ours
am: 45f115afad -s ours

Change-Id: Ia2e8ff2e7847ee2d130d680e750ed5ff2aebeb8c

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:18:52 +0000 (23:18 +0000)]

Merge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev am: 3bcdbff889 -s ours am: 6f24c015ef -s ours
am: 5d74b7d676 -s ours

Change-Id: I51ad9da8af1dedb69b71c6950e5529d30f9a0548

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:09:29 +0000 (23:09 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: a1bde91384 -s ours am: cccb304acf -s ours
am: 8437c2d1f2 -s ours

Change-Id: I1d941d3545f3e390ba5475ab3b77e59a37208d74

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:09:07 +0000 (23:09 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125 -s ours" into nyc-mr2-dev am: cd955ca6e5 -s ours
am: f66ddc099a -s ours

Change-Id: Ia6630c6dd3cf9daf78fd3f07ebdc7515c548a3bd

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:00:56 +0000 (23:00 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545 -s ours am: 611a6ffe29 -s ours
am: b663a08d66 -s ours

Change-Id: I170c03e11efefdead715035b4946b32176b6ba99

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 22:56:44 +0000 (22:56 +0000)]

Merge "Merge "Import translations. DO NOT MERGE am: 495d4ce1b9 -s ours am: 120c3e9874 -s ours" into oc-dr1-dev am: 70906280eb -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:55:44 +0000 (22:55 +0000)]

Merge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev am: 3bcdbff889 -s ours
am: 6f24c015ef -s ours

Change-Id: Ifce7209bce43d5228d1f2e32b1fffa43daf5d793

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:55:38 +0000 (22:55 +0000)]

Merge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev am: 3bcdbff889 -s ours
am: 6f24c015ef -s ours

Change-Id: I1926ae43168fa88c14390130282d1517091c7129

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 22:53:38 +0000 (22:53 +0000)]

Merge "Import translations. DO NOT MERGE am: 495d4ce1b9 -s ours am: 120c3e9874 -s ours am: a279b21d0b -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:51:49 +0000 (22:51 +0000)]

Merge "Import translations. DO NOT MERGE am: 495d4ce1b9 -s ours am: 120c3e9874 -s ours" into oc-dr1-dev
am: 70906280eb -s ours

Change-Id: I69f27513c7d98b7d99473fdf03b777bd41a7e7d9

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 22:51:17 +0000 (22:51 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: a1bde91384 -s ours am: cccb304acf -s ours" into oc-dr1-dev

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:50:55 +0000 (22:50 +0000)]

Import translations. DO NOT MERGE am: 495d4ce1b9 -s ours am: 120c3e9874 -s ours
am: a279b21d0b -s ours

Change-Id: I02dfb0789e0a190b75ed9c02cde4a671cb8c8c19

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:49:37 +0000 (22:49 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: c2b08ca602 -s ours

Change-Id: I0c8c1cc35fa6560dd1a40b22544ecd25dc7af0b2

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:47:01 +0000 (22:47 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: a1bde91384 -s ours
am: cccb304acf -s ours

Change-Id: Idae3b63b7017937b16bf124eaf329be1e1824e69

commit | commitdiff | tree

Aurimas Liutikas [Wed, 26 Jul 2017 22:46:34 +0000 (22:46 +0000)]

Merge "Revert "Update overscroll and toast UI"" into oc-dr1-dev
am: 0aadeed536

Change-Id: I88bf203f78319713f719fe2426c0c4a1e7770b11

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:46:01 +0000 (22:46 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: a1bde91384 -s ours
am: cccb304acf -s ours

Change-Id: Ic9fa84f60261dd11093f38c3e02845dc3da2a3a2

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 22:45:45 +0000 (22:45 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545 -s ours am: 611a6ffe29 -s ours" into oc-dr1-dev

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:44:26 +0000 (22:44 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 9724569903 -s ours

Change-Id: I8bcfd139861eb4ca6a0943e321b8032245e27a42

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:41:01 +0000 (22:41 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545 -s ours
am: 611a6ffe29 -s ours

Change-Id: Ie4eb3a673eb7e7b1f531a05e2b8a420516bccb4e

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:40:44 +0000 (22:40 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545 -s ours
am: 611a6ffe29 -s ours

Change-Id: I4c8c61a56288b7b4fdad4ccca07c51c0a8cfb38c

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 22:40:24 +0000 (22:40 +0000)]

Merge "Import translations. DO NOT MERGE am: 495d4ce1b9 -s ours am: 120c3e9874 -s ours" into oc-dr1-dev

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:39:47 +0000 (22:39 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125 -s ours" into nyc-mr2-dev
am: cd955ca6e5 -s ours

Change-Id: I643ac51ad7d162527ee4aa73da6568d94156083b

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:37:35 +0000 (22:37 +0000)]

Import translations. DO NOT MERGE am: 495d4ce1b9 -s ours
am: 120c3e9874 -s ours

Change-Id: I149d23fe5cdedb0ecb813d252277e15e75055c01

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:37:25 +0000 (22:37 +0000)]

Import translations. DO NOT MERGE am: 495d4ce1b9 -s ours
am: 120c3e9874 -s ours

Change-Id: If6b7cc81b779c33a83506ccb0da87b7a643dd177

commit | commitdiff | tree

Aurimas Liutikas [Wed, 26 Jul 2017 22:36:59 +0000 (22:36 +0000)]

Merge "Revert "Update overscroll and toast UI"" into oc-dr1-dev

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:35:23 +0000 (22:35 +0000)]

Merge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev
am: 3bcdbff889 -s ours

Change-Id: Id70f146241685a88bc2ba075d8e78745fd826878

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:28:59 +0000 (22:28 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: a1bde91384 -s ours

Change-Id: Ic47dfa6fc6cad6123552c0493f40d3ac9a63822c

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:25:46 +0000 (22:25 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 9bc30ce545 -s ours

Change-Id: I8676942d8e77918837208d400a2e87a0b4e3d935

commit | commitdiff | tree

Aurimas Liutikas [Wed, 26 Jul 2017 22:07:41 +0000 (22:07 +0000)]

Revert "Update overscroll and toast UI"

This change broke android.uirendering.cts.testclasses.EdgeEffectTests.

This reverts commit 6085f8a16b5f6ed6a7a7acf854ec29ff2bef45fa.

Bug: 64085792

Change-Id: I70ccebebb54dabf1ec0ee5002adca93e44104a1e

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:21:36 +0000 (22:21 +0000)]

Import translations. DO NOT MERGE
am: 495d4ce1b9 -s ours

Change-Id: I1294580d3e9485f0367aca366054336d0dc3b9ed

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 22:14:51 +0000 (22:14 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 22:13:05 +0000 (22:13 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 22:04:23 +0000 (22:04 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125 -s ours" into nyc-mr2-dev

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:01:57 +0000 (22:01 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: fbfd283125 -s ours

Change-Id: I39f298c62ae870a0a764a1cb60d766e8e03f692b

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 22:01:37 +0000 (22:01 +0000)]

Merge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 21:59:35 +0000 (21:59 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 21:58:32 +0000 (21:58 +0000)]

Import translations. DO NOT MERGE
am: 69d0838208 -s ours

Change-Id: I25641bf4fbc60d8e40887a43965a602000bc8377

commit | commitdiff | tree

Lucas Dupin [Wed, 26 Jul 2017 21:49:03 +0000 (21:49 +0000)]

Merge "Text color of "shutdown" after removing overlay" into oc-dr1-dev
am: c1edefc059

Change-Id: I4f94f72778be7dc2ed64e63892df4463e72e78e1

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 21:48:22 +0000 (21:48 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 21:36:36 +0000 (21:36 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

Lucas Dupin [Wed, 26 Jul 2017 21:29:26 +0000 (21:29 +0000)]

Merge "Text color of "shutdown" after removing overlay" into oc-dr1-dev

commit | commitdiff | tree

Lucas Dupin [Fri, 21 Jul 2017 20:50:25 +0000 (13:50 -0700)]

Text color of "shutdown" after removing overlay

Bug: 63751714
Fixes: 64079315
Test: Visual, turn off device with white wallpaper set
Change-Id: I667d40135c8c7b4f498bc89f695cbfde5657588c

commit | commitdiff | tree

Suprabh Shukla [Wed, 26 Jul 2017 20:43:14 +0000 (20:43 +0000)]

Merge "Read the correct parameters for Jobscheduler" into oc-dr1-dev
am: a49681fab8

Change-Id: I67951e184ef30e59e11d26cf3eecdec65dc758b0

commit | commitdiff | tree

Suprabh Shukla [Wed, 26 Jul 2017 20:25:07 +0000 (20:25 +0000)]

Merge "Read the correct parameters for Jobscheduler" into oc-dr1-dev

commit | commitdiff | tree

Matthew Fritze [Wed, 26 Jul 2017 20:06:36 +0000 (20:06 +0000)]

Merge "Add metrics event for trampoline activity" into oc-dr1-dev
am: 44f7badb73

Change-Id: I3b05e624a77b66537e458ce87593c9a07058fbe3

commit | commitdiff | tree

Matthew Fritze [Wed, 26 Jul 2017 19:58:20 +0000 (19:58 +0000)]

Merge "Add metrics event for trampoline activity" into oc-dr1-dev

commit | commitdiff | tree

Sungsoo Lim [Wed, 26 Jul 2017 18:54:19 +0000 (18:54 +0000)]

Merge "Fix NPE in MediaRouterService" into oc-dr1-dev
am: bba60fadc7

Change-Id: I28dbb73021ea5bfeec3fda3e35849ad446d65102

commit | commitdiff | tree

Sungsoo [Wed, 26 Jul 2017 18:51:16 +0000 (18:51 +0000)]

Merge "Restore the selected route when an app starts to make sound" into oc-dr1-dev
am: d7ff18dac8

Change-Id: I52a17de61821c72e97336eb66f34a56444e13894

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 18:47:26 +0000 (18:47 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: b978569fce -s ours

Change-Id: I4f5887b8444b16dab976ba9cb9383f68bc2a9f59

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 18:41:38 +0000 (18:41 +0000)]

Merge "Fix NPE in MediaRouterService" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 18:40:20 +0000 (18:40 +0000)]

Merge "Restore the selected route when an app starts to make sound" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 18:39:16 +0000 (18:39 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 18:02:05 +0000 (11:02 -0700)]

Import translations. DO NOT MERGE

Change-Id: I13f52e0726334b4ff47a780e3d5c41074d96aada
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 18:01:07 +0000 (11:01 -0700)]

Import translations. DO NOT MERGE

Change-Id: I8b8dd3e35096ba23f1dd7cc01beba7b392167591
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 18:00:00 +0000 (11:00 -0700)]

Import translations. DO NOT MERGE

Change-Id: Iebfe4076b754c857472076b3aa9d9fd0b491e6f7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:57:20 +0000 (10:57 -0700)]

Import translations. DO NOT MERGE

Change-Id: I9be29c557742c6c1d233376f49088bcb3309bfb3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:52:38 +0000 (17:52 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 900d7157c0 -s ours

Change-Id: I755f5b84aa8444d48a7c1c34db9ae5d70a9b7aa9

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:42:20 +0000 (10:42 -0700)]

Import translations. DO NOT MERGE

Change-Id: I9273d1c9e96d398653e3846dcdfdf2df5a070a57
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:40:40 +0000 (10:40 -0700)]

Import translations. DO NOT MERGE

Change-Id: If6893b7757cc431a56096d7c708f600d3f2f8575
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:35:27 +0000 (17:35 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 56b37be1c9 -s ours

Change-Id: Iae044e0aa00c834d4ba2a326eab390ff820bd907

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:31:35 +0000 (17:31 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 2a2845a483 -s ours

Change-Id: Icdcd43fdc8d15c24c38752005e6ef249913c3125

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 17:31:03 +0000 (17:31 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:23:59 +0000 (10:23 -0700)]

Import translations. DO NOT MERGE

Change-Id: I7a677eabfe97553a7bddecfa88064d5e4edd37b6
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:04:20 +0000 (17:04 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

commit | commitdiff | tree

Adrian Roos [Wed, 26 Jul 2017 16:57:06 +0000 (16:57 +0000)]

Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev
am: afda883f86

Change-Id: Ifc073571a999d5c99a2f4b364691b15e070bf95f

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 16:56:39 +0000 (16:56 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 16:39:56 +0000 (16:39 +0000)]

Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev

commit | commitdiff | tree

Beverly [Wed, 26 Jul 2017 15:43:34 +0000 (15:43 +0000)]

Merge "Volume dialog doesn't show on ambient/aod." into oc-dr1-dev
am: 382644aa74

Change-Id: I024b10373afa5dfd7255d0dccddb1bb653d496b4

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 15:34:32 +0000 (15:34 +0000)]

Merge "Volume dialog doesn't show on ambient/aod." into oc-dr1-dev

commit | commitdiff | tree

Geoffrey Pitsch [Wed, 26 Jul 2017 14:39:17 +0000 (14:39 +0000)]

Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev
am: 0d5c1490ce

Change-Id: Iff93082f1d38becfc498fd7ba0d417ed88955c25

commit | commitdiff | tree

Geoffrey Pitsch [Wed, 26 Jul 2017 14:31:23 +0000 (14:31 +0000)]

Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 14:30:33 +0000 (07:30 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ia3879f9882a8fde1edcc669f31b4cb5125786ea5
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 14:27:44 +0000 (07:27 -0700)]

Import translations. DO NOT MERGE

Change-Id: I76674f28e858f631f43f88f041ce0b6798b30def
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Geoffrey Pitsch [Mon, 24 Jul 2017 15:24:21 +0000 (11:24 -0400)]

Remove ability to downgrade importance of existing channel.

Test: runtest systemui-notification
Bug: 63920384
Change-Id: Ic9f5c50c3d2a36ccd4ba9686dad1eb415b559215

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 14:26:35 +0000 (07:26 -0700)]

Import translations. DO NOT MERGE

Change-Id: I5232ba3964ba77e81d70d325f34630a153d2b22d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bryce Lee [Wed, 26 Jul 2017 14:26:18 +0000 (14:26 +0000)]

Merge "Do not report app bound differences as a Configuration change." into oc-dr1-dev
am: 512e5d1b9b

Change-Id: I2853f3545e7250d2d6f0a17399e4073c83d431a7

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 14:25:10 +0000 (07:25 -0700)]

Import translations. DO NOT MERGE

Change-Id: Iddda7b19049b1fc773e56eada5c4100ae14b39da
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bryce Lee [Wed, 26 Jul 2017 14:20:31 +0000 (14:20 +0000)]

Merge "Do not report app bound differences as a Configuration change." into oc-dr1-dev

commit | commitdiff | tree

Adrian Roos [Wed, 26 Jul 2017 11:53:34 +0000 (11:53 +0000)]

Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev
am: dd22dcbcdf

Change-Id: I2760a5efce65ba88fcb49589eec9071fc052ddc9

commit | commitdiff | tree

Adrian Roos [Wed, 26 Jul 2017 11:47:01 +0000 (11:47 +0000)]

Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev

commit | commitdiff | tree

Antony Sargent [Wed, 26 Jul 2017 11:02:16 +0000 (11:02 +0000)]

Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev
am: 1e74fdb684

Change-Id: I0ccabd7441257ae1631ad8b362b64be37cf1a386

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 10:53:34 +0000 (10:53 +0000)]

Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:25:13 +0000 (08:25 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae -s ours
am: 4d00a9512a -s ours

Change-Id: I30da215979e10c5ea3ad63cc24c46dfe1a0a9ceb

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 08:21:12 +0000 (08:21 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186 -s ours am: 0ad45f6f76 -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 08:20:16 +0000 (08:20 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae -s ours am: 799144a18b -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:19:41 +0000 (08:19 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186 -s ours
am: 0ad45f6f76 -s ours

Change-Id: I95efa84b8030ee19fd38e900466dadf0348cb309

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:18:47 +0000 (08:18 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae -s ours
am: 799144a18b -s ours

Change-Id: I01e221dcc0d669bc37882e5b15bfcd0c305725c5

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:17:46 +0000 (08:17 +0000)]

Import translations. DO NOT MERGE am: 7c2b27f26f -s ours
am: 090feca7b5 -s ours

Change-Id: I393ed981f7f52e9ac81f8aac11c3f4108ce681e4

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:14:11 +0000 (08:14 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186 -s ours
am: 5bbc5fe521 -s ours

Change-Id: I43cb6a9c7ea06c02575a53816cd649c6e0a4c2c2

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:12:15 +0000 (08:12 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: a7f60741ae -s ours

Change-Id: I30a22e1c267bc9e8bd287c48410cf9c475abdde0