Commit Graph

647037 Commits

Author SHA1 Message Date
Eran Messeri
9fbb74e0d5 Merge "Document access to device identifiers on managed devices" into sc-dev am: 84b3b6fb99
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14251404

Change-Id: If7656df1f2dcecb055c6ab5f68297f434e765ae2
2021-05-03 07:40:18 +00:00
Eran Messeri
84b3b6fb99 Merge "Document access to device identifiers on managed devices" into sc-dev 2021-05-03 07:27:22 +00:00
TreeHugger Robot
9804b8209a Merge "Add the javadoc for HotwordDetectionService" into sc-dev am: 4a247f9186
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14326782

Change-Id: I78835c6e5d266bbae756e0f8c7773928301ec30b
2021-05-03 06:53:34 +00:00
TreeHugger Robot
4a247f9186 Merge "Add the javadoc for HotwordDetectionService" into sc-dev 2021-05-03 06:40:04 +00:00
Bonian Chen
590aef6a50 Merge "Revert "Enable remote animation for keygaurd going away."" into sc-dev am: 7fea8cef4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14362924

Change-Id: I3fdd7c55533ee2ba777ac2c4dc7e1c3b763c7960
2021-05-03 04:55:34 +00:00
Bonian Chen
7fea8cef4e Merge "Revert "Enable remote animation for keygaurd going away."" into sc-dev 2021-05-03 04:30:35 +00:00
Junyu Lai
d6d60d4ba5 Merge "Add doc to getNetworkCapabilities" am: c4520f1398 am: 1e15e9693a am: 488b6ef04a am: 7c003ae011
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690668

Change-Id: I7391558901f992a76f937173b1228563f3a5681d
2021-05-03 04:19:36 +00:00
Junyu Lai
7c003ae011 Merge "Add doc to getNetworkCapabilities" am: c4520f1398 am: 1e15e9693a am: 488b6ef04a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690668

Change-Id: I0c41878350ffe4015fe9e6034651f50366503dfe
2021-05-03 04:06:34 +00:00
Rhed Jao
0a20ea1fe9 Merge "Clean up uses-native-library targetSdkVersion check" into sc-dev am: b5716e698d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14340445

Change-Id: I1756afef43be9c763ad4fb9990b1b7398db2df93
2021-05-03 03:50:40 +00:00
Junyu Lai
488b6ef04a Merge "Add doc to getNetworkCapabilities" am: c4520f1398 am: 1e15e9693a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690668

Change-Id: Iab7908bbeb3fd58599d7702e44450a4224a78f5b
2021-05-03 03:50:18 +00:00
lpeter
8fbe605e1a Add the javadoc for HotwordDetectionService
Bug: 180945857
Test: Build
Change-Id: I42bb01949ec019da80077eeaf96c63b2c94f70a5
2021-05-03 11:48:37 +08:00
Junyu Lai
1e15e9693a Merge "Add doc to getNetworkCapabilities" am: c4520f1398
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690668

Change-Id: I81c764ca04e3a300272ba18faa35d9fb0ecb54b1
2021-05-03 03:34:22 +00:00
Rhed Jao
b5716e698d Merge "Clean up uses-native-library targetSdkVersion check" into sc-dev 2021-05-03 03:27:31 +00:00
Junyu Lai
c4520f1398 Merge "Add doc to getNetworkCapabilities" 2021-05-03 03:16:24 +00:00
Jerry Chang
2bc7feae24 Merge "Make sure to reorder side stage above main stage to prevent flicker" into sc-dev am: 5663de7849
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14388191

Change-Id: I82a278e5eb142e5baef3a8018c2b71465f8f71a5
2021-05-03 02:56:03 +00:00
Jerry Chang
5663de7849 Merge "Make sure to reorder side stage above main stage to prevent flicker" into sc-dev 2021-05-03 02:36:14 +00:00
Santos Cordon
2c3bcfa9f3 Merge "Fix crash on device without nits-backlight mapping" into sc-dev am: 3ed02ffeb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14392204

