Commit Graph

346527 Commits

Author SHA1 Message Date
Bryce Lee
fd39b2375f Merge "Initial tests for launch bounds." 2017-10-11 21:29:56 +00:00
TreeHugger Robot
f65d166959 Merge "Removed remaining use of static stack ids." 2017-10-11 21:27:05 +00:00
Android Build Merger (Role)
6ecf046c45 Merge "Merge "Check target api version before crashing apps." into oc-mr1-dev am: 4e733f3074 am: c1bcf2ff95" 2017-10-11 21:23:45 +00:00
Julia Reynolds
d0263a73c1 Merge "Check target api version before crashing apps." into oc-mr1-dev am: 4e733f3074
am: c1bcf2ff95

Change-Id: I3d8003a0a4f1c2917af1aae93575672fcbf10e74
2017-10-11 21:20:55 +00:00
TreeHugger Robot
7f02d9c67c Merge "Don't proguard FrameworksServicesTests" 2017-10-11 21:20:17 +00:00
Julia Reynolds
c1bcf2ff95 Merge "Check target api version before crashing apps." into oc-mr1-dev
am: 4e733f3074

Change-Id: I41d02093b1a471123e4dffd90da8cacffa23e769
2017-10-11 20:54:39 +00:00
Bill Yi
3cf1a94524 Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours am: 1018a5d4a1 -s ours am: ae4dc78421 -s ours" into oc-mr1-dev-plus-aosp
am: 9ba5681aec  -s ours

Change-Id: I43bac3255871563f4126d119d068cf2f9b1f56e7
2017-10-11 20:53:19 +00:00
Bill Yi
051049b305 Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours am: 1018a5d4a1 -s ours am: 311fa22ecb -s ours
am: 17b8aa19c7  -s ours

Change-Id: I890ec538e87d154704ef315896d8e420d79327e0
2017-10-11 20:48:36 +00:00
TreeHugger Robot
4e733f3074 Merge "Check target api version before crashing apps." into oc-mr1-dev 2017-10-11 20:37:04 +00:00
TreeHugger Robot
c5df65697c Merge "Don't trigger strict mode for shortcut manager bitmap compression" 2017-10-11 20:35:50 +00:00
Android Build Merger (Role)
9ba5681aec Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours am: 1018a5d4a1 -s ours am: ae4dc78421 -s ours" into oc-mr1-dev-plus-aosp 2017-10-11 20:33:34 +00:00
Bill Yi
3c1fd90976 Merge "Import translations. DO NOT MERGE am: 757057a5b5 -s ours am: 6fd592553c -s ours am: fcde0eda85 -s ours am: bb04ab9aa1 -s ours am: c59fcd86c6 -s ours" into oc-mr1-dev-plus-aosp
am: da93dbdbf0  -s ours

Change-Id: I1b85be0312de0006ba0592c2c6dd8842efd4043b
2017-10-11 20:32:34 +00:00
Bill Yi
17b8aa19c7 Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours am: 1018a5d4a1 -s ours
am: 311fa22ecb  -s ours

Change-Id: Ib222f7ef5dd91dba7814a9c10501c0f8b36cd2d0
2017-10-11 20:29:08 +00:00
Bill Yi
d394cbacf7 Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours am: 1018a5d4a1 -s ours
am: ae4dc78421  -s ours

Change-Id: Iac2f9bb0d8b117c4882fe052e95120dc85bf8086
2017-10-11 20:28:29 +00:00
Bill Yi
b7027d1649 Import translations. DO NOT MERGE am: 757057a5b5 -s ours am: 6fd592553c -s ours am: fcde0eda85 -s ours am: bb04ab9aa1 -s ours am: a97edf7785 -s ours
am: 739e2fa3ad  -s ours

Change-Id: Id7467954bba1447a3c14ddc5e5d72fb89099bf52
2017-10-11 20:27:44 +00:00
Felipe Leme
b147de882a Merge "Document how to handle save on multi-steps activity." into oc-mr1-dev am: a4dffa032b
am: 705d318485

