OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours am...
Bill Yi [Thu, 27 Jul 2017 00:04:28 +0000 (00:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66  -s ours am: 9cf9d294ef  -s ours
am: e2f2fbaea1  -s ours

Change-Id: I418d14c7d7be86a26a54cdec8a17b4cf1696c856

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours am...
Bill Yi [Wed, 26 Jul 2017 23:55:29 +0000 (23:55 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32  -s ours am: 8080362358  -s ours
am: 0ceb3853e8  -s ours

Change-Id: Ib201207aeb25acd4b29f5768511d764ea5228934

6 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours
Bill Yi [Wed, 26 Jul 2017 23:44:22 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103  -s ours
am: 995029b529  -s ours

Change-Id: I55aad5355130ace0d3b8826620b1bf1d0470ce23

6 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours
Bill Yi [Wed, 26 Jul 2017 23:38:39 +0000 (23:38 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602  -s ours
am: aec51f497c  -s ours

Change-Id: Iee66d395f034e3898ca805e4e7d6be141aec17bb

6 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903 -s ours
Bill Yi [Wed, 26 Jul 2017 23:33:53 +0000 (23:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903  -s ours
am: 18b818e2dd  -s ours

Change-Id: Id9ad618535461c7d0b60bf324d286980073ab52f

6 years agoMerge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125 -s...
Bill Yi [Wed, 26 Jul 2017 23:15:22 +0000 (23:15 +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: If913cec6881240926b3866eccd4f2680c96bc1f7

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours
Bill Yi [Wed, 26 Jul 2017 23:07:26 +0000 (23:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66  -s ours
am: 9cf9d294ef  -s ours

Change-Id: I559573199120374e303bfaae5d5c18660dbb369e

6 years agoMerge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev...
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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours
Bill Yi [Wed, 26 Jul 2017 22:55:38 +0000 (22:55 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32  -s ours
am: 8080362358  -s ours

Change-Id: I8243f6ee311cd730ace4f9bca4693ccdabfa7523

6 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Wed, 26 Jul 2017 22:52:44 +0000 (22:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 3875d1a103  -s ours

Change-Id: Ife54f4e800fd4b81c5639984937096945f063d1d

6 years agoMerge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: a1bde91384...
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

6 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: a1bde91384 -s ours
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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 26 Jul 2017 22:46:32 +0000 (22:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: fb02073a66  -s ours

Change-Id: I497f27dc7f50f9914b5157a4846c05ef4091abfd

6 years agoMerge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545...
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

6 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545 -s ours
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

6 years agoMerge "Import translations. DO NOT MERGE am: 495d4ce1b9 -s ours am: 120c3e9874 ...
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

6 years agoMerge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125 -s...
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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 26 Jul 2017 22:39:30 +0000 (22:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoImport translations. DO NOT MERGE am: 495d4ce1b9 -s ours
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

6 years agoMerge "Revert "Update overscroll and toast UI"" into oc-dr1-dev
Aurimas Liutikas [Wed, 26 Jul 2017 22:36:59 +0000 (22:36 +0000)]
Merge "Revert "Update overscroll and toast UI"" into oc-dr1-dev

6 years agoMerge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
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

6 years agoRevert "Update overscroll and toast UI"
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 26 Jul 2017 22:21:32 +0000 (22:21 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 4ba2bc4d32  -s ours

Change-Id: Ib331eb4cf8882b271b11b756c43818a5b38c1664

6 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 22:16:34 +0000 (22:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

6 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 22:14:51 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

6 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 22:13:05 +0000 (22:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

6 years agoMerge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125 -s...
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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
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

6 years agoMerge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 21:59:35 +0000 (21:59 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

6 years agoImport translations. DO NOT MERGE
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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 26 Jul 2017 21:50:54 +0000 (21:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 21:48:22 +0000 (21:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 26 Jul 2017 21:36:36 +0000 (21:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge "Text color of "shutdown" after removing overlay" into oc-dr1-dev
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

6 years agoText color of "shutdown" after removing overlay
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

6 years agoMerge "Read the correct parameters for Jobscheduler" into oc-dr1-dev
Suprabh Shukla [Wed, 26 Jul 2017 20:25:07 +0000 (20:25 +0000)]
Merge "Read the correct parameters for Jobscheduler" into oc-dr1-dev

6 years agoMerge "Add metrics event for trampoline activity" into oc-dr1-dev
Matthew Fritze [Wed, 26 Jul 2017 19:58:20 +0000 (19:58 +0000)]
Merge "Add metrics event for trampoline activity" into oc-dr1-dev

6 years agoMerge "Fix NPE in MediaRouterService" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 18:41:38 +0000 (18:41 +0000)]
Merge "Fix NPE in MediaRouterService" into oc-dr1-dev

6 years agoMerge "Restore the selected route when an app starts to make sound" into oc-dr1-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 18:39:16 +0000 (18:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 18:03:33 +0000 (11:03 -0700)]
Import translations. DO NOT MERGE

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

6 years agoImport translations. DO NOT MERGE
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 17:37:56 +0000 (10:37 -0700)]
Import translations. DO NOT MERGE

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

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 17:36:27 +0000 (10:36 -0700)]
Import translations. DO NOT MERGE

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

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 17:31:03 +0000 (17:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoImport translations. DO NOT MERGE
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

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 17:04:20 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 16:56:39 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoMerge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev
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

6 years agoMerge "Volume dialog doesn't show on ambient/aod." into oc-dr1-dev
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

6 years agoMerge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoRemove ability to downgrade importance of existing channel.
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoMerge "Do not report app bound differences as a Configuration change." into oc-dr1-dev
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

6 years agoMerge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev
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

6 years agoMerge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 10:53:34 +0000 (10:53 +0000)]
Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Wed, 26 Jul 2017 08:07:22 +0000 (08:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: b4e8cad186  -s ours

Change-Id: I8421a6ad828df9c491665144533931352a6196f1

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 08:03:38 +0000 (08:03 +0000)]
Import translations. DO NOT MERGE
am: 7c2b27f26f  -s ours

Change-Id: I9711ab0a99f2309c7e61e3548d7a16f3e555d166

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 26 Jul 2017 08:03:03 +0000 (08:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 26 Jul 2017 07:53:12 +0000 (07:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

6 years ago@Keep all the things in TestAccessPointBuilder
Antony Sargent [Tue, 18 Jul 2017 22:28:46 +0000 (15:28 -0700)]
@Keep all the things in TestAccessPointBuilder

The test in packages/apps/Settings/tests/unit/src/com/android/settings/
wifi/WifiSettingsUiTest.java fails because the TestAccessPointBuilder
class and all methods in it seem to get stripped during build time
since they aren't referenced by code within the settings app itself.

Bug: 33245941
Test: runtest --path packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: I22b7e9fa54fcd67e0f754aca47907d87db9d7056
Merged-In: I92b56b7908e5be8a3553a2779646d48bb5b94f01

6 years agoMerge "Remove Kwasio (nmg) from user-selectable languages" into oc-dr1-dev
Roozbeh Pournader [Wed, 26 Jul 2017 05:44:41 +0000 (05:44 +0000)]
Merge "Remove Kwasio (nmg) from user-selectable languages" into oc-dr1-dev

6 years agoMerge "Update overscroll and toast UI" into oc-dr1-dev
Chet Haase [Wed, 26 Jul 2017 05:40:41 +0000 (05:40 +0000)]
Merge "Update overscroll and toast UI" into oc-dr1-dev

6 years agoUpdate overscroll and toast UI
Chet Haase [Fri, 21 Jul 2017 17:45:31 +0000 (10:45 -0700)]
Update overscroll and toast UI

Overscroll updates:
Same shape, but smaller radius (doesn't come as far into the view)
and more translucent (max 15% instead of 50%). Overall, more subtle.

Toast updates:
Light background, smaller, dark font, closer to the bottom of the
container.

Test: manual unit tests. Also:
cts test ToastTest for toast changes
cts test EdgeEffectTests for EdgeEffect changes (adding some tests to
known-failures for now, due to brittle golden-image failures - see
CL ag/2596621)
Bug: 30563264  Refresh toast visuals for Android ODR
Bug: 63010438  Tweaks to overscroll animation
Change-Id: I0fac6322b0b81d030c8d174852c134211290bbea

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 04:24:47 +0000 (21:24 -0700)]
Import translations. DO NOT MERGE

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

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 04:17:50 +0000 (21:17 -0700)]
Import translations. DO NOT MERGE

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

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 04:15:58 +0000 (21:15 -0700)]
Import translations. DO NOT MERGE

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

6 years agoMerge "Ensure that we timeout waiting when starting the PiP menu activity" into oc...
Winson Chung [Wed, 26 Jul 2017 04:01:48 +0000 (04:01 +0000)]
Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev

6 years agoMerge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev
Christine Franks [Wed, 26 Jul 2017 02:39:09 +0000 (02:39 +0000)]
Merge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev

6 years agoDon't block the input thread to notify the StatusBar about key events.
Philip Quinn [Fri, 21 Jul 2017 04:07:58 +0000 (21:07 -0700)]
Don't block the input thread to notify the StatusBar about key events.

Also, give it a ping for volume key events.

Bug: 63183852
Bug: 63909062
Test: runtest systemui

Change-Id: I3e8507ad8fc23cf3078313b500b5012afc84fa07

6 years agoMerge "Themable volume and power dialogs" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 02:18:10 +0000 (02:18 +0000)]
Merge "Themable volume and power dialogs" into oc-dr1-dev

6 years agoMerge "Keyguard should wait before restarting FP auth after successful FP auth" into...
TreeHugger Robot [Wed, 26 Jul 2017 02:16:55 +0000 (02:16 +0000)]
Merge "Keyguard should wait before restarting FP auth after successful FP auth" into oc-dr1-dev

6 years agoFix NPE in MediaRouterService
Sungsoo Lim [Tue, 25 Jul 2017 00:09:03 +0000 (09:09 +0900)]
Fix NPE in MediaRouterService

Bug: 63970300
Test: manual and passed MediaRouterTest
Change-Id: I2e8d09d16ca8693b1bdf51397ad4f10c4aa6d87b
(cherry picked from commit 2d36ae9d2f2e286c205adb20af23eebe554f3dd8)

6 years agoRestore the selected route when an app starts to make sound
Sungsoo [Mon, 22 May 2017 08:10:44 +0000 (17:10 +0900)]
Restore the selected route when an app starts to make sound

Limitation: When two apps make sound simultaneously while one uses a BT
route and the other uses the default route, switching activities between
the two different apps will not change the BT A2DP status until one of
the apps changes its playback status to inactive.

Bug: 32958908, Bug: 35567695, Bug: 33186346
Test: Passed MediaRouter/MediaSession test, and manually varified that
      the b/33186346 is fixed.
Change-Id: I1da97dcb74fa2095425b311ad62cdd00f8118cea
(cherry picked from commit b3658569e9a87afe1b3168837cc282235fd4d1f8)

6 years agoMerge "DO NOT MERGE - Remove RetailDemoModeServiceInternal" into oc-dr1-dev
Christine Franks [Wed, 26 Jul 2017 00:07:14 +0000 (00:07 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeServiceInternal" into oc-dr1-dev

6 years agoThemable volume and power dialogs
Lucas Dupin [Tue, 25 Jul 2017 00:44:25 +0000 (17:44 -0700)]
Themable volume and power dialogs

Test: visual
Bug: 63903361
Change-Id: I3e4dc74e960f212985712120341d3a80543c96db

6 years agoRemove Kwasio (nmg) from user-selectable languages
Roozbeh Pournader [Tue, 25 Jul 2017 23:29:22 +0000 (16:29 -0700)]
Remove Kwasio (nmg) from user-selectable languages

The language had inadequate locale data, and even the name
of the Kwasio language itself was not localized to Kwasio.

Change-Id: I7b92460b7b3d736593db4a2f94d47863264561b4
Fixes: 64037672
Test: Manual (Kwasio, as 'Nmg', is no longer listed in Settings)

6 years agoMerge "Add confirmation dialog when turning off cell data from QS" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 22:55:08 +0000 (22:55 +0000)]
Merge "Add confirmation dialog when turning off cell data from QS" into oc-dr1-dev

6 years agoMerge "Changing the way the media image scales" into oc-dr1-dev
Selim Cinek [Tue, 25 Jul 2017 22:45:55 +0000 (22:45 +0000)]
Merge "Changing the way the media image scales" into oc-dr1-dev

6 years agoMerge "Do not evict scan results in cold start." into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 22:41:39 +0000 (22:41 +0000)]
Merge "Do not evict scan results in cold start." into oc-dr1-dev

6 years agoMerge "Fix RTL for Nav icons" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 22:35:18 +0000 (22:35 +0000)]
Merge "Fix RTL for Nav icons" into oc-dr1-dev

6 years agoEnsure that we timeout waiting when starting the PiP menu activity
Winson Chung [Tue, 25 Jul 2017 21:28:03 +0000 (14:28 -0700)]
Ensure that we timeout waiting when starting the PiP menu activity

- In some cases we don't get notified when the menu activity start is
  interrupted.  In such a case, we should timeout and allow for the next
  menu activity start to complete, and log the issue.

Bug: 63752800
Test: Artificially induce missed callback, ensure that we can still
      launch the PiP activity afterwards.

Change-Id: Id92890a53ce47c4e9f593a5434fd8f9137468799

6 years agoDO NOT MERGE - Remove RetailDemoModeServiceInternal
Christine Franks [Thu, 20 Jul 2017 21:01:55 +0000 (14:01 -0700)]
DO NOT MERGE - Remove RetailDemoModeServiceInternal

Bug: 62712426
Test: make -j100
Change-Id: I0b852aef30a8cadcda08fcff1dcf861aac2a4d7e

6 years agoRead the correct parameters for Jobscheduler
Suprabh Shukla [Tue, 25 Jul 2017 21:07:13 +0000 (21:07 +0000)]
Read the correct parameters for Jobscheduler

Jobscheduler reads ALARM_MANAGER_CONSTANTS every time it detects a
change in JOB_SCHEDULER_CONSTANTS

Fixes: 64028341

Change-Id: Ic55204858f2dcbf348406b4c100e598381f0b4b8

6 years agoMerge "Don't unbind from the sync adapter before cancelSync()." into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 20:49:39 +0000 (20:49 +0000)]
Merge "Don't unbind from the sync adapter before cancelSync()." into oc-dr1-dev