OSDN Git Service

android-x86/frameworks-base.git
8 years agoDon\'t reset layout params when repositioning
Jorim Jaggi [Mon, 25 Jul 2016 22:45:02 +0000 (22:45 +0000)]
Don\'t reset layout params when repositioning
am: 90dfb89916

Change-Id: Ic6f20e06700728935bb0bfc3bc983b068d05079b

8 years agoMerge \\"Fix code tags that contain html encoded characters, and fix at links.\\...
Dirk Dougherty [Mon, 25 Jul 2016 22:44:57 +0000 (22:44 +0000)]
Merge \\"Fix code tags that contain html encoded characters, and fix at links.\\" into nyc-dev am: fc0bc7bf96
am: dd756c26e2

Change-Id: I52d47ffe259c163031a931f566f0eaa9fa0657e2

8 years agoresolve merge conflicts of c4ae782 to nyc-dev-plus-aosp
Elliot Waite [Mon, 25 Jul 2016 22:39:04 +0000 (22:39 +0000)]
resolve merge conflicts of c4ae782 to nyc-dev-plus-aosp
am: 66641f8ec5

Change-Id: Ie46a3e22905ba61eedb1c5b26a838d77c680d829

8 years agoresolve merge conflicts of c88afb6 to nyc-mr1-dev-plus-aosp
Dirk Dougherty [Mon, 25 Jul 2016 20:10:42 +0000 (13:10 -0700)]
resolve merge conflicts of c88afb6 to nyc-mr1-dev-plus-aosp

Change-Id: I4f9e194d2e07852799cafabae7289a61cae18bb3

8 years agoresolve merge conflicts of c4ae782 to nyc-dev-plus-aosp
Dirk Dougherty [Mon, 25 Jul 2016 20:47:53 +0000 (13:47 -0700)]
resolve merge conflicts of c4ae782 to nyc-dev-plus-aosp