Change-Id: I75ff776435f53c8aed5731dfe984813af48c760a
2017-10-11 20:20:09 +00:00
Bill Yi
ae4dc78421 Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours
am: 1018a5d4a1  -s ours

Change-Id: I7edb906e7c2e0e76cb4a523d3e70418c57fc14bd
2017-10-11 20:17:36 +00:00
Bill Yi
311fa22ecb Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours
am: 1018a5d4a1  -s ours

Change-Id: Iee62f36c79ce3056bf3b100251bd78e760655718
2017-10-11 20:17:36 +00:00
TreeHugger Robot
bc8e230ceb Merge "Import translations. DO NOT MERGE" 2017-10-11 20:10:01 +00:00
Bill Yi
1018a5d4a1 Merge "Import translations. DO NOT MERGE" into oc-dev
am: e721fbddb5  -s ours

Change-Id: Ic2a012410d13daece6049836eb20f1109011a4a6
2017-10-11 20:09:44 +00:00
Jeffrey Huang
f966a98688 Merge "Add metric for persistent logging dialog" 2017-10-11 20:02:22 +00:00
TreeHugger Robot
e721fbddb5 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-10-11 19:59:02 +00:00
TreeHugger Robot
8c6f329ea9 Merge "Add missing annotations" 2017-10-11 19:57:52 +00:00
Android Build Merger (Role)
da93dbdbf0 Merge "Import translations. DO NOT MERGE am: 757057a5b5 -s ours am: 6fd592553c -s ours am: fcde0eda85 -s ours am: bb04ab9aa1 -s ours am: c59fcd86c6 -s ours" into oc-mr1-dev-plus-aosp 2017-10-11 19:57:11 +00:00
Bill Yi
c2399815de Import translations. DO NOT MERGE am: 757057a5b5 -s ours am: 6fd592553c -s ours am: fcde0eda85 -s ours am: bb04ab9aa1 -s ours
am: c59fcd86c6  -s ours

Change-Id: I55d7df7de1c5e3a98d1e773e9836f48522b3b49f
2017-10-11 19:54:17 +00:00
Bill Yi
739e2fa3ad Import translations. DO NOT MERGE am: 757057a5b5 -s ours am: 6fd592553c -s ours am: fcde0eda85 -s ours am: bb04ab9aa1 -s ours
am: a97edf7785  -s ours

Change-Id: Iea7996be9531e2dd9c8def44ea3fb88728e63963
2017-10-11 19:52:47 +00:00
TreeHugger Robot
5ddf4c2570 Merge "Import translations. DO NOT MERGE" 2017-10-11 19:52:02 +00:00
TreeHugger Robot
31b860a36f Merge "Import translations. DO NOT MERGE" 2017-10-11 19:51:01 +00:00
Bill Yi
c59fcd86c6 Import translations. DO NOT MERGE am: 757057a5b5 -s ours am: 6fd592553c -s ours am: fcde0eda85 -s ours
am: bb04ab9aa1  -s ours

Change-Id: I66453d66b491ecff9aacc7fd53eece6e0e1ea351
2017-10-11 19:47:28 +00:00
Bill Yi
a97edf7785 Import translations. DO NOT MERGE am: 757057a5b5 -s ours am: 6fd592553c -s ours am: fcde0eda85 -s ours
am: bb04ab9aa1  -s ours

Change-Id: Ia8b54c4fec8e8fec06bdca38bf948af8a222e8b2
2017-10-11 19:47:14 +00:00
Felipe Leme
705d318485 Merge "Document how to handle save on multi-steps activity." into oc-mr1-dev
am: a4dffa032b

Change-Id: I01afae63e1fa5503104244c2e78dfb589697a467
2017-10-11 19:43:34 +00:00
Yi Jin
8b7318a527 Merge "Create protoc-gen-cppstream tool to auto-generate cpp proto field Ids." 2017-10-11 19:42:29 +00:00
Bill Yi
bb04ab9aa1 Import translations. DO NOT MERGE am: 757057a5b5 -s ours am: 6fd592553c -s ours
am: fcde0eda85  -s ours