Change-Id: Icb21e592f4b01b70b0bf07bae92f544934529f0a
2021-05-02 19:44:46 +00:00
Santos Cordon
3ed02ffeb1 Merge "Fix crash on device without nits-backlight mapping" into sc-dev 2021-05-02 19:29:05 +00:00
TreeHugger Robot
2b0e802c58 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: abc738e1c0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I219f0c0c47cf0e1017b560312a2765c73b50085e
2021-05-02 12:39:05 +00:00
TreeHugger Robot
20be98a763 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 617ba8186d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idcce8f7777def4ed632c084cc555bc61e02c811a
2021-05-02 12:38:32 +00:00
TreeHugger Robot
abc738e1c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-02 12:27:39 +00:00
TreeHugger Robot
617ba8186d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-02 12:22:03 +00:00
TreeHugger Robot
e54673073f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f357945196 -s ours am: 8f5ae02ce1 -s ours am: d522072f2e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8679b2aca5e991abe9983a11074aa7120d8cb68f
2021-05-02 11:39:38 +00:00
TreeHugger Robot
f61b9baa80 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f63c0ad801 -s ours am: 9af600c09a -s ours am: 332ad74353 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e46ef4ea2bce5b33ebd5b15a4a28e02cf452607
2021-05-02 11:39:29 +00:00
TreeHugger Robot
0da9d14567 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-02 11:34:25 +00:00
TreeHugger Robot
d522072f2e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f357945196 -s ours am: 8f5ae02ce1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I203f7ac4e039e8f39b2bbf993f4b2809d9d343b7
2021-05-02 11:19:10 +00:00
TreeHugger Robot
332ad74353 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f63c0ad801 -s ours am: 9af600c09a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0c344b7f1ee1b3276172c7fb72cc43f70ae1fb34
2021-05-02 11:18:57 +00:00
TreeHugger Robot
8f5ae02ce1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f357945196 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia13dcb315f6533874f6d0556310a113b5b1b11a7
2021-05-02 11:00:32 +00:00
TreeHugger Robot
9af600c09a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f63c0ad801 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icada52d0f219a636a931ec76a0fd9900927ce650
2021-05-02 11:00:18 +00:00
TreeHugger Robot
f357945196 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-05-02 10:54:11 +00:00
TreeHugger Robot
f63c0ad801 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-05-02 10:41:51 +00:00
TreeHugger Robot
5bd85da2b6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4820193276 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iadf0ac570a87395faea5d48f08fda878d34229be
2021-05-02 10:27:46 +00:00
TreeHugger Robot
4820193276 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-02 10:12:01 +00:00
Bill Yi
7821d984e8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I890ac380455451ffe31b57732bbe2c21a42e2d4b
2021-05-02 09:39:41 +00:00
Bill Yi
7ec2a29f78 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I31f2b4512164bb043d78d503f4f38accedc49f8d
2021-05-02 09:28:41 +00:00
Bill Yi
e9c7866326 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1122e63bab -s ours am: 4f5c48bf20 -s ours am: c31d0327ab -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55ba0f287cc8ca108fd0320f6fa04a3304c0c9e3
2021-05-02 09:28:05 +00:00
Bill Yi
212fd2b7a0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5000390039e9495fe1aea6d6578e844b8d3fd593
2021-05-02 09:18:01 +00:00
Bill Yi
e25182ee82 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib1021cf1a44b86a7defb6394062aea617685f724
2021-05-02 09:16:12 +00:00
Bill Yi
c31d0327ab [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1122e63bab -s ours am: 4f5c48bf20 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I28672ed7b344475bf8b50bfbd844cd26ee8d70bc
2021-05-02 09:14:43 +00:00
Bill Yi
1580119493 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icd04e10fa5acfac2914c25cacb961f7b92dda732
2021-05-02 09:14:41 +00:00
TreeHugger Robot
7caf62fbf3 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-02 09:10:58 +00:00
Bill Yi
4f5c48bf20 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1122e63bab -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iba350914b061bef750449f8d9ca13d5fbb940de7
2021-05-02 08:57:33 +00:00
Bill Yi
557dc61d2b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6b2ae399f425eca0b1b4810a991ddf57864231de
2021-05-02 07:07:12 +00:00
Bill Yi
f41a26a615 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If834d0084a2e23121735bfb38c17f04bd9c98127
2021-05-02 06:50:40 +00:00
Bill Yi
1122e63bab Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If6246b9bc37077ea6b02e8135fb5a45839307687
2021-05-02 06:16:00 +00:00
Chris Li
c1afcc300d Merge "Determine whether to support activities in multi window (3/n)" into sc-dev am: e5fe75d2b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14355985

Change-Id: Ie10d1d1bf4461cc7b86cb90a75610fa1fde6f66b
2021-05-01 23:49:24 +00:00
Jay Aliomer
cf5ff6e2c9 Merge "Fixed an issue where the notification was clipped during the translation" into sc-dev am: 431e711e47
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14353377

Change-Id: I32472eceab1deb8853313e7ab86700d9eed13853
2021-05-01 23:48:34 +00:00
Chris Li
e5fe75d2b1 Merge "Determine whether to support activities in multi window (3/n)" into sc-dev 2021-05-01 23:46:11 +00:00
Jay Aliomer
431e711e47 Merge "Fixed an issue where the notification was clipped during the translation" into sc-dev 2021-05-01 23:27:37 +00:00
Ruslan Tkhakokhov
c6f12d3587 Merge "Make changes guarding the new opt-out scheme overridable" into sc-dev am: bdd1f279c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14353381

Change-Id: I751d2ac6f3bde00f1361363f67cb60156cf36295
2021-05-01 13:41:55 +00:00