Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
649,735 Commits 3 Branches 0 Tags
656dc1ecaa3c031ec8b8a1009786443d9629f177
Commit Graph

649735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
656dc1ecaa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c18be9fcf4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15322561

Change-Id: I99a2d703687461cf6b84af22e70ba41bcd46d553
 2021-07-19 13:23:13 +00:00
TreeHugger Robot
098f935939 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fed8e5b8f -s ours am: 2f3b49421a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15325202

Change-Id: I29fc4b68b7d724c7dbf15eeda39d18781ffa8397
 2021-07-19 13:23:04 +00:00
TreeHugger Robot
10066c69ab Merge "resolve merge conflicts of c482869205 to sc-v2-dev" into sc-v2-dev 2021-07-19 13:22:08 +00:00
Louis Chang
8aedf643cb Merge "Start activity in the embedded TaskFragment if allowed" into sc-v2-dev 2021-07-19 12:25:34 +00:00
Beverly Tai
4a6fb4e6c1 resolve merge conflicts of c482869205 to sc-v2-dev 
Change-Id: I8a90f3b03b1bce569db9f6ba3a8b56e0a2031f7e
Fixes: 194011370
Merged-In: Ied977fec9009265dac89b7e24c1075ceb2905bfd
 2021-07-19 12:18:25 +00:00
TreeHugger Robot
ae942fcf7d Merge "Fix OHM H/W key shortcut dosn't work appropriately" into sc-v2-dev 2021-07-19 03:23:57 +00:00
Riddle Hsu
cde7b47aa2 Merge "Generalize window bounds for layout" into sc-v2-dev 2021-07-19 03:08:56 +00:00
TreeHugger Robot
c18be9fcf4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-18 21:47:41 +00:00
TreeHugger Robot
2f3b49421a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fed8e5b8f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15325202

Change-Id: If8d88f9754c46a4e879444b9dc6f750b5c24e56a
 2021-07-18 21:46:48 +00:00
TreeHugger Robot
1fed8e5b8f Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-07-18 21:34:09 +00:00
TreeHugger Robot
cf8de3b4d5 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-18 21:29:39 +00:00
TreeHugger Robot
c8a67f0ffd Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-18 21:26:48 +00:00
TreeHugger Robot
c482869205 Merge "SysUI co-ex updates" into sc-dev 2021-07-18 21:20:50 +00:00
TreeHugger Robot
fe482957a9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 630c264a54 -s ours am: 6522a73248 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302026

Change-Id: Id03800257986e83040bf02d357103cfa1076cf26
 2021-07-18 18:22:02 +00:00
TreeHugger Robot
977a08de34 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dbadfc159d -s ours am: b83a12caad -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15325196

Change-Id: Ia6bf5223b761d7feda1c8c3d30ee160064a897d8
 2021-07-18 18:21:48 +00:00
TreeHugger Robot
6522a73248 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 630c264a54 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302026

Change-Id: I257bcd4bc149c8f9337c0495a343750efa3caa60
 2021-07-18 18:17:51 +00:00
TreeHugger Robot
b83a12caad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dbadfc159d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15325196

Change-Id: Ib76e2c70f99163cf1276b29f0e535bcea7876446
 2021-07-18 18:17:23 +00:00
TreeHugger Robot
05fe149f66 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e5dbe4e748 -s ours am: d70530f416 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15325198

Change-Id: Ia8a35088038746551d1e789914879a68c125bf9c
 2021-07-18 18:17:08 +00:00
TreeHugger Robot
41f526ff7b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ebc3c5ce13 -s ours am: c019f4d648 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15322563

Change-Id: Ie132a1b01084c77b6a9776d6133c7ef08d70dc0f
 2021-07-18 18:16:51 +00:00
TreeHugger Robot
d70530f416 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e5dbe4e748 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15325198

Change-Id: I65902823440198b4ffec42a68ec7e7d93e691429
 2021-07-18 18:16:50 +00:00
TreeHugger Robot
fec5074df1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 01534d2abf -s ours am: 1f254a6ca1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15322559

Change-Id: Ie88edb3059694ea50651eefea72725860c201f93
 2021-07-18 18:16:45 +00:00
Bill Yi
ddf9671e87 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cafee7a78f -s ours am: 8350553c99 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15325191

Change-Id: I74308fcb9db0868432ad1b06a40176ab086af9e3
 2021-07-18 18:16:33 +00:00