Change-Id: Ib81e71e0b9a17a4231d93f02f41c7722fad84ec3

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
Bill Yi [Mon, 25 Jul 2016 17:15:31 +0000 (17:15 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: a2d4d0b599  -s ours

Change-Id: I61ff6cde5c1e725d4c5f5cdf8bbc18f7ddcd5815

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Jul 2016 17:15:28 +0000 (17:15 +0000)]
Import translations. DO NOT MERGE
am: da6099ec45  -s ours

Change-Id: I31e6241df14f4ff88fc81884367f56c5c29b58de

8 years agoMerge \"Fix code tags that contain html encoded characters, and fix at links.\" into...
Elliot Waite [Mon, 25 Jul 2016 17:14:58 +0000 (17:14 +0000)]
Merge \"Fix code tags that contain html encoded characters, and fix at links.\" into nyc-dev
am: fc0bc7bf96

Change-Id: Id9bf642ea3d5105efbfa4663ced5c6f660e0fd7f

8 years agoFix code tags that contain html encoded characters, and fix at links.
Elliot Waite [Mon, 25 Jul 2016 17:14:56 +0000 (17:14 +0000)]
Fix code tags that contain html encoded characters, and fix at links.
am: c4ae7827e2

Change-Id: I9d5adc8d151a6d6ed1b8f81630bbf8a93329f181

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
Bill Yi [Mon, 25 Jul 2016 17:00:37 +0000 (17:00 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: f968d50316  -s ours

Change-Id: Iaabf52aa58d57eba60e82e574ac32b9369aa8f3e

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Jul 2016 17:00:33 +0000 (17:00 +0000)]
Import translations. DO NOT MERGE
am: 9d1117531d  -s ours

Change-Id: Ied6a0ad5a2cf96f05ddb99e00d263d3fb76685f0

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
Bill Yi [Mon, 25 Jul 2016 17:00:28 +0000 (17:00 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: bc3ae84aeb  -s ours

Change-Id: Ie02f25016bae9a1c54b475fed3f252bc3942adb0

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Jul 2016 17:00:24 +0000 (17:00 +0000)]
Import translations. DO NOT MERGE
am: 48ca6ecfdd  -s ours

Change-Id: I50f90f0a203cc1eef797b39a539aaa77f431ae64

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
Bill Yi [Mon, 25 Jul 2016 17:00:20 +0000 (17:00 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 0f840998b1  -s ours

Change-Id: I1aa6f6c4f9ccd70e39b38c7aeb461e35e1046e04

8 years agoMerge "Fix code tags that contain html encoded characters, and fix at links." into...
Dirk Dougherty [Mon, 25 Jul 2016 17:00:18 +0000 (17:00 +0000)]
Merge "Fix code tags that contain html encoded characters, and fix at links." into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Jul 2016 17:00:17 +0000 (17:00 +0000)]
Import translations. DO NOT MERGE
am: 148b5baa6d  -s ours

Change-Id: I5d389606379097f891ac05b4a3bd1fe0a14e5616

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Mon, 25 Jul 2016 16:51:05 +0000 (16:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Mon, 25 Jul 2016 16:50:42 +0000 (16:50 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Mon, 25 Jul 2016 16:50:24 +0000 (16:50 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Mon, 25 Jul 2016 16:46:27 +0000 (16:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge \"Add support for round scroll bars to View.java\" into nyc-mr1-dev
Aga Madurska [Mon, 25 Jul 2016 16:40:01 +0000 (16:40 +0000)]
Merge \"Add support for round scroll bars to View.java\" into nyc-mr1-dev
am: 8ec317e220

Change-Id: I3a3db1106b4a3b009b54559189155a7fbefff977

8 years agoAdd support for round scroll bars to View.java
Aga Madurska [Mon, 25 Jul 2016 16:39:58 +0000 (16:39 +0000)]
Add support for round scroll bars to View.java
am: b19d0f9800

Change-Id: I23faff9b31a9a71c767aaabca69774f8582bfdb2

8 years agoMerge "Add support for round scroll bars to View.java" into nyc-mr1-dev
Agnieszka Madurska [Mon, 25 Jul 2016 16:31:35 +0000 (16:31 +0000)]
Merge "Add support for round scroll bars to View.java" into nyc-mr1-dev

8 years agoMerge \\"Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manife...
Kevin Hufnagle [Mon, 25 Jul 2016 16:09:30 +0000 (16:09 +0000)]
Merge \\"Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc.\\\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a\\" into nyc-dev am: 30588da701
am: 29d74d6490

Change-Id: I66dd02cc039305c93d49744019ba9c589b4d7b20

8 years agoMerge "Merge \\"Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android...
Android Build Merger (Role) [Mon, 25 Jul 2016 16:04:01 +0000 (16:04 +0000)]
Merge "Merge \\"Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc.\\\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a\\" into nyc-dev am: 30588da701 am: 0837e3ee9f" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manife...
Kevin Hufnagle [Mon, 25 Jul 2016 16:03:41 +0000 (16:03 +0000)]
Merge \\"Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc.\\\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a\\" into nyc-dev am: 30588da701
am: 0837e3ee9f

Change-Id: Ieb085590082f77889e0d0480e0024c318009b821

8 years agoMerge "Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest...
Android Build Merger (Role) [Mon, 25 Jul 2016 16:02:43 +0000 (16:02 +0000)]
Merge "Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc.\\\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a am: 616ba9d22b am: f16f31b643" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge \\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest...
Android Build Merger (Role) [Mon, 25 Jul 2016 16:02:20 +0000 (16:02 +0000)]
Merge "Merge \\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480\\" into nyc-dev am: aa57295104 am: 00f04508da" into nyc-mr1-dev-plus-aosp

8 years agoMerge "docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am...
Android Build Merger (Role) [Mon, 25 Jul 2016 16:02:04 +0000 (16:02 +0000)]
Merge "docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480 am: 15865b5c67 am: 83cd591aa2" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest...
Android Build Merger (Role) [Mon, 25 Jul 2016 16:01:53 +0000 (16:01 +0000)]
Merge "Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc.\\\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a am: 616ba9d22b am: 39c3cf6914" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge \\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest...
Android Build Merger (Role) [Mon, 25 Jul 2016 16:01:41 +0000 (16:01 +0000)]
Merge "Merge \\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480\\" into nyc-dev am: aa57295104 am: ed0eb35760" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest...
Android Build Merger (Role) [Mon, 25 Jul 2016 16:01:33 +0000 (16:01 +0000)]
Merge "Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc.\\\\" into mnc-io-docs am: c46ee88f9a am: c59557649c am: 29df77dd86 am: 92cdc875ca" into nyc-mr1-dev-plus-aosp

8 years agoMerge "docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am...
Android Build Merger (Role) [Mon, 25 Jul 2016 16:01:29 +0000 (16:01 +0000)]
Merge "docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480 am: 15865b5c67 am: bb09bc1844" into nyc-mr1-dev-plus-aosp

8 years agoMerge "docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am...
Android Build Merger (Role) [Mon, 25 Jul 2016 16:01:19 +0000 (16:01 +0000)]
Merge "docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: 22be9b1a87 am: b65288fcb5 am: c0c9e529db" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc...
Kevin Hufnagle [Mon, 25 Jul 2016 16:00:27 +0000 (16:00 +0000)]
Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc.\\\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a am: 616ba9d22b
am: f16f31b643

Change-Id: Ia27e2660da9bce190a4f1ef00063f05908d54e30

8 years agoMerge \\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc...
Kevin Hufnagle [Mon, 25 Jul 2016 16:00:23 +0000 (16:00 +0000)]
Merge \\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480\\" into nyc-dev am: aa57295104
am: 00f04508da

Change-Id: I4e41e8f9727ac536c4e82d330f0b71ba3b32e64a

8 years agoMerge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc...
Kevin Hufnagle [Mon, 25 Jul 2016 16:00:20 +0000 (16:00 +0000)]
Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc.\\\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a am: 616ba9d22b
am: 39c3cf6914

Change-Id: Idb26480f3b8ee14c74e8ad7f1964b7f9bc3c6c86

8 years agodocs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf3...
Kevin Hufnagle [Mon, 25 Jul 2016 16:00:18 +0000 (16:00 +0000)]
docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480 am: 15865b5c67
am: 83cd591aa2

Change-Id: I1cc06fe60744773aa4958a9e6dcd6ad5fcb9ff86

8 years agoMerge \\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc...
Kevin Hufnagle [Mon, 25 Jul 2016 16:00:17 +0000 (16:00 +0000)]
Merge \\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480\\" into nyc-dev am: aa57295104
am: ed0eb35760

Change-Id: I870b0e3e44be97b5a462a43318d3658e3d7d4570

8 years agodocs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf3...
Kevin Hufnagle [Mon, 25 Jul 2016 16:00:15 +0000 (16:00 +0000)]
docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480 am: 15865b5c67
am: bb09bc1844

Change-Id: I629d8c59c107dde1586da8275335486f8c8502be

8 years agoMerge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc...
Kevin Hufnagle [Mon, 25 Jul 2016 16:00:14 +0000 (16:00 +0000)]
Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc.\\\\" into mnc-io-docs am: c46ee88f9a am: c59557649c am: 29df77dd86
am: 92cdc875ca

Change-Id: I7cdc5f957234d09daf0c8cea61dfd0001a660f0c

8 years agoMerge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc...
Kevin Hufnagle [Mon, 25 Jul 2016 16:00:13 +0000 (16:00 +0000)]
Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc.\\\\" into mnc-io-docs am: c46ee88f9a am: c59557649c am: 29df77dd86
am: 904359a7d8

Change-Id: Ic5a7452c92daea87dbb35d3505248fe5e838da63

8 years agodocs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf3...
Kevin Hufnagle [Mon, 25 Jul 2016 16:00:10 +0000 (16:00 +0000)]
docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: 22be9b1a87 am: b65288fcb5
am: c0c9e529db

Change-Id: I96a342cd1141aab6774c8995753047f2a8f7c6aa

8 years agodocs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf3...
Kevin Hufnagle [Mon, 25 Jul 2016 16:00:10 +0000 (16:00 +0000)]
docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: 22be9b1a87 am: b65288fcb5
am: 0ae0f4044b

Change-Id: Ia223466cd55f2ffa9a41d27861eb5e3c64c7c59d

8 years agoMerge \"Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest...
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:57 +0000 (15:53 +0000)]
Merge \"Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a\" into nyc-dev
am: 30588da701

Change-Id: I1b3bbeab2964c0712d59abab76f43d0d13ddb7d6

8 years agoMerge \"Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest...
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:57 +0000 (15:53 +0000)]
Merge \"Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a\" into nyc-dev
am: 30588da701

Change-Id: I252f462a12d2381ac01a966f5787bff9e2a60cd5

8 years agoMerge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc....
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:45 +0000 (15:53 +0000)]
Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a
am: 616ba9d22b

Change-Id: I43d14c18de0fd9f5168e5a1350713e36515dedcc

8 years agoMerge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc....
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:43 +0000 (15:53 +0000)]
Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a
am: 616ba9d22b

Change-Id: I5656f3aaba73ccdc6ac5b98158bc5ff1220b67e5

8 years agoMerge \"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am...
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:25 +0000 (15:53 +0000)]
Merge \"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480\" into nyc-dev
am: aa57295104

Change-Id: I844fe4bdfd6fef705ce0450ae71a8a9fa1c76ee0

8 years agoMerge \"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am...
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:24 +0000 (15:53 +0000)]
Merge \"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480\" into nyc-dev
am: aa57295104

Change-Id: I87db649cfa3c4ea702cb0b0ae40d65aec2cc5619

8 years agodocs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350...
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:17 +0000 (15:53 +0000)]
docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480
am: 15865b5c67

Change-Id: I036e11173b14975721c542973cb794aaf3f1b44a

8 years agodocs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350...
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:17 +0000 (15:53 +0000)]
docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480
am: 15865b5c67

