Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
486,542 Commits 3 Branches 0 Tags
e72b7c60ce49d19571d812e11eb64d333fbcd8a0
Commit Graph

486542 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Cinek
e72b7c60ce Merge "Isolating important conversations" into rvc-dev am: 822b72843d am: ac09b9168e 
Change-Id: I5137c82673513f902fcf68b9da4f4eb84b1625d1
 2020-04-04 00:46:23 +00:00
TreeHugger Robot
18bc356b27 Merge "Illustrations for empty overflow (light/dark modes)" into rvc-dev am: 07e5cc0878 am: 3b4edc1fd0 
Change-Id: Iaf33f0a4a5b50d77d100062aa67f29c8b70c86f9
 2020-04-04 00:46:10 +00:00
Selim Cinek
ac09b9168e Merge "Isolating important conversations" into rvc-dev am: 822b72843d 
Change-Id: I856f21fbb6a570f381957509742ba3b22a14d5ed
 2020-04-04 00:35:39 +00:00
Selim Cinek
822b72843d Merge "Isolating important conversations" into rvc-dev 2020-04-04 00:30:10 +00:00
TreeHugger Robot
c6cb751d3e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 9935249673 -s ours am: 2c3bc7ccf6 -s ours am: c89ee6ed7c -s ours 
am skip reason: subject contains skip directive

Change-Id: I8d623284831c570d84400c3cc7e8827d97445313
 2020-04-04 00:29:09 +00:00
TreeHugger Robot
1983f18e97 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 91bea4ffde -s ours am: 0b45ea986d -s ours am: 4570856194 -s ours 
am skip reason: subject contains skip directive

Change-Id: I153ad565d8ae05987987741aa43b19da691ac076
 2020-04-04 00:29:02 +00:00
TreeHugger Robot
4552b2e59e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 08c9aee163 -s ours am: f1851462b6 -s ours am: 33bded146a -s ours 
am skip reason: subject contains skip directive

Change-Id: I7f8c386602b3543800e805a96b7f62b7601de1c0
 2020-04-04 00:28:54 +00:00
TreeHugger Robot
e44b04b3b9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 325764e1b4 -s ours am: f90b35ad6c -s ours am: b5c6f8e559 -s ours 
am skip reason: subject contains skip directive

Change-Id: I103e162c6f12ba6e122ed6c3c822ee4cd566b09f
 2020-04-04 00:28:46 +00:00
Mehdi Alizadeh
99ce1fd0ec Merge "Wrap ShortcutQuery in a parcelable wrapper object and pass it direcly through aidl." into rvc-dev am: 6991da300f am: 0f53058f4b 
Change-Id: Ie74f647e2a3311ff8e196a4d947d6380f27b7101
 2020-04-04 00:28:34 +00:00
TreeHugger Robot
c89ee6ed7c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 9935249673 -s ours am: 2c3bc7ccf6 -s ours 
am skip reason: subject contains skip directive

Change-Id: I1b843eb17266960d729d25e67df735d8cc798f2e
 2020-04-04 00:28:24 +00:00
TreeHugger Robot
4570856194 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 91bea4ffde -s ours am: 0b45ea986d -s ours 
am skip reason: subject contains skip directive

Change-Id: Ic0ea2b9612e21a77c6e5abe166a651d9c48e454f
 2020-04-04 00:28:17 +00:00
TreeHugger Robot
63480c9c14 Merge "Illustrations for empty overflow (light/dark modes)" into rvc-dev am: 07e5cc0878 am: b6540ce774 
Change-Id: I9db3231251ae704db2851cc0ed2989259236aa8e
 2020-04-04 00:28:12 +00:00
TreeHugger Robot
33bded146a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 08c9aee163 -s ours am: f1851462b6 -s ours 
am skip reason: subject contains skip directive

Change-Id: Iccd3cfb25a9f03a105c53295d2615a89b8f56ab4
 2020-04-04 00:28:09 +00:00
TreeHugger Robot
b5c6f8e559 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 325764e1b4 -s ours am: f90b35ad6c -s ours 
am skip reason: subject contains skip directive

Change-Id: If4f264d64dd50482753b2f007478e5d5e0bc167d
 2020-04-04 00:27:59 +00:00
TreeHugger Robot
2c3bc7ccf6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 9935249673 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ib65b5f2433bdf4e9f2bd1822baf76ee9b20942f0
 2020-04-04 00:27:54 +00:00
Andrii Kulian
003e29447c Merge "4/n Add fallback to default task display area" into rvc-dev am: 3dbef9419f am: df7c362759 
Change-Id: If8835a245a730c2c32ffc9c1ea32eaaba868c1d7
 2020-04-04 00:27:53 +00:00
