Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
762,811 Commits 3 Branches 0 Tags
cb12f1d6446eb670d0eec5229a67c9ce145ea43c
Commit Graph

762811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
cb12f1d644 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4d465c409d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I42f68afa214983a35ada45aa8483e5735ea4f326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:21:12 +00:00
Bill Yi
13b0938fa0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9a01b23cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I498ab139c012a4cf4e4aff4a41287d71b9d0d90b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:21:10 +00:00
TreeHugger Robot
8dcfbc1fa6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d2b419eb8c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3424b649092056e4b3ffd614e23aa8a6acefaef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:20:53 +00:00
Bill Yi
785cbcf966 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 280953de4c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifaa958207e1f548689c461003f14c6abc89f14cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:20:30 +00:00
TreeHugger Robot
ab2c186e9b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: e1400a551d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic0e259e61bd97a5bf0ccc99927d93de795180374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:07:04 +00:00
Bill Yi
88d6f1736c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a9bf8b5da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76372f8dad889b10d2581618319976a3ec09504f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:06:45 +00:00
TreeHugger Robot
9c88f5990c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 032e2d290a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11a3bf82791b1418546b04f25a9f90857c0f044a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:04:53 +00:00
Bill Yi
eb6276c2f4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f7df6d795a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9891ddb894e627eb0aebafd2fa4911c1aa8658ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:04:39 +00:00
TreeHugger Robot
d4292379fd Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-03 20:48:55 +00:00
TreeHugger Robot
4d465c409d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-03 20:48:06 +00:00
TreeHugger Robot
d2b419eb8c Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-03 20:48:06 +00:00
TreeHugger Robot
e1400a551d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-03 20:47:38 +00:00
TreeHugger Robot
5db71e454e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-03 20:46:20 +00:00
TreeHugger Robot
41f0cd6eeb Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-03 20:46:20 +00:00
TreeHugger Robot
ad98a4f502 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-03 20:46:20 +00:00
TreeHugger Robot
8badcdf1b3 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-03 20:46:20 +00:00
TreeHugger Robot
032e2d290a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-03 20:45:40 +00:00
TreeHugger Robot
b73990fb79 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-03 20:39:04 +00:00
TreeHugger Robot
33fecd63b6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-03 20:39:04 +00:00
TreeHugger Robot
f2ef5952f0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-03 20:39:04 +00:00
TreeHugger Robot
941d24a584 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-03 20:39:04 +00:00
TreeHugger Robot
018f7a5aac Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-03 20:39:04 +00:00
TreeHugger Robot
b16fa64cc8 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-03 20:39:04 +00:00
Vinit Nayak
c59bba906d Merge "Revert "Revert "Remove check for preventing re-parenting non-spl..."" into tm-dev am: 0567c3553a am: 1cb3bafe5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944716

Change-Id: I53bc4c3d9974c69886158b572339295e9ee32034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 20:26:23 +00:00
Matt Casey
0abeb3a99f Merge "Style tweaks for resolver empty state." into tm-dev am: e46c50811b am: ef16aea550 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18140742

Change-Id: I981897590a0280ac1647a5422fed7bc94c3baa73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 20:25:30 +00:00
Vinit Nayak
1cb3bafe5f Merge "Revert "Revert "Remove check for preventing re-parenting non-spl..."" into tm-dev am: 0567c3553a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944716

Change-Id: I8fdedda84e9aeb6667e02ec98fe2fbd29bfaa813
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 20:07:55 +00:00
Vinit Nayak
0567c3553a Merge "Revert "Revert "Remove check for preventing re-parenting non-spl..."" into tm-dev 2022-05-03 19:56:34 +00:00
TreeHugger Robot
cb7bfe8696 Merge "Remove the usage of device_config flag: DisplayManagerService.KEY_ALLOW_ALWAYS_UNLOCKED_VIRTUAL_DISPLAYS." into tm-dev am: 0927574f3f am: e02e8396f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17943723

Change-Id: I4312b131c043b8643b9ca95bbbaadef755e32dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:43:07 +00:00
Matt Casey
ef16aea550 Merge "Style tweaks for resolver empty state." into tm-dev am: e46c50811b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18140742

Change-Id: I611105f578388cb5b0324a24135e6138362f64fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:36:44 +00:00
TreeHugger Robot
e02e8396f6 Merge "Remove the usage of device_config flag: DisplayManagerService.KEY_ALLOW_ALWAYS_UNLOCKED_VIRTUAL_DISPLAYS." into tm-dev am: 0927574f3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17943723