TreeHugger Robot
c019f4d648 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ebc3c5ce13 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15322563

Change-Id: I473dff6b1f4bbc9ef6418c3ba53aa85a0c9cec63
 2021-07-18 18:06:29 +00:00
TreeHugger Robot
1f254a6ca1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 01534d2abf -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15322559

Change-Id: I57bde5dc39d0a9b8dbda4740079d57830c337196
 2021-07-18 18:06:06 +00:00
Bill Yi
8350553c99 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cafee7a78f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15325191

Change-Id: Ic3d6779fb066f44368c0afc73287ef738767b440
 2021-07-18 17:58:44 +00:00
TreeHugger Robot
630c264a54 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-07-18 17:52:22 +00:00
TreeHugger Robot
dbadfc159d Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-07-18 17:52:03 +00:00
TreeHugger Robot
01534d2abf Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-07-18 17:52:01 +00:00
TreeHugger Robot
143a038c91 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2c5ac30c03 -s ours am: ee19066e5c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15325201

Change-Id: I4d6b307e3dbfb49a191dab2a072ce8d002e2cb4c
 2021-07-18 17:49:27 +00:00
TreeHugger Robot
e5dbe4e748 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-07-18 17:46:44 +00:00
TreeHugger Robot
ee19066e5c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2c5ac30c03 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15325201

Change-Id: I7189e3476388f1fcb79bdbe0dfe03aca3855dd24
 2021-07-18 17:46:28 +00:00
TreeHugger Robot
ebc3c5ce13 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-07-18 17:46:14 +00:00
TreeHugger Robot
ce13f67164 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 075fc718c8 -s ours am: 6d3491d7e4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15322565

Change-Id: I2f27dc846d0eb10b704b3beda63b5a852d4f7541
 2021-07-18 17:46:04 +00:00
Bill Yi
277a8a595f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f9bd09206 -s ours am: 1557608e7c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15325193

Change-Id: I4d71e585074575c0280797dbc2715f8e262b3f64
 2021-07-18 17:45:58 +00:00
TreeHugger Robot
989aee5581 Merge "Fix One-handed tutorial looks janky on entering transition" into sc-dev am: ed889bb867 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15283490

Change-Id: I3136887f13ca30c8ec72d6288b2c17e9a321c85f
 2021-07-18 17:45:53 +00:00
TreeHugger Robot
6d3491d7e4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 075fc718c8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15322565

Change-Id: Ied4bec8162b80c3242b28d5de7fea55b0c2226f6
 2021-07-18 17:45:32 +00:00
Bill Yi
1557608e7c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f9bd09206 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15325193

Change-Id: I6ecc313f0d81c9f806f54bdbcc9d67c2d2fb7b58
 2021-07-18 17:45:13 +00:00
TreeHugger Robot
2c5ac30c03 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-07-18 17:36:13 +00:00
TreeHugger Robot
075fc718c8 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-07-18 17:34:33 +00:00
TreeHugger Robot
ed889bb867 Merge "Fix One-handed tutorial looks janky on entering transition" into sc-dev 2021-07-18 17:31:34 +00:00
TreeHugger Robot
4d63c58958 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-18 17:30:25 +00:00
TreeHugger Robot
1b17b407e0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-18 17:30:04 +00:00
TreeHugger Robot
69c83ac377 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-18 17:25:15 +00:00
TreeHugger Robot
936485a3ec Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-18 17:19:53 +00:00
Bill Yi
25cf88916b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3b995da6e69af454021b1d355898e228f45dd505
 2021-07-18 16:33:02 +00:00
Bill Yi
554922fa7e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie954cdee73c49a1d543c05a6e0e643bd720b70cf
 2021-07-18 16:13:40 +00:00
Bill Yi
f44c991774 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibe950e8d464f0b6c6f0d20f4308c6a541d0effb3
 2021-07-18 16:05:04 +00:00
Bill Yi
19e7318cf5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I249f8baf72dfa8e5d4c708068eba94cd838d6715
 2021-07-18 15:59:54 +00:00
Bill Yi
ac441ca054 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I84119f4b3be5621714cfeedc7d587591248b258b
 2021-07-18 15:50:35 +00:00
Bill Yi
27851359a5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1c45d840935b380e36c56ae83260fe8c572ac0c4
 2021-07-18 15:37:26 +00:00