Change-Id: I68381bf426aedbb2a0bb365364f7462ab3bdb585
2017-10-11 19:37:05 +00:00
TreeHugger Robot
a4dffa032b Merge "Document how to handle save on multi-steps activity." into oc-mr1-dev 2017-10-11 19:34:45 +00:00
Bill Yi
fcde0eda85 Import translations. DO NOT MERGE am: 757057a5b5 -s ours
am: 6fd592553c  -s ours

Change-Id: I2488e81c41395d3aedf20f02f61dfb9f67c5aa29
2017-10-11 19:27:42 +00:00
Bill Yi
6fd592553c Import translations. DO NOT MERGE
am: 757057a5b5  -s ours

Change-Id: I35b629a43daf6ef991fc4ec61a4aba933cad0ae2
2017-10-11 19:20:06 +00:00
Colin Cross
374478c5de Merge "Convert libjnigraphics to Android.bp" am: 006c167544 am: 2fbccabbca am: 1adda8b8b3
am: 4e9adb819a  -s ours

Change-Id: Ie9479958dd2964bc39e926248fe102db7344f9e3
2017-10-11 19:07:36 +00:00
Colin Cross
4e9adb819a Merge "Convert libjnigraphics to Android.bp" am: 006c167544 am: 2fbccabbca
am: 1adda8b8b3

Change-Id: Ia832e5fb8a49928e28891b7c398368af25717f48
2017-10-11 18:58:04 +00:00
Makoto Onuki
016431f223 Don't proguard FrameworksServicesTests
Test: build, presubmit
Change-Id: Ie4064c6c566c6307f26dfaa47da29eba99b58a76
2017-10-11 11:53:00 -07:00
TreeHugger Robot
c87f3792f1 Merge "Handle Keyboard long-presses and Talkback shortcut on notifications" 2017-10-11 18:49:52 +00:00
Makoto Onuki
c03127e833 Don't trigger strict mode for shortcut manager bitmap compression
Bug 65179362
Test: manual

Change-Id: Ic4540e96959244a932142b978681cd2750aae6f1
2017-10-11 11:49:24 -07:00
Colin Cross
1adda8b8b3 Merge "Convert libjnigraphics to Android.bp" am: 006c167544
am: 2fbccabbca

Change-Id: I7fea93c95baee3812fdf48805bb883e3afd172c1
2017-10-11 18:45:37 +00:00
Michael Wachenschwanz
35f0b54149 Merge "Add GET_RESTRICTION_ENTRIES Broadcast to protected list" 2017-10-11 18:42:16 +00:00
Colin Cross
2fbccabbca Merge "Convert libjnigraphics to Android.bp"
am: 006c167544

Change-Id: Ic07a49510c946104f74ad72a830aed9696a2ddd6
2017-10-11 18:37:19 +00:00
Android Build Merger (Role)
ba53913458 Merge "Merge "Send a11y updates for updated notifications" into oc-mr1-dev am: 85e7dbc93e am: 1617f759a3" 2017-10-11 18:36:31 +00:00
TreeHugger Robot
7c3c3c8bf8 Merge "Expose API for heavy-weight apps and get it working again." 2017-10-11 18:36:06 +00:00
Julia Reynolds
a8d41afe2e Merge "Send a11y updates for updated notifications" into oc-mr1-dev am: 85e7dbc93e
am: 1617f759a3

Change-Id: I2d2b11c3e207dbdcd342440b220590c99460b4ac
2017-10-11 18:34:40 +00:00
Julia Reynolds
1617f759a3 Merge "Send a11y updates for updated notifications" into oc-mr1-dev
am: 85e7dbc93e

Change-Id: Iaabe6d5820feefb2de29a5a37fb28af84cc0622b
2017-10-11 18:23:56 +00:00
Colin Cross
006c167544 Merge "Convert libjnigraphics to Android.bp" 2017-10-11 18:18:45 +00:00
TreeHugger Robot
85e7dbc93e Merge "Send a11y updates for updated notifications" into oc-mr1-dev 2017-10-11 18:12:33 +00:00