Mehdi Alizadeh
0f53058f4b Merge "Wrap ShortcutQuery in a parcelable wrapper object and pass it direcly through aidl." into rvc-dev am: 6991da300f 
Change-Id: Ifbf033d65bde886048c52e66c30aeade82b964c0
 2020-04-04 00:27:39 +00:00
TreeHugger Robot
0b45ea986d [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 91bea4ffde -s ours 
am skip reason: subject contains skip directive

Change-Id: Idcb30b12fab142f6c6915734df1d2731d857cb6d
 2020-04-04 00:27:38 +00:00
TreeHugger Robot
f1851462b6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 08c9aee163 -s ours 
am skip reason: subject contains skip directive

Change-Id: I96ec76d9ca1f0122a1e9427a4d04a3c3c115b251
 2020-04-04 00:27:27 +00:00
TreeHugger Robot
3b4edc1fd0 Merge "Illustrations for empty overflow (light/dark modes)" into rvc-dev am: 07e5cc0878 
Change-Id: I08787d2633eaf7598544e5177afdac2de4aae72f
 2020-04-04 00:26:55 +00:00
TreeHugger Robot
b6540ce774 Merge "Illustrations for empty overflow (light/dark modes)" into rvc-dev am: 07e5cc0878 
Change-Id: I58bd3f3b796f248b0936d908c0d5f67756e3d8d1
 2020-04-04 00:26:52 +00:00
TreeHugger Robot
f90b35ad6c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 325764e1b4 -s ours 
am skip reason: subject contains skip directive

Change-Id: I562c4737d44558044ff34d3ec3d4bf6aa73a8165
 2020-04-04 00:26:51 +00:00
Mehdi Alizadeh
6991da300f Merge "Wrap ShortcutQuery in a parcelable wrapper object and pass it direcly through aidl." into rvc-dev 2020-04-04 00:23:47 +00:00
TreeHugger Robot
9935249673 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-04-04 00:20:04 +00:00
Andrii Kulian
a4ee4bf5cc Merge "4/n Add fallback to default task display area" into rvc-dev am: 3dbef9419f am: b793704020 
Change-Id: I6b991d866a7731eabe6e4de509441209698733b5
 2020-04-04 00:18:01 +00:00
Nathan Harold
f11064d932 [automerger skipped] Merge "Check HIDL Discriminator for CSG Info" am: 3a87f98eb6 am: a84db5e5f7 -s ours am: 68c5a26ad4 -s ours 
am skip reason: Change-Id I08dc0d2050a9f4d4b574178e1c68a23d015768e4 with SHA-1 f85a2e9220 is in history

Change-Id: I662818d7447a90ba176c99513224522c481e1bbd
 2020-04-04 00:17:38 +00:00
Jing Ji
86fd0c48fc Merge "Multiply the total memory by mem_unit" am: 2bded37dfc am: dec2e1abc0 am: 0e31bbc0e8 
Change-Id: I440cfb6ffced560eb91923f2aa5a888e75b379ca
 2020-04-04 00:17:27 +00:00
TreeHugger Robot
07e5cc0878 Merge "Illustrations for empty overflow (light/dark modes)" into rvc-dev 2020-04-04 00:17:01 +00:00
TreeHugger Robot
91bea4ffde Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-04-04 00:16:54 +00:00
Andrii Kulian
b793704020 Merge "4/n Add fallback to default task display area" into rvc-dev am: 3dbef9419f 
Change-Id: I98665dd4b064af331097715b5913e82d6081190e
 2020-04-04 00:16:23 +00:00
Andrii Kulian
df7c362759 Merge "4/n Add fallback to default task display area" into rvc-dev am: 3dbef9419f 
Change-Id: I03af96784db19188b6f1509badf0eb5789392bb0
 2020-04-04 00:16:11 +00:00
TreeHugger Robot
08c9aee163 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-04-04 00:12:47 +00:00
TreeHugger Robot
325764e1b4 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-04-04 00:11:37 +00:00
Andrii Kulian
3dbef9419f Merge "4/n Add fallback to default task display area" into rvc-dev 2020-04-04 00:04:00 +00:00
Nathan Harold
68c5a26ad4 [automerger skipped] Merge "Check HIDL Discriminator for CSG Info" am: 3a87f98eb6 am: a84db5e5f7 -s ours 
am skip reason: Change-Id I08dc0d2050a9f4d4b574178e1c68a23d015768e4 with SHA-1 f85a2e9220 is in history

Change-Id: Idd115e6ef2d003f2be776fc7f493566101c1ec95
 2020-04-04 00:00:03 +00:00
Jing Ji
0e31bbc0e8 Merge "Multiply the total memory by mem_unit" am: 2bded37dfc am: dec2e1abc0 
Change-Id: I6e62dc3dbc96ab2852bc4a71aa119235fffb2470
 2020-04-03 23:59:37 +00:00
TreeHugger Robot
ec8dbb5006 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 682ee20837 -s ours am: e72d456c3f -s ours am: 45f2d9c382 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ide5bc721a56790ae094e76dff363b9601a0fd7c2
 2020-04-03 23:42:18 +00:00
Automerger Merge Worker
a8f981c0ce Merge "Merge "Don't crash if NSSL gets incomplete gesture" into rvc-dev am: afc37b88ac am: 127b3d718f" into rvc-d1-dev-plus-aosp 2020-04-03 23:42:16 +00:00
TreeHugger Robot
3f2623f8f6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 682ee20837 -s ours am: e72d456c3f -s ours am: 2dff1ce920 -s ours 
am skip reason: subject contains skip directive

Change-Id: I939f3292d686b3886efd92c651ea676b22bc2947
 2020-04-03 23:42:07 +00:00
Ned Burns
01a9a13bd4 Merge "Don't crash if NSSL gets incomplete gesture" into rvc-dev am: afc37b88ac am: 127b3d718f 
Change-Id: I4e6a8278537caccfe88423f20cd7fba0224528a2
 2020-04-03 23:42:07 +00:00
Ned Burns
e29f31fa09 Merge "Don't crash if NSSL gets incomplete gesture" into rvc-dev am: afc37b88ac am: 1cc25e1919 
Change-Id: I4da8933f3a3ea206db437674aa4147c08d9d9772
 2020-04-03 23:41:56 +00:00
TreeHugger Robot
996a5fd39b Merge "Add BIND_INCLUDE_CAPABILITIES flags to SystemCaptionsManagerService" into rvc-dev am: b402caadc5 am: 2e7c7d11ee 
Change-Id: I710aa084f92a482a1dff1a83e46f709f872baa8e
 2020-04-03 23:41:36 +00:00
TreeHugger Robot
620aeea886 Merge "Add BIND_INCLUDE_CAPABILITIES flags to SystemCaptionsManagerService" into rvc-dev am: b402caadc5 am: 3ff542f48b 
Change-Id: Ia37316c4a18a5487bfbcd5831dcf03f33bf2caa1
 2020-04-03 23:41:23 +00:00
Nathan Harold
a84db5e5f7 Merge "Check HIDL Discriminator for CSG Info" am: 3a87f98eb6 
Change-Id: Ie8bf079b3df835b7f1fe42a2079a585a881d4826
 2020-04-03 23:41:01 +00:00
TreeHugger Robot
12691faf0f Merge "freezer: disable on "am dumpheap <pid>"" into rvc-dev am: 330450c283 am: 483bd0c5a4 
Change-Id: I8ad95fef636cc0fbb53aae32e13ce8c69f177ce6
 2020-04-03 23:40:26 +00:00
TreeHugger Robot
888a53002e Merge "freezer: disable on "am dumpheap <pid>"" into rvc-dev am: 330450c283 am: 3e1c96238e 
Change-Id: I0447a77258e74348e1c36c5f8ae72f8a78e6c5bf
 2020-04-03 23:40:16 +00:00
TreeHugger Robot
2dff1ce920 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 682ee20837 -s ours am: e72d456c3f -s ours 
am skip reason: subject contains skip directive

Change-Id: I743f15596ec32a9182aef5b48797ad701386867e
 2020-04-03 23:40:00 +00:00
TreeHugger Robot
45f2d9c382 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 682ee20837 -s ours am: e72d456c3f -s ours 
am skip reason: subject contains skip directive

Change-Id: I02a97db50c4b09536d0fded9da3a052f57899e68
 2020-04-03 23:39:34 +00:00
Ned Burns
1cc25e1919 Merge "Don't crash if NSSL gets incomplete gesture" into rvc-dev am: afc37b88ac 
Change-Id: I283b32bbe50d07bbd144e19d76169ead37ed689d
 2020-04-03 23:39:33 +00:00
Jing Ji
dec2e1abc0 Merge "Multiply the total memory by mem_unit" am: 2bded37dfc 
Change-Id: I282eaeab036836f2a45e6d237e76119650e95306
 2020-04-03 23:39:18 +00:00