Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
766,807 Commits 3 Branches 0 Tags
647226da261f44348a68eb9d1ea24ddbb8943fb2
Commit Graph

766807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
647226da26 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e639ceb204 am: f3fa12661d -s ours am: 28f98060d3 -s ours am: b1f635cfa3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I42b6dcfa354257e18bcc1aa9a981d3f1a81b6b8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:26:57 +00:00
Bill Yi
a30b464aff Merge changes from topic "tc_change_21" into tm-dev am: a81e4a06e9 am: ca688ab765 am: 3a543602ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18100509

Change-Id: I9ae577e22e1c5426e93b0c981c1b5c326825b801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:26:49 +00:00
Bill Yi
7b818eef30 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c89591c3a am: 9ab47bdd63 -s ours am: 979b222c12 -s ours am: 291873775c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0759afb8af2d52d63daa45e453212dda224a065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:26:41 +00:00
Yuri Lin
6bbba854db Merge "Show "review notification permissions" notification" into tm-dev am: a436e42912 am: 2efc4a2d02 am: 2bb9c464ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17716555

Change-Id: I326abe86391a8511e713f665054252a45985ee1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:24:53 +00:00
Yuri Lin
8caba79307 Merge "Show "review notification permissions" notification" into tm-dev am: a436e42912 am: 4b4d67174e am: a3584ae44e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17716555

Change-Id: I9228fc8a7e96dbae255efee944baf57ac1b2a902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:23:35 +00:00
Yuri Lin
b7d4bdab3a Merge "Show "review notification permissions" notification" into tm-dev am: a436e42912 am: 2efc4a2d02 am: a041402990 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17716555

Change-Id: Ifa8c51ff21905efed81e7cbad21264a7b94dea86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:22:24 +00:00
Bill Yi
b1f635cfa3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e639ceb204 am: f3fa12661d -s ours am: 28f98060d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I155a0f023caa8ad741e741c6f2022b365a7493a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:57:13 +00:00
Bill Yi
3a543602ac Merge changes from topic "tc_change_21" into tm-dev am: a81e4a06e9 am: ca688ab765 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18100509

Change-Id: Ib76ec36854ad8ca1619f661a514a7b8da45cfeb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:57:06 +00:00
Bill Yi
291873775c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c89591c3a am: 9ab47bdd63 -s ours am: 979b222c12 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2812d4df1c41754fe7d6a771c1ef5d9483b70cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:56:59 +00:00
Yuri Lin
2bb9c464ea Merge "Show "review notification permissions" notification" into tm-dev am: a436e42912 am: 2efc4a2d02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17716555

Change-Id: I44e7ba2757029280cc93880d0c3cde14c76162da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:55:56 +00:00
Yuri Lin
a3584ae44e Merge "Show "review notification permissions" notification" into tm-dev am: a436e42912 am: 4b4d67174e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17716555

Change-Id: I3cd636859dbf082f9d60be4815fe5b4c8ed033fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:55:47 +00:00
Yuri Lin
a041402990 Merge "Show "review notification permissions" notification" into tm-dev am: a436e42912 am: 2efc4a2d02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17716555

Change-Id: Iedd2c79bb2860c6f02acc07323e56a02e290ac0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:55:42 +00:00
Bill Yi
28f98060d3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e639ceb204 am: f3fa12661d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If63d5177b3de8b1be5951a2572d7a9f81157cd8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:41:16 +00:00
Bill Yi
ca688ab765 Merge changes from topic "tc_change_21" into tm-dev am: a81e4a06e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18100509

Change-Id: Ifa12c8ed3eccacc1d7197e49e80018505b20c37c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:41:08 +00:00
Bill Yi
979b222c12 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c89591c3a am: 9ab47bdd63 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I836fd684c7e6c0c9278e5469448083e85eaf0e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:41:00 +00:00
Yuri Lin
2efc4a2d02 Merge "Show "review notification permissions" notification" into tm-dev am: a436e42912 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17716555

Change-Id: I9fd2b3774d0a6b49277eb8bffc2b634212eb7942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:38:19 +00:00
Yuri Lin
4b4d67174e Merge "Show "review notification permissions" notification" into tm-dev am: a436e42912 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17716555

Change-Id: I47083444076d3cd50d87183111c114e15f49ee63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:37:24 +00:00
Aaron Liu
6c8b24276a Merge "[Bouncer] Fix overlap from notif shade" into tm-dev am: 12931e7709 am: f6b4f625c1 am: 9bc3b179b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030043