Change-Id: I7a4149cae91c3564c6c6fa88c2cfa1d7bad2fe30

8 years agoMerge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc....
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:10 +0000 (15:53 +0000)]
Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am: c46ee88f9a am: c59557649c
am: 29df77dd86

Change-Id: Ic45e915b80fd0ca6ab30868fc8b3e103f106f4c9

8 years agoMerge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc....
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:10 +0000 (15:53 +0000)]
Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am: c46ee88f9a am: c59557649c
am: 29df77dd86

Change-Id: I219ea7001581bdd0eb1fa3e6cfd7f3a7bda63ed3

8 years agodocs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350...
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:07 +0000 (15:53 +0000)]
docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350 am: 22be9b1a87
am: b65288fcb5

Change-Id: Ia2e1fd9035cd9eeda2173871eab80da73c89c613

8 years agodocs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350...
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:06 +0000 (15:53 +0000)]
docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350 am: 22be9b1a87
am: b65288fcb5

Change-Id: I34605fa43f1c4ddd26baa7f4d06760cdb602d41e

8 years agoMerge "Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc...
Android Build Merger (Role) [Mon, 25 Jul 2016 15:46:55 +0000 (15:46 +0000)]
Merge "Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a" into nyc-dev

8 years agoMerge "docs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51...
Android Build Merger (Role) [Mon, 25 Jul 2016 15:46:33 +0000 (15:46 +0000)]
Merge "docs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480" into nyc-dev