Change-Id: I45b476a8ea70d4cb5103d45c7e1f0b9cd1fd89b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:36:26 +00:00
Matt Casey
e46c50811b Merge "Style tweaks for resolver empty state." into tm-dev 2022-05-03 19:33:03 +00:00
TreeHugger Robot
0927574f3f Merge "Remove the usage of device_config flag: DisplayManagerService.KEY_ALLOW_ALWAYS_UNLOCKED_VIRTUAL_DISPLAYS." into tm-dev 2022-05-03 19:29:34 +00:00
Austin Borger
f4d319a0fd Merge "CameraServiceProxy: Create utility method for detecting if the camera is disabled by device policy." into tm-dev am: e48afc4089 am: 2422ae8437 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17967939

Change-Id: Ic8a0e1e83441f28e8ba1e596d41500d1f430d82d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:20:12 +00:00
TreeHugger Robot
6256ffbd7e Merge "Add logging to NPVC" into tm-dev am: 9750b0ca46 am: a72482fa22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17958675

Change-Id: I53718b0f718647c1076c302459e17d28dc7206a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:20:03 +00:00
Justin Weir
debe9393eb Added MediaData.active to the media carousel comparator am: 2e58b46209 am: 791e8b6094 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090379

Change-Id: I3eba73f165e0b4baa909211a1a1c9fe44a65e250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:19:35 +00:00
TreeHugger Robot
74a2671cf2 Merge "Fix PipTaskOrganizerTest" into tm-dev am: fe8cf73739 am: 775b8e222c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125637

Change-Id: Ibe279edca723e1fa3de84f26c6e7ccc7c116b30a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:19:28 +00:00
Austin Borger
2422ae8437 Merge "CameraServiceProxy: Create utility method for detecting if the camera is disabled by device policy." into tm-dev am: e48afc4089 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17967939

Change-Id: I882a4d56da4c58d919ad202abdf9edf37af77cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:19:08 +00:00
Mateusz Cicheński
e969bf7d7d Merge "Add a description to the params of keep clear rects APIs." into tm-dev am: f829b1332f am: 6c19b582f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17772404

Change-Id: If013bf89382b0e2234d7e436e22129f74af9544c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:19:01 +00:00
Austin Borger
e48afc4089 Merge "CameraServiceProxy: Create utility method for detecting if the camera is disabled by device policy." into tm-dev 2022-05-03 19:14:14 +00:00
TreeHugger Robot
a72482fa22 Merge "Add logging to NPVC" into tm-dev am: 9750b0ca46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17958675

Change-Id: I116db663983a686aa14e000e9cc12b082dc92aac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:57:32 +00:00
TreeHugger Robot
9750b0ca46 Merge "Add logging to NPVC" into tm-dev 2022-05-03 18:55:24 +00:00
Justin Weir
791e8b6094 Added MediaData.active to the media carousel comparator am: 2e58b46209 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090379

Change-Id: I0bb2c5edda53ea717ce915d2bb49de992625af18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:50:51 +00:00
TreeHugger Robot
775b8e222c Merge "Fix PipTaskOrganizerTest" into tm-dev am: fe8cf73739 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125637

Change-Id: I631a1f3ded89e390eaf3736d21c9f80cbe105734
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:50:33 +00:00
Justin Weir
2e58b46209 Added MediaData.active to the media carousel comparator 
Active apps should be prioritized above media recommendations in the media carousel based on go/media-teamfood-test.

Bug: 209148780
Test: augmented the sort test to fail without this change and pass with it
Change-Id: I556f45b423920a625418870355703ff167efaffd
 2022-05-03 18:44:36 +00:00
TreeHugger Robot
fe8cf73739 Merge "Fix PipTaskOrganizerTest" into tm-dev 2022-05-03 18:37:57 +00:00
Mateusz Cicheński
6c19b582f1 Merge "Add a description to the params of keep clear rects APIs." into tm-dev am: f829b1332f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17772404

Change-Id: I74feba5ef01754a69421460ffc4bddaa2a97aed1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:35:20 +00:00
Mateusz Cicheński
f829b1332f Merge "Add a description to the params of keep clear rects APIs." into tm-dev 2022-05-03 18:09:16 +00:00
TreeHugger Robot
d4e8f73d24 Merge "[AppsFilter] separate classes for read and write" into tm-dev am: 4c71401de5 am: 0539d49aa9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17921589

Change-Id: Ib6e5ca1b1b39fc3c2804f741b0ac7c71c018d411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 17:54:11 +00:00
Peiyong Lin
3d14fd386f Merge "Remove NavigationBarOverlayController." into tm-dev am: e26bcbb811 am: 687738c362 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18083703

Change-Id: Id9e1eaa73339f0c8153b7e81376bfe7681a5b456
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 17:54:03 +00:00
Miranda Kephart
f15f6f6cbd Merge "Add clipboard source to edit image intent" into tm-dev am: 0c44208351 am: d7cf4c909a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17144196

Change-Id: I238b1779f3036bc319c13774ed87b70906f7336c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 17:53:49 +00:00