Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
630,185 Commits 3 Branches 0 Tags
d12399892d538525fa0ffdfe76cc001f7cbbddf2
Commit Graph

630185 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James O'Leary
d12399892d Merge "Restore text color state list" into sc-dev am: 84988368d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13750230

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I186d7b05e2ffc893b1a99a2bce18682d8c581d48
 2021-03-03 16:01:38 +00:00
James O'Leary
84988368d2 Merge "Restore text color state list" into sc-dev 2021-03-03 15:48:24 +00:00
Nathaniel Nifong
c5f42123c7 Merge "Respect paints aa setting when drawing bitmap" into sc-dev am: 9570000af3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13677157

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieabe9941467801c0f2db7c2cc345c043c168c8f9
 2021-03-03 15:41:41 +00:00
TreeHugger Robot
4a68fb6f38 Merge "Add bidirectional scroll capture in infinite scroll." into sc-dev am: 461ab225f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13743153

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1bbb5145182a75d4ad33388bb3dcd079769b00f
 2021-03-03 15:40:44 +00:00
Nathaniel Nifong
9570000af3 Merge "Respect paints aa setting when drawing bitmap" into sc-dev 2021-03-03 15:38:03 +00:00
TreeHugger Robot
461ab225f5 Merge "Add bidirectional scroll capture in infinite scroll." into sc-dev 2021-03-03 15:29:35 +00:00
Saumya Pathak
a36174a238 [automerger skipped] Merge "Adding API to get PendingIntent to launch manageSpaceActivity" into sc-dev am: 081b5923b3 -s ours 
am skip reason: Change-Id Id3d23fcca992819238cd24fc441c98719d5e7709 with SHA-1 5239aa140a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b64aac19d5e60ac21a755756029901d530d7530
 2021-03-03 14:47:05 +00:00
Ming-Shin Lu
bf5ceedda8 Merge "Restore the last IME visiblity of the app window when allowed" into sc-dev am: 02116c6a4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13674731

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f950de6ab4d8927a58bef777a4a11e25fccc5a8
 2021-03-03 14:46:37 +00:00
Saumya Pathak
081b5923b3 Merge "Adding API to get PendingIntent to launch manageSpaceActivity" into sc-dev 2021-03-03 14:37:24 +00:00
Ming-Shin Lu
02116c6a4f Merge "Restore the last IME visiblity of the app window when allowed" into sc-dev 2021-03-03 14:30:15 +00:00
Fabian Kozynski
4c67ad1235 Merge "Align QSCustomizer with QSPanel" into sc-dev am: 2e21acc3da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13727142

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7868a28ee68f4011ca9d3308d5b778464712b839
 2021-03-03 14:28:42 +00:00
Fabian Kozynski
2e21acc3da Merge "Align QSCustomizer with QSPanel" into sc-dev 2021-03-03 14:07:25 +00:00
Automerger Merge Worker
aba0bba73e Merge changes from topic "am-63843d5c32d447738964aada8df755cc" into rvc-qpr-dev-plus-aosp am: 09eb1365c6 am: af19d05c7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13462445

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d3cab4cfbff5a7314ce57460f14b7fa2b3fff5e
 2021-03-03 13:42:03 +00:00
TreeHugger Robot
56c5d3a021 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into rvc-qpr-dev am: 27ea4217af am: eb351b554c -s ours am: c1f1a3c865 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2ccd41716042200b59ca2e3c9861274e9025bc0
 2021-03-03 13:41:59 +00:00
Abhijeet Kaur
c030a3be55 Merge "Update mount values to be consistent with IVold.aidl" am: ddd2a13c38 am: 3fe1ba327b am: d068d394a5 am: c8532f3dee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c2485a71e4773580da4219e555ed834dbdc3d9b
 2021-03-03 13:41:48 +00:00
Yi Kong
aeeda39855 Merge "profcollect: Update binder method names" am: 453966a20b am: f388bf48ac am: 1238f9f6fa am: 7fadc9f800 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593776

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21ac3fd634098d29089fcb36d6a17bed2eb29714
 2021-03-03 13:41:34 +00:00
Treehugger Robot
74113f4218 Merge "Additional metadata keys for Fast Pair" am: ad1bbc487c am: e1826640ee am: 81056adb88 am: 021a8f8852 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596412

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia859c61b1cf0747531125e624c9d4fd18950368f
 2021-03-03 13:41:18 +00:00