8 years agoMerge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\"...
Kevin Hufnagle [Mon, 25 Jul 2016 15:45:56 +0000 (15:45 +0000)]
Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am: c46ee88f9a
am: 260e77f68a

Change-Id: Id931a4e007b696368cb7a074e3dcc11d6ac896eb

8 years agodocs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf350
Kevin Hufnagle [Mon, 25 Jul 2016 15:45:51 +0000 (15:45 +0000)]
docs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf350
am: e059c15480

Change-Id: Ic42a2ab9c49b3c40b5743f095d17be90a3414ad9

8 years agoMerge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\"...
Kevin Hufnagle [Mon, 25 Jul 2016 15:45:47 +0000 (15:45 +0000)]
Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am: c46ee88f9a
am: c59557649c

Change-Id: Icfd32ab1899fd098a9afc3532f8c29accf17b56d

8 years agodocs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf350
Kevin Hufnagle [Mon, 25 Jul 2016 15:45:45 +0000 (15:45 +0000)]
docs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf350
am: 22be9b1a87

Change-Id: Ie27aa01933ac6f8854efb626d8bb776af6d1cf7d

8 years agoMerge \"docs: Fixed option for \"launchMode\" within Android manifest doc.\" into...
Kevin Hufnagle [Mon, 25 Jul 2016 15:39:27 +0000 (15:39 +0000)]
Merge \"docs: Fixed option for \"launchMode\" within Android manifest doc.\" into mnc-io-docs
am: c46ee88f9a