Change-Id: I85b909db301a06fd273f92fa4dffcb750c066c9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:11:46 +00:00
Galia Peycheva
e9890f19fc Merge "Fix missing position updates to blur regions" into tm-dev am: f372925a29 am: 3145e89c1c am: 4b9f03bca1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17989463

Change-Id: I7b8e4d16d39fe4c677665c71c6d011fbd683f50b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:11:21 +00:00
Steve Elliott
5c09e079c8 Merge "Revert^2 "Fix stale View tracking in ShadeViewDiffer"" into tm-dev am: f24ff65ab2 am: 65409e484e am: d1ef74282c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18086237

Change-Id: Ide5503d939a2a85c7f577e01cc6f72db55bc1448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:10:34 +00:00
Aaron Liu
c40066eefc Merge "[Bouncer] Fix overlap from notif shade" into tm-dev am: 12931e7709 am: fe5b5fd29d am: 7868ad5820 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030043

Change-Id: I3dec0355a6fdfd0f9f7efd91d20ed70f3fa79688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:10:16 +00:00
Automerger Merge Worker
4070d7f644 Merge "Merge "[Bouncer] Fix overlap from notif shade" into tm-dev am: 12931e7709 am: f6b4f625c1 am: 8962276c74" into tm-qpr-dev-plus-aosp 2022-05-04 17:10:06 +00:00
Aaron Liu
0ea604ca75 Merge "[Bouncer] Fix overlap from notif shade" into tm-dev am: 12931e7709 am: f6b4f625c1 am: 8962276c74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030043

Change-Id: I7ac59c7c7754deb03f7825f55304c0856d50e89c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:10:02 +00:00
Galia Peycheva
c51e171164 Merge "Fix missing position updates to blur regions" into tm-dev am: f372925a29 am: 0a6975ee18 am: c48ef38665 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17989463

Change-Id: Iaa3fcf58a63db7aae7d7acec0e837ab3add9d3e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:09:57 +00:00
Galia Peycheva
1bfbe508c6 Merge "Fix missing position updates to blur regions" into tm-dev am: f372925a29 am: 3145e89c1c am: 0cea5a316b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17989463

Change-Id: If3f16f8e33b51c2e6c9f924a28812274ffc35f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:09:45 +00:00
Steve Elliott
e3d1e495f9 Merge "Revert^2 "Fix stale View tracking in ShadeViewDiffer"" into tm-dev am: f24ff65ab2 am: 25843981c5 am: e6eb30d84a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18086237

Change-Id: I3c0cdfc2ea3d739403772fd3ea0b3666c82eb968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:09:34 +00:00
Steve Elliott
cdf0cb2977 Merge "Revert^2 "Fix stale View tracking in ShadeViewDiffer"" into tm-dev am: f24ff65ab2 am: 65409e484e am: 443a26ee81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18086237

Change-Id: I65f62a1302342ef6f7d4d581d8ca408e40148111
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:09:24 +00:00
Shreerag Jayakrishnan
bb93196b7a Merge "Add Activity Recognition to default grants for Home app on Wear." am: 0bcfa16d6c am: bb96289dea am: 7b303e27a9 am: 159ad04b71 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2086183

Change-Id: I98c977e8ddf06bae27687c98c2831ba6a64a3f01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:09:15 +00:00
Dave Mankoff
999fa13543 Merge "Remove Dependency#get calls from NavigationBarView" into tm-qpr-dev am: 8c08010a69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18121571

Change-Id: I8176334ac11a9e17d23cd84277e4d4e570443450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:09:05 +00:00
Bill Yi
a81e4a06e9 Merge changes from topic "tc_change_21" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c89591c3a
  Import translations. DO NOT MERGE ANYWHERE
 2022-05-04 17:07:37 +00:00
Yuri Lin
a436e42912 Merge "Show "review notification permissions" notification" into tm-dev 2022-05-04 16:55:29 +00:00
Aaron Liu
8962276c74 Merge "[Bouncer] Fix overlap from notif shade" into tm-dev am: 12931e7709 am: f6b4f625c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030043

Change-Id: Ided34773848e1d0cb6c4abadbc69a41622002557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:55:22 +00:00
Galia Peycheva
0cea5a316b Merge "Fix missing position updates to blur regions" into tm-dev am: f372925a29 am: 3145e89c1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17989463

Change-Id: I115562417c27f3325ed88bab0e28889208ae1aab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:55:15 +00:00
Aaron Liu
9bc3b179b5 Merge "[Bouncer] Fix overlap from notif shade" into tm-dev am: 12931e7709 am: f6b4f625c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030043