Treehugger Robot
447289c954 Merge "Extend timeout for receiving broadcasts" am: 15b5b58a7c am: a117895548 am: 0343d52623 am: af7065cc97 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614339

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14d649cbc5f052c2ec3b95fb9c1d3d75d285c4e5
 2021-03-03 13:40:47 +00:00
Benedict Wong
83868ae880 Merge changes Ib439bde4,I5bc0fe94,I72abf1e2,Id1813bcb am: a3fab46d7b am: 46b1ae0666 am: 7ed7c6a3cb am: 0b6462929f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611230

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc2b17635eab1ba21aaedf3fc8e903f679679ea9
 2021-03-03 13:40:33 +00:00
Lorenzo Colitti
4a717cd8ed Merge changes Idfb5e149,Ia52b24c5 am: 8c93a76901 am: 7ff87b2116 am: 9f4ed8cc97 am: fcda34c652 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612040

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4af99bf3a915de352a3b84ff5f2fda7deed4291
 2021-03-03 13:40:12 +00:00
Yo Chiang
950f5ea372 Merge "DSUService: stopSelf() only if no ongoing installation" am: 0fb5c3f306 am: 3121af69d3 am: 7ec7d60f45 am: 47b02fee45 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1609094

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43ad46b6d9f94666e17eb53580417510715b01bd
 2021-03-03 13:39:59 +00:00
Chilun Huang
434737ae2b Merge "Add ownership for ConfigurationController" am: c8677e4d05 am: 00a8690dc9 am: e58d56d580 am: 921b1b0055 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612036

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I927b04c32b392b1d736c5cdd58104a8d7982e285
 2021-03-03 13:39:33 +00:00
Andy Hung
2701f5509e Merge "Add AudioMetadata keys related to active audio presentation" am: 2c27a78902 am: 8ad670ef53 am: 54a1135d13 am: 2dc94a3183 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591453

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24feaf36b8820f0c468919723f1d67a3a7f26762
 2021-03-03 13:39:01 +00:00
Paul Hu
8464f70e84 [automerger skipped] Merge "Replace ConnectivityManager hidden symbols on SettingsLib" am: 56b1b24940 am: cf996f7f88 am: a8ebd89cdb -s ours am: f276fa0294 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601533

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b3c30c225621e907879da71139a24d997175408
 2021-03-03 13:38:25 +00:00
Automerger Merge Worker
af19d05c7f Merge changes from topic "am-63843d5c32d447738964aada8df755cc" into rvc-qpr-dev-plus-aosp am: 09eb1365c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13462445

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7ae417e807f629fa52cee2442dd6cc2ad8daf6a
 2021-03-03 13:32:55 +00:00
TreeHugger Robot
c1f1a3c865 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into rvc-qpr-dev am: 27ea4217af am: eb351b554c -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If69972ced83cc7c166517bae6851afbf0cf33a19
 2021-03-03 13:32:47 +00:00
Abhijeet Kaur
c8532f3dee Merge "Update mount values to be consistent with IVold.aidl" am: ddd2a13c38 am: 3fe1ba327b am: d068d394a5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I355197c6f1e9a5e41ad7738b31cc1515718891d9
 2021-03-03 13:32:00 +00:00
Yi Kong
7fadc9f800 Merge "profcollect: Update binder method names" am: 453966a20b am: f388bf48ac am: 1238f9f6fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593776

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26d5ce2f8ce0d7315619ab444146b94eaca29147
 2021-03-03 13:31:15 +00:00
Treehugger Robot
021a8f8852 Merge "Additional metadata keys for Fast Pair" am: ad1bbc487c am: e1826640ee am: 81056adb88 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596412

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia447b1cd574a51477d1dd383dbeaa694ace7ffb9
 2021-03-03 13:30:03 +00:00
Treehugger Robot
af7065cc97 Merge "Extend timeout for receiving broadcasts" am: 15b5b58a7c am: a117895548 am: 0343d52623 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614339

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ba4984427e72554c0aff2c173e72bdb93a9ea3c
 2021-03-03 13:29:45 +00:00
Benedict Wong
0b6462929f Merge changes Ib439bde4,I5bc0fe94,I72abf1e2,Id1813bcb am: a3fab46d7b am: 46b1ae0666 am: 7ed7c6a3cb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611230

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0a452c676a4873ccc8e1f310947a36d042b68a5
 2021-03-03 13:29:27 +00:00
Lorenzo Colitti
fcda34c652 Merge changes Idfb5e149,Ia52b24c5 am: 8c93a76901 am: 7ff87b2116 am: 9f4ed8cc97 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612040

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3fe087370d66482d7699d569b32e364900f6dc3
 2021-03-03 13:29:03 +00:00