Change-Id: I4197d61f056148f06978c2471b2b1ebf25b37881

8 years agodocs: Fixed option for \"launchMode\" within Android manifest doc.
Kevin Hufnagle [Mon, 25 Jul 2016 15:39:22 +0000 (15:39 +0000)]
docs: Fixed option for \"launchMode\" within Android manifest doc.
am: 7ce51cf350

Change-Id: I1c16676d7a605c8a4c5d7b9bb0b2075c2e0c4355

8 years agoMerge \"docs: Fixed option for \"launchMode\" within Android manifest doc.\" into...
Kevin Hufnagle [Mon, 25 Jul 2016 15:39:20 +0000 (15:39 +0000)]
Merge \"docs: Fixed option for \"launchMode\" within Android manifest doc.\" into mnc-io-docs
am: c46ee88f9a

Change-Id: Ibdfcea6f97b7969d1cc1a4c1ad13b3274c69a80a

8 years agodocs: Fixed option for \"launchMode\" within Android manifest doc.
Kevin Hufnagle [Mon, 25 Jul 2016 15:39:18 +0000 (15:39 +0000)]
docs: Fixed option for \"launchMode\" within Android manifest doc.
am: 7ce51cf350

Change-Id: I013c71c0c64ff66ee5deb9810cd97312ed87b2e4

8 years agoMerge "docs: Fixed option for "launchMode" within Android manifest doc." into mnc...
Kevin Hufnagle [Mon, 25 Jul 2016 15:33:02 +0000 (15:33 +0000)]
Merge "docs: Fixed option for "launchMode" within Android manifest doc." into mnc-io-docs

8 years agoAdd support for round scroll bars to View.java
Aga Madurska [Tue, 19 Jul 2016 14:14:39 +0000 (15:14 +0100)]
Add support for round scroll bars to View.java

Change-Id: If94a29d68cee504f7d31519b96f7b4b8a3af6bfa

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Jul 2016 14:24:09 +0000 (07:24 -0700)]
Import translations. DO NOT MERGE

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

8 years agoDon't reset layout params when repositioning
Jorim Jaggi [Mon, 25 Jul 2016 13:57:36 +0000 (15:57 +0200)]
Don't reset layout params when repositioning

Not needed and leads to important properties being lost.

