Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
785,421 Commits 3 Branches 0 Tags
558cb115122136ff6bac0ec3c56f710951af8dbe
Commit Graph

785421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
558cb11512 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-05-05 16:42:10 +00:00
Bill Yi
bc61898da9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-05-05 16:42:10 +00:00
Bill Yi
9e7522944f Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-05-05 16:42:10 +00:00
Alex Spradlin
f1f44551ac Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-05-05 16:20:24 +00:00
Chavi Weingarten
ab7a475043 Merge "Set focus to WMS computed focus when embedded window drops focus" 2022-05-05 15:42:26 +00:00
Alex Spradlin
78a3f78dad Import translations. DO NOT MERGE ANYWHERE 
This is to unstick Automerger.

Bug: 231491884
Change-Id: I4879b6cf01447ec0f109b65ce290983d49d9274c
 2022-05-05 15:31:35 +00:00
SongFerng Wang
fb0555e168 Merge "[LE broadcast sink] Add the broadcast sink apis" into tm-dev am: 5f937a7093 am: dfc0cf8469 am: 30b5903a1d am: 0e26565238 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130743

Change-Id: I0068e6fe943d9fef3eefffe225b8d376a35f5ce5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 10:38:23 +00:00
Automerger Merge Worker
9f7917de67 Merge "Merge "[LE broadcast sink] Add the broadcast sink apis" into tm-dev am: 5f937a7093 am: bf872bd3a4" into tm-d1-dev-plus-aosp am: 20d68a653c am: d36f40f30b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130743

Change-Id: I7cf3f7c2e256d32da3e78a7a150b09c3d09e7427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 10:37:43 +00:00
Kholoud Mohamed
69e3288a29 Merge "Add missing settings strings" into tm-dev am: e1bcab3b51 am: 0a10b8cc8b am: 63541eab05 am: ef865e6638 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944324

Change-Id: Id2d76c3e04e7295af71f0b66b946cebfe2d76e73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 10:36:04 +00:00
Automerger Merge Worker
ebf6e89e38 Merge "Merge "[LE broadcast sink] Add the broadcast sink apis" into tm-dev am: 5f937a7093 am: dfc0cf8469 am: f775a46d78" into tm-qpr-dev-plus-aosp am: be7abccc53 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130743

Change-Id: I009969fc840de23a922941ff63875a630038792b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 10:35:24 +00:00
Prabir Pradhan
02a18edc53 Merge "Reland: Change input injection security model" 2022-05-05 10:34:54 +00:00
Kholoud Mohamed
5b08f433b2 Merge "Add missing settings strings" into tm-dev am: e1bcab3b51 am: ef770da20c am: 9cdda9dcc4 am: 8df6c994d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944324

Change-Id: Icb7b2699ccb3d782b5ed75a79c35a39dfd7187b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 10:34:13 +00:00
Automerger Merge Worker
928ec01139 Merge "Merge "[LE] Convert the BluetoothLeBroadcastSubgroup to QR code format string" into tm-dev am: 439436e104 am: 902d4e1ff7" into tm-d1-dev-plus-aosp am: b41a803146 am: 58deba6363 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18162824

Change-Id: Ib5bee1c6eaabdead7eaf4c01bd26b34c704a9873
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 10:33:40 +00:00
Kholoud Mohamed
2f11321129 Merge "Add missing settings strings" into tm-dev am: e1bcab3b51 am: 0a10b8cc8b am: 28218e2b73 am: 488e74e5af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944324

Change-Id: I3c479aa377be04156f2055c127e723609aee1c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 10:32:34 +00:00
Betty Chang
b4d918557e Merge "[LE] Convert the BluetoothLeBroadcastSubgroup to QR code format string" into tm-dev am: 439436e104 am: 806ec4fcbf am: e6f436ffbd am: 30ab6065fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18162824

Change-Id: Ieb7664a750095032a03996ece534f723d4677d12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 10:31:15 +00:00
Betty Chang
40f2aa0310 Merge "[LE] Convert the BluetoothLeBroadcastSubgroup to QR code format string" into tm-dev am: 439436e104 am: 902d4e1ff7 am: 7323898ea1 am: c20eb91aab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18162824

Change-Id: Ie3f64f4045e6b94f82085a8210ba38022c187d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 10:29:35 +00:00
Vaibhav Devmurari
2ec7de2e2e Merge "Shift RoundedCornerOverlay to Display window hierarchy" 2022-05-05 09:59:26 +00:00
SongFerng Wang
0e26565238 Merge "[LE broadcast sink] Add the broadcast sink apis" into tm-dev am: 5f937a7093 am: dfc0cf8469 am: 30b5903a1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130743