Yo Chiang
47b02fee45 Merge "DSUService: stopSelf() only if no ongoing installation" am: 0fb5c3f306 am: 3121af69d3 am: 7ec7d60f45 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1609094

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I07d45bb2ce07850d05d3bfaa798075a2ebbaa19e
 2021-03-03 13:28:41 +00:00
Chilun Huang
921b1b0055 Merge "Add ownership for ConfigurationController" am: c8677e4d05 am: 00a8690dc9 am: e58d56d580 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612036

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd9deec4fbed0cc64f9803ba6142f602b7597f8c
 2021-03-03 13:28:21 +00:00
Andy Hung
2dc94a3183 Merge "Add AudioMetadata keys related to active audio presentation" am: 2c27a78902 am: 8ad670ef53 am: 54a1135d13 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591453

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f2448f544f687ea7119045ead91315d339770a2
 2021-03-03 13:27:47 +00:00
Paul Hu
f276fa0294 [automerger skipped] Merge "Replace ConnectivityManager hidden symbols on SettingsLib" am: 56b1b24940 am: cf996f7f88 am: a8ebd89cdb -s ours 
am skip reason: skipped by user reminv

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I419b627cb3e6f0dd52740ec004496bccbaab64d2
 2021-03-03 13:27:16 +00:00
TreeHugger Robot
6e73f35435 Merge "Remove frozen bounds of activity and task" into sc-dev am: cf82f60caf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13640531

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1fb4b4d4a07b1d0158d23b8769f5266c491197dd
 2021-03-03 13:22:38 +00:00
Oli Lan
5a24e09c6e Merge "Add deviceconfig flag to control clipboard access notifications." into sc-dev am: 82bd6fecd1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13714650

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I462e3d3d5fa5f097aaef0cf10eb4542668898545
 2021-03-03 13:22:14 +00:00
TreeHugger Robot
cf82f60caf Merge "Remove frozen bounds of activity and task" into sc-dev 2021-03-03 13:06:56 +00:00
Oli Lan
82bd6fecd1 Merge "Add deviceconfig flag to control clipboard access notifications." into sc-dev 2021-03-03 13:05:17 +00:00
Automerger Merge Worker
09eb1365c6 Merge changes from topic "am-63843d5c32d447738964aada8df755cc" into rvc-qpr-dev-plus-aosp 
* changes:
  Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into rvc-qpr-dev am: 27ea4217af
  [RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard. am: acb731f978
 2021-03-03 13:03:13 +00:00
TreeHugger Robot
eb351b554c Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into rvc-qpr-dev am: 27ea4217af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13462445

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic774bb998cd9d61abaa9e43c5a40785f07b8e5dc
 2021-03-03 13:02:59 +00:00
Junyu Lai
be6d014f2c Merge "[FUI18] Expose notifyNetworkStatus as system API" into sc-dev am: 755168f912 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13749978

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9fc215289dd1e110c2df7f0aeaebb1c67847e7f
 2021-03-03 13:02:52 +00:00
Abhijeet Kaur
d068d394a5 Merge "Update mount values to be consistent with IVold.aidl" am: ddd2a13c38 am: 3fe1ba327b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica39ed0f0f774ecf7d0342b6f79f57e6e1fe1f3c
 2021-03-03 13:02:43 +00:00
Jonathan Scott
75ebba1429 [RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard. am: acb731f978 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13462445

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b7a3110a265c012aec7e49141d4465f8f9d4d22
 2021-03-03 13:02:37 +00:00
TreeHugger Robot
27ea4217af Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into rvc-qpr-dev 2021-03-03 12:29:20 +00:00
Junyu Lai
755168f912 Merge "[FUI18] Expose notifyNetworkStatus as system API" into sc-dev 2021-03-03 11:45:45 +00:00
Abhijeet Kaur
3fe1ba327b Merge "Update mount values to be consistent with IVold.aidl" am: ddd2a13c38 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2851203ddb2af3702f9603eefd17bc26fc9aab64
 2021-03-03 11:12:54 +00:00
Arthur Hung
0a912520a2 Merge "Refactor ShortcutManager to ModifierShortcutManager" into sc-dev am: 5d3166d403 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13432449

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25e17a4aa72ab7d317a8358b956f0ca5ffa61d67
 2021-03-03 10:55:02 +00:00
Louis Chang
ea8a0ceb28 Merge "Clear launch root tasks when WM shell is killed" into sc-dev am: 9a7ef1bb27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13696665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43f63630de223073b48e022dcc4a926be656868f
 2021-03-03 10:53:44 +00:00