Change-Id: If2cf63df1ef6fe1357c10eedc8acfcf951fc2fa9
Fixes: 30355267

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Jul 2016 11:23:39 +0000 (04:23 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Jul 2016 11:20:49 +0000 (04:20 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Jul 2016 11:18:00 +0000 (04:18 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge \"Persist master volume mute across reboot\" into nyc-mr1-dev
Tony Mak [Mon, 25 Jul 2016 10:39:34 +0000 (10:39 +0000)]
Merge \"Persist master volume mute across reboot\" into nyc-mr1-dev
am: 0df1d34e6e

Change-Id: I999fbc3df54108387b96bcc009c9bc8befb438c5

8 years agoPersist master volume mute across reboot
Tony Mak [Mon, 25 Jul 2016 10:39:25 +0000 (10:39 +0000)]
Persist master volume mute across reboot
am: c1205111a9

Change-Id: Ia2badcd0fa06e8a8b74ffdfb26e525852d97cf07

8 years agoMerge "Persist master volume mute across reboot" into nyc-mr1-dev
Tony Mak [Mon, 25 Jul 2016 10:31:00 +0000 (10:31 +0000)]
Merge "Persist master volume mute across reboot" into nyc-mr1-dev

8 years agoMerge \\\"bootanimation: Call eglReleaseThread in threadLoop\\\" am: 189bbd9f6d am...
Sai Kiran Korwar [Mon, 25 Jul 2016 03:57:18 +0000 (03:57 +0000)]
Merge \\\"bootanimation: Call eglReleaseThread in threadLoop\\\" am: 189bbd9f6d am: 9495872add
am: 41ebe86049

Change-Id: I7927f23aa76cc17221e557d7f36b95bc23696a1b

8 years agoMerge \\"bootanimation: Call eglReleaseThread in threadLoop\\" am: 189bbd9f6d
Jesse Hall [Mon, 25 Jul 2016 03:53:11 +0000 (03:53 +0000)]
Merge \\"bootanimation: Call eglReleaseThread in threadLoop\\" am: 189bbd9f6d
am: 9495872add

Change-Id: Iaed82af8a48b84972b3b2336a1dc1299851a2f08

8 years agoMerge \"bootanimation: Call eglReleaseThread in threadLoop\"
Sai Kiran Korwar [Mon, 25 Jul 2016 03:46:44 +0000 (03:46 +0000)]
Merge \"bootanimation: Call eglReleaseThread in threadLoop\"
am: 189bbd9f6d

Change-Id: Iaa5b3e60548ee2cce19cb4c31a6274d0ad877189

8 years agoMerge "bootanimation: Call eglReleaseThread in threadLoop"
Jesse Hall [Mon, 25 Jul 2016 03:36:57 +0000 (03:36 +0000)]
Merge "bootanimation: Call eglReleaseThread in threadLoop"

8 years agoMerge \"PIP: Handle layoutDirection changes\" into nyc-mr1-dev
Jaewan Kim [Mon, 25 Jul 2016 00:58:42 +0000 (00:58 +0000)]
Merge \"PIP: Handle layoutDirection changes\" into nyc-mr1-dev
am: 715e07a356

Change-Id: Ic37ec7762a49e4a59c9e699add5d1f5a7c7a8a3e

8 years agoPIP: Handle layoutDirection changes
Jaewan Kim [Mon, 25 Jul 2016 00:58:34 +0000 (00:58 +0000)]
PIP: Handle layoutDirection changes
am: 73ef3516d2

Change-Id: I75b84d9f142f17f4fa19492f668dd3bb302c43cf

8 years agoMerge "PIP: Handle layoutDirection changes" into nyc-mr1-dev
Jaewan Kim [Mon, 25 Jul 2016 00:53:51 +0000 (00:53 +0000)]
Merge "PIP: Handle layoutDirection changes" into nyc-mr1-dev

8 years agoFix crash for some seed values.
Dan Sandler [Sun, 24 Jul 2016 21:30:28 +0000 (21:30 +0000)]
Fix crash for some seed values.
am: 7c2e730f63

Change-Id: Ia755c65d5d47b907eea46df4dff356ccc13a3e66

8 years agoUse a compressed Icon for the notification\'s largeIcon.
Dan Sandler [Sun, 24 Jul 2016 21:30:23 +0000 (21:30 +0000)]
Use a compressed Icon for the notification\'s largeIcon.
am: 1e52909888

Change-Id: I59840e77f69621f6352fe6aacc85ea71a0679ca4

8 years agoGrooming the cats.
Dan Sandler [Sun, 24 Jul 2016 21:30:18 +0000 (21:30 +0000)]
Grooming the cats.
am: 4a1bcd966b

Change-Id: I03ff25c66d45afc60d300ffa93b628a2ef608c82

8 years agoFix crash for some seed values.
Dan Sandler [Sat, 16 Jul 2016 05:25:31 +0000 (01:25 -0400)]
Fix crash for some seed values.

Change-Id: I2f8d0a388a1bfdd4d3111abce7e4bcafe1e9bf3d
Fixes: 30169383

8 years agoUse a compressed Icon for the notification's largeIcon.
Dan Sandler [Sat, 16 Jul 2016 05:01:19 +0000 (01:01 -0400)]
Use a compressed Icon for the notification's largeIcon.

Fixes: 29918548
Change-Id: I2f70011221c7ec96aab8e540cd0213660282b49c

8 years agoGrooming the cats.
Dan Sandler [Sat, 16 Jul 2016 04:39:21 +0000 (00:39 -0400)]
Grooming the cats.

 - Closed up tiny gaps in the vectors
 - Export larger cat PNGs
 - Make it harder to delete cats by accident
 - Properly color the two front/back feet most of the time
   instead of the two left/right

Change-Id: I185bf433d3be004945d6e16387ec928c14376b7a
Fixes: 29922607
Fixes: 30064123
Fixes: 29922111
Fixes: 29922066

8 years agoFix code tags that contain html encoded characters, and fix at links.
Elliot Waite [Fri, 24 Jun 2016 20:52:10 +0000 (13:52 -0700)]
Fix code tags that contain html encoded characters, and fix at links.

Change-Id: I1ab2275ac17d75afaa8f3f0039b26633365bcb3a

8 years agoMerge \"Move SysUI to top app scheduling if panel expanded\" into nyc-mr1-dev
Jorim Jaggi [Fri, 22 Jul 2016 22:59:10 +0000 (22:59 +0000)]
Merge \"Move SysUI to top app scheduling if panel expanded\" into nyc-mr1-dev
am: adc51e460c

Change-Id: I89bc6612e18d0e298d95ed6777d95067c3a9d8c4

8 years agoMove SysUI to top app scheduling if panel expanded
Jorim Jaggi [Fri, 22 Jul 2016 22:59:06 +0000 (22:59 +0000)]
Move SysUI to top app scheduling if panel expanded
am: f6782ee1c8

Change-Id: I61d0afe8669a5d1155425883e79fe756abed7c58

8 years agoMerge "Move SysUI to top app scheduling if panel expanded" into nyc-mr1-dev
Daniel Chapin [Fri, 22 Jul 2016 22:49:36 +0000 (22:49 +0000)]
Merge "Move SysUI to top app scheduling if panel expanded" into nyc-mr1-dev

8 years agoMerge \"Add Settings#ACTION_NIGHT_DISPLAY_SETTINGS\" into nyc-mr1-dev
Justin Klaassen [Fri, 22 Jul 2016 22:13:30 +0000 (22:13 +0000)]
Merge \"Add Settings#ACTION_NIGHT_DISPLAY_SETTINGS\" into nyc-mr1-dev
am: c8c60f5930

Change-Id: Idea9e5fdc4b54cb287ce1d82fdac75ef4bb95750

8 years agoAdd Settings#ACTION_NIGHT_DISPLAY_SETTINGS
Justin Klaassen [Fri, 22 Jul 2016 22:13:23 +0000 (22:13 +0000)]
Add Settings#ACTION_NIGHT_DISPLAY_SETTINGS
am: 06c0cb7acd

Change-Id: I7ea6ce28be43d519144ec9311e15334d35e2702f

8 years agoMove SysUI to top app scheduling if panel expanded
Jorim Jaggi [Fri, 22 Jul 2016 09:40:00 +0000 (11:40 +0200)]
Move SysUI to top app scheduling if panel expanded

Also fixes a bug which didn't set the correct renderThreadTid
when restarting an app (for example, when SystemUI gets killed).

Bug: 30292998
Change-Id: I420bee8a11d430b1e52ded050536e56a85a48800

8 years agoMerge "Add Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into nyc-mr1-dev
Justin Klaassen [Fri, 22 Jul 2016 21:55:58 +0000 (21:55 +0000)]
Merge "Add Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into nyc-mr1-dev

8 years agoMerge \"ImageReader: Add discardFreeBuffers method\" into nyc-mr1-dev
Eino-Ville Talvala [Fri, 22 Jul 2016 21:53:00 +0000 (21:53 +0000)]
Merge \"ImageReader: Add discardFreeBuffers method\" into nyc-mr1-dev
am: b417eb176f

Change-Id: I599785ee3e6d4ae576b5897ff0f62303c1746a79

8 years agoImageReader: Add discardFreeBuffers method
Eino-Ville Talvala [Fri, 22 Jul 2016 21:52:51 +0000 (21:52 +0000)]
ImageReader: Add discardFreeBuffers method
am: 2e2aaf6e04

Change-Id: I142f1b011a045aa0f5af7c33eb76b059eb67e30d

8 years agoMerge "ImageReader: Add discardFreeBuffers method" into nyc-mr1-dev
Eino-Ville Talvala [Fri, 22 Jul 2016 21:42:36 +0000 (21:42 +0000)]
Merge "ImageReader: Add discardFreeBuffers method" into nyc-mr1-dev