Change-Id: I81c1b2a742236454cbb01491cae83434313b04fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:54:00 +00:00
Automerger Merge Worker
d36f40f30b Merge "Merge "[LE broadcast sink] Add the broadcast sink apis" into tm-dev am: 5f937a7093 am: bf872bd3a4" into tm-d1-dev-plus-aosp am: 20d68a653c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130743

Change-Id: I708ae813cd33a08fa61bdea9e7bfe680e26c78d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:53:40 +00:00
Kholoud Mohamed
ef865e6638 Merge "Add missing settings strings" into tm-dev am: e1bcab3b51 am: 0a10b8cc8b am: 63541eab05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944324

Change-Id: I4dded5e9fa084c5615d56b89c51be72c21dd6188
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:52:03 +00:00
Automerger Merge Worker
be7abccc53 Merge "Merge "[LE broadcast sink] Add the broadcast sink apis" into tm-dev am: 5f937a7093 am: dfc0cf8469 am: f775a46d78" into tm-qpr-dev-plus-aosp 2022-05-05 09:51:57 +00:00
Kholoud Mohamed
8df6c994d5 Merge "Add missing settings strings" into tm-dev am: e1bcab3b51 am: ef770da20c am: 9cdda9dcc4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944324

Change-Id: Iffc13b871d85a1f22098019c92c3f9bb7ba26770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:51:52 +00:00
SongFerng Wang
f447e8f21e Merge "[LE broadcast sink] Add the broadcast sink apis" into tm-dev am: 5f937a7093 am: dfc0cf8469 am: f775a46d78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130743

Change-Id: Ied5a9c1c81a23607f3f2d80e9cef936471214953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:51:51 +00:00
Automerger Merge Worker
58deba6363 Merge "Merge "[LE] Convert the BluetoothLeBroadcastSubgroup to QR code format string" into tm-dev am: 439436e104 am: 902d4e1ff7" into tm-d1-dev-plus-aosp am: b41a803146 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18162824

Change-Id: I9dd6d6a9bfc7052fee1e232f93bc7abfc2f1e673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:51:30 +00:00
Kholoud Mohamed
488e74e5af Merge "Add missing settings strings" into tm-dev am: e1bcab3b51 am: 0a10b8cc8b am: 28218e2b73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944324

Change-Id: I3d8676e87d9c6860ff117c5e571a0e6a011c7413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:51:21 +00:00
Betty Chang
30ab6065fb Merge "[LE] Convert the BluetoothLeBroadcastSubgroup to QR code format string" into tm-dev am: 439436e104 am: 806ec4fcbf am: e6f436ffbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18162824

Change-Id: Iefec5c2ff4ff11fd8be05b262bae5e2ac5a01ef7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:51:04 +00:00
Betty Chang
c20eb91aab Merge "[LE] Convert the BluetoothLeBroadcastSubgroup to QR code format string" into tm-dev am: 439436e104 am: 902d4e1ff7 am: 7323898ea1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18162824

Change-Id: Ie6f0936b657ef8895693bcdfa13241ecdf30a917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:50:32 +00:00
SongFerng Wang
30b5903a1d Merge "[LE broadcast sink] Add the broadcast sink apis" into tm-dev am: 5f937a7093 am: dfc0cf8469 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130743

Change-Id: I796388ae2b92700180f2276de3fcf27259f70b7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:28:12 +00:00
Automerger Merge Worker
20d68a653c Merge "Merge "[LE broadcast sink] Add the broadcast sink apis" into tm-dev am: 5f937a7093 am: bf872bd3a4" into tm-d1-dev-plus-aosp 2022-05-05 09:28:09 +00:00
SongFerng Wang
f775a46d78 Merge "[LE broadcast sink] Add the broadcast sink apis" into tm-dev am: 5f937a7093 am: dfc0cf8469 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130743

Change-Id: I6b8ea8314ccfb2a68b91c54bd677840adafd1e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:28:07 +00:00
SongFerng Wang
a6a2d96fe5 Merge "[LE broadcast sink] Add the broadcast sink apis" into tm-dev am: 5f937a7093 am: bf872bd3a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130743

Change-Id: Ibfbca4b50558a23af32c98c1c8fbae0ec135b401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:28:03 +00:00
Kholoud Mohamed
63541eab05 Merge "Add missing settings strings" into tm-dev am: e1bcab3b51 am: 0a10b8cc8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944324

Change-Id: I5c0984812887556ab197f4a8e06683faca6cfbf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:27:59 +00:00
Kholoud Mohamed
9cdda9dcc4 Merge "Add missing settings strings" into tm-dev am: e1bcab3b51 am: ef770da20c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944324