Change-Id: I500f1591562d512d602bfe4550cc9870d804a14c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:54:46 +00:00
Galia Peycheva
4b9f03bca1 Merge "Fix missing position updates to blur regions" into tm-dev am: f372925a29 am: 3145e89c1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17989463

Change-Id: Iec572dd6400a0b9a53f20d32308530304954c87d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:54:20 +00:00
Steve Elliott
443a26ee81 Merge "Revert^2 "Fix stale View tracking in ShadeViewDiffer"" into tm-dev am: f24ff65ab2 am: 65409e484e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18086237

Change-Id: I035bf1d4d675c7d0017288abbd02f8282120e4bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:54:13 +00:00
Steve Elliott
d1ef74282c Merge "Revert^2 "Fix stale View tracking in ShadeViewDiffer"" into tm-dev am: f24ff65ab2 am: 65409e484e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18086237

Change-Id: Ie58aa717d9c2696ae6cf93ea528de21e268ad716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:53:44 +00:00
Aaron Liu
7868ad5820 Merge "[Bouncer] Fix overlap from notif shade" into tm-dev am: 12931e7709 am: fe5b5fd29d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030043

Change-Id: Iae163ff55ab20a75c742c9b29f834a939cd9b36a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:40:29 +00:00
Galia Peycheva
c48ef38665 Merge "Fix missing position updates to blur regions" into tm-dev am: f372925a29 am: 0a6975ee18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17989463

Change-Id: I2a25963723773f89adfa8e849acd4697bbb209eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:40:21 +00:00
Dave Mankoff
8c08010a69 Merge "Remove Dependency#get calls from NavigationBarView" into tm-qpr-dev 2022-05-04 16:40:20 +00:00
Steve Elliott
e6eb30d84a Merge "Revert^2 "Fix stale View tracking in ShadeViewDiffer"" into tm-dev am: f24ff65ab2 am: 25843981c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18086237

Change-Id: Id8688c538871f562cd0f95b89f7607c1fd3e2ced
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:39:35 +00:00
Shreerag Jayakrishnan
159ad04b71 Merge "Add Activity Recognition to default grants for Home app on Wear." am: 0bcfa16d6c am: bb96289dea am: 7b303e27a9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2086183

Change-Id: Idb4662d11a1b608840d88182e3363763abeda023
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:38:32 +00:00
Aaron Liu
fe5b5fd29d Merge "[Bouncer] Fix overlap from notif shade" into tm-dev am: 12931e7709 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030043

Change-Id: Ida159ae7d4dbf19c18b8faf537f82e956a287fd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:37:28 +00:00
Aaron Liu
f6b4f625c1 Merge "[Bouncer] Fix overlap from notif shade" into tm-dev am: 12931e7709 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030043

Change-Id: Ifa6f75ca9f3518b252eb5e717ba1bab4515855fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:34:37 +00:00
Galia Peycheva
3145e89c1c Merge "Fix missing position updates to blur regions" into tm-dev am: f372925a29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17989463

Change-Id: I47552ae3dda49668fb334a19da9c66ad3c815c0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:32:04 +00:00
Steve Elliott
65409e484e Merge "Revert^2 "Fix stale View tracking in ShadeViewDiffer"" into tm-dev am: f24ff65ab2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18086237

Change-Id: I972d838a11131bf7a66bd7f6cc61f30babf243e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:30:49 +00:00
Jean-Michel Trivi
c4c3f89c37 Merge "AudioService: fix muteAwaitConnection device check" into tm-dev am: aca0a9e9e0 am: 5f302a0085 am: 5a42302106 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18161676

Change-Id: I17817880ba11c67a2045fce86a8f4f54d7530a8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:30:34 +00:00
Aaron Liu
12931e7709 Merge "[Bouncer] Fix overlap from notif shade" into tm-dev 2022-05-04 16:30:33 +00:00
Automerger Merge Worker
1be03e9558 Merge "Merge "Revert "Update show system experiment behavior."" into tm-dev am: 7c4b55cc6c am: d341afed57" into tm-d1-dev-plus-aosp am: 26f46acbf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030765

Change-Id: I2b21e23dfaeb331d70e8b1e7d0358fdee3ba3891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:30:17 +00:00
Galia Peycheva
0a6975ee18 Merge "Fix missing position updates to blur regions" into tm-dev am: f372925a29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17989463

Change-Id: Ide43cfb03ec8940d80752c0997444f7c9eef94d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:30:09 +00:00