Change-Id: I317145ab40ecc4ab00edd26a4722436462f25cbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:27:40 +00:00
Kholoud Mohamed
28218e2b73 Merge "Add missing settings strings" into tm-dev am: e1bcab3b51 am: 0a10b8cc8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944324

Change-Id: Idc981dae0f9e4880fff383d8872df98107070f83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:27:32 +00:00
Automerger Merge Worker
b41a803146 Merge "Merge "[LE] Convert the BluetoothLeBroadcastSubgroup to QR code format string" into tm-dev am: 439436e104 am: 902d4e1ff7" into tm-d1-dev-plus-aosp 2022-05-05 09:27:19 +00:00
Betty Chang
d9f9bc3545 Merge "[LE] Convert the BluetoothLeBroadcastSubgroup to QR code format string" into tm-dev am: 439436e104 am: 902d4e1ff7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18162824

Change-Id: I67931715d393978b4994997493fe6d8db08eadff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:27:13 +00:00
Betty Chang
7323898ea1 Merge "[LE] Convert the BluetoothLeBroadcastSubgroup to QR code format string" into tm-dev am: 439436e104 am: 902d4e1ff7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18162824

Change-Id: Ia29243dde949f37a1e98f7ed9ccf27f4b9482158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:27:11 +00:00
Betty Chang
e6f436ffbd Merge "[LE] Convert the BluetoothLeBroadcastSubgroup to QR code format string" into tm-dev am: 439436e104 am: 806ec4fcbf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18162824

Change-Id: I5a4565761d12e522a7bfe7a97cda9f5209af4398
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:27:10 +00:00
Issei Suzuki
25cd8630c8 Merge "Disable overriding task animation through windowAnimationStyle attribute." into tm-qpr-dev am: 9631eeca32 am: 4cb4e80639 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17884326

Change-Id: Iee092bb8ab5f191e38ae0d5f47082e79fc9fe0e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:26:08 +00:00
SongFerng Wang
dfc0cf8469 Merge "[LE broadcast sink] Add the broadcast sink apis" into tm-dev am: 5f937a7093 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130743

Change-Id: Id17dd2c85cdde329cfa8c59fdbba262313874338
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:09:25 +00:00
SongFerng Wang
bf872bd3a4 Merge "[LE broadcast sink] Add the broadcast sink apis" into tm-dev am: 5f937a7093 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130743

Change-Id: I972dc93c6c161192867574c1338afecfc5fedbed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:09:23 +00:00
Kholoud Mohamed
0a10b8cc8b Merge "Add missing settings strings" into tm-dev am: e1bcab3b51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944324

Change-Id: I89ebaf8c2ddebd58d2032707b1ab1f550e7e7c2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:09:05 +00:00
Kholoud Mohamed
ef770da20c Merge "Add missing settings strings" into tm-dev am: e1bcab3b51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944324

Change-Id: I4c4428399fbdf0618b4b77249a9ff40fd20549b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:56 +00:00
Betty Chang
902d4e1ff7 Merge "[LE] Convert the BluetoothLeBroadcastSubgroup to QR code format string" into tm-dev am: 439436e104 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18162824

Change-Id: I6f425e01a1caee828ea881ea50d07d88405502ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:44 +00:00
Betty Chang
806ec4fcbf Merge "[LE] Convert the BluetoothLeBroadcastSubgroup to QR code format string" into tm-dev am: 439436e104 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18162824

Change-Id: I662dabaa892180d5d6dd077f109ffcaf27bab752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:24 +00:00
Issei Suzuki
4cb4e80639 Merge "Disable overriding task animation through windowAnimationStyle attribute." into tm-qpr-dev am: 9631eeca32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17884326

Change-Id: Ic4b8d39a03ce82dc2788436dd06ab28ceebb1fcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:06:25 +00:00
SongFerng Wang
5f937a7093 Merge "[LE broadcast sink] Add the broadcast sink apis" into tm-dev 2022-05-05 08:50:20 +00:00
Kholoud Mohamed
e1bcab3b51 Merge "Add missing settings strings" into tm-dev 2022-05-05 08:14:57 +00:00
Betty Chang
439436e104 Merge "[LE] Convert the BluetoothLeBroadcastSubgroup to QR code format string" into tm-dev 2022-05-05 08:02:18 +00:00
Issei Suzuki
9631eeca32 Merge "Disable overriding task animation through windowAnimationStyle attribute." into tm-qpr-dev 2022-05-05 07:52:27 +00:00