Commit Graph

660392 Commits

Author SHA1 Message Date
Matt Casey
cbac3e92b5 Merge "Add accessibility label for edit FAB" into sc-dev am: 5b846d074f am: af6444da6f am: 7bc4e7ffeb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14680232

Change-Id: I9bcb5fe3e233cfe24f99b25a6123cf732f456b64
2021-05-21 19:18:28 +00:00
Hai Zhang
57943e92c2 Merge "Expose platform permission group mapping as public API." into sc-dev am: 5044308999 am: f0b67496fe am: 40339140a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670362

Change-Id: I22ccff3e00f0b359e4519383fa859b34c99de6a0
2021-05-21 19:14:29 +00:00
Matt Casey
7bc4e7ffeb Merge "Add accessibility label for edit FAB" into sc-dev am: 5b846d074f am: af6444da6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14680232

Change-Id: I4b6db858cada76aa58f45190145f3743ef6156d3
2021-05-21 18:31:43 +00:00
Hai Zhang
40339140a5 Merge "Expose platform permission group mapping as public API." into sc-dev am: 5044308999 am: f0b67496fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670362

Change-Id: I2db5a11602fde1ebef5c15357eeafbd440750fbf
2021-05-21 18:29:58 +00:00
Matt Casey
af6444da6f Merge "Add accessibility label for edit FAB" into sc-dev am: 5b846d074f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14680232

Change-Id: If2504aacba8130bdd9dd975f6e5c23bcfb977914
2021-05-21 17:51:07 +00:00
Hai Zhang
f0b67496fe Merge "Expose platform permission group mapping as public API." into sc-dev am: 5044308999
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670362

Change-Id: I5f6ab1d7f5ebbf42df80dda67c2e338b942cdfc8
2021-05-21 17:50:06 +00:00
Kweku Adams
b8a7b085c4 Merge "Fix OWNERS file." 2021-05-21 17:49:27 +00:00
Matt Casey
5b846d074f Merge "Add accessibility label for edit FAB" into sc-dev 2021-05-21 17:37:57 +00:00
Hai Zhang
5044308999 Merge "Expose platform permission group mapping as public API." into sc-dev 2021-05-21 17:26:10 +00:00
Jayant Chowdhary
a2bfc7089b Merge "DngCreator : Add support for maximum resolution mode captures for ultra high resolution sensors." into sc-dev am: 0c9840906a am: 82eef50e77 am: 331fffa4b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14454327

Change-Id: Iebc165a14652837050cae4381f0e18f0f48ec5d9
2021-05-21 17:23:02 +00:00
Elliott Hughes
4de5d35a8a Merge "maybePruneOldTraces: bail if modification times change." am: 9144eaf12f am: 72d2a3f7cc am: 69de46ba86 am: f83bdfe9c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1712554

Change-Id: Ib6bf5203a3765a822bfbdd50b652463a37e9244b
2021-05-21 17:22:50 +00:00
Cecilia Hong
1999eb6ac5 Merge "Update the media recommendation card UI for only showing recs from one app." into sc-dev am: 212037158d am: 3dc165f53b am: 62aa20e48b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550921

Change-Id: I9af99504522e5a41a2f34da981d0915d140fdb44
2021-05-21 17:22:38 +00:00
Jayant Chowdhary
7c868b6dac Merge "DngCreator : Add support for maximum resolution mode captures for ultra high resolution sensors." into sc-dev am: 0c9840906a am: 814b2974a4 am: d3135570bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14454327

Change-Id: Ic3afcfda81e7f9d699db0664dc9dfdf44f3997a6
2021-05-21 17:22:21 +00:00
Grace Cheng
abfccfb885 Merge "Add plumbing to show/hide side-fps UI affordance near power button" into sc-dev am: 961749155a am: d6c5d30814 am: 98a9cdd0ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14628982

Change-Id: I67430cfc5820f6eeeaf978f913adf7393e0be151
2021-05-21 17:22:11 +00:00
Lee Shombert
0e90fd12cb Merge "Test for null package in isEnabledAndMatches()" into sc-dev am: 6c83011d9c am: e1b3bb4954 am: 255888e165
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14668164

Change-Id: I3a25d21defc94e653d0a7685a815f72c5a6f4a37
2021-05-21 17:21:56 +00:00
Cecilia Hong
09984caf73 Merge "Update the media recommendation card UI for only showing recs from one app." into sc-dev am: 212037158d am: 650323e9fb am: 3739cf71eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550921

Change-Id: I519d4bb51b9c185ee99773d5d19e194ce8d3bc9b
2021-05-21 17:21:44 +00:00
Grace Cheng
b03339a582 Merge "Add plumbing to show/hide side-fps UI affordance near power button" into sc-dev am: 961749155a am: fc0c6cd6af am: f7a278df19
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14628982

Change-Id: I6a337cde244fe8d87a3a8e525462d7f3dc3781e3
2021-05-21 17:21:30 +00:00
Lee Shombert
6f8e02ccff Merge "Test for null package in isEnabledAndMatches()" into sc-dev am: 6c83011d9c am: e28ce40823 am: 6c84bf3298
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14668164

Change-Id: Ic827b5953910782049494bd777f9f89acc9f1755
2021-05-21 17:21:14 +00:00
Jayant Chowdhary
331fffa4b2 Merge "DngCreator : Add support for maximum resolution mode captures for ultra high resolution sensors." into sc-dev am: 0c9840906a am: 82eef50e77
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14454327

Change-Id: I0a45cd080297a4127b7f529fa72acd8c362e8096
2021-05-21 17:20:28 +00:00
Elliott Hughes
f83bdfe9c2 Merge "maybePruneOldTraces: bail if modification times change." am: 9144eaf12f am: 72d2a3f7cc am: 69de46ba86
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1712554

Change-Id: I783858d1215dae38814d67dc9b7c88233a9c6d91
2021-05-21 17:20:20 +00:00
Cecilia Hong
62aa20e48b Merge "Update the media recommendation card UI for only showing recs from one app." into sc-dev am: 212037158d am: 3dc165f53b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550921

Change-Id: Ic4d1179191d43e67dba30fd22d88084966389c3c
2021-05-21 17:19:56 +00:00
Jayant Chowdhary
d3135570bd Merge "DngCreator : Add support for maximum resolution mode captures for ultra high resolution sensors." into sc-dev am: 0c9840906a am: 814b2974a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14454327

Change-Id: I1b3e23f40e713105ef30a0accbe3b4b492194435
2021-05-21 17:19:51 +00:00
Grace Cheng
98a9cdd0ba Merge "Add plumbing to show/hide side-fps UI affordance near power button" into sc-dev am: 961749155a am: d6c5d30814
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14628982

Change-Id: Ib70e653f12d2cdd44f43d171a1b0762e311d893b
2021-05-21 17:19:36 +00:00
Jayant Chowdhary
82eef50e77 Merge "DngCreator : Add support for maximum resolution mode captures for ultra high resolution sensors." into sc-dev am: 0c9840906a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14454327

Change-Id: I3e5d8108b654184ef6716371614ad5df9e64cf50
2021-05-21 17:19:15 +00:00
Lee Shombert
255888e165 Merge "Test for null package in isEnabledAndMatches()" into sc-dev am: 6c83011d9c am: e1b3bb4954
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14668164

Change-Id: Iefb7bb88af42b2ef851d14b08d4bf9e2b7c660eb
2021-05-21 17:19:12 +00:00
Cecilia Hong
3739cf71eb Merge "Update the media recommendation card UI for only showing recs from one app." into sc-dev am: 212037158d am: 650323e9fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550921

Change-Id: I691872d3fe44da49850771a20e2c13e73f240a9e
2021-05-21 17:18:21 +00:00
Grace Cheng
f7a278df19 Merge "Add plumbing to show/hide side-fps UI affordance near power button" into sc-dev am: 961749155a am: fc0c6cd6af
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14628982

Change-Id: Ib0faf3f5e73973fef68a18bf0f8b3f73df639c29
2021-05-21 17:17:55 +00:00
Lee Shombert
6c84bf3298 Merge "Test for null package in isEnabledAndMatches()" into sc-dev am: 6c83011d9c am: e28ce40823
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14668164

Change-Id: I6a589a2bd201c915b602f14053d0640ce031df7a
2021-05-21 17:17:27 +00:00
Jayant Chowdhary
814b2974a4 Merge "DngCreator : Add support for maximum resolution mode captures for ultra high resolution sensors." into sc-dev am: 0c9840906a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14454327

Change-Id: I6fa81712517856d8db0157279a8ffcf169f61ec6
2021-05-21 17:11:38 +00:00
Elliott Hughes
69de46ba86 Merge "maybePruneOldTraces: bail if modification times change." am: 9144eaf12f am: 72d2a3f7cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1712554

Change-Id: I0d2b0d8ee552e268980a69c5e9548529e8adad84
2021-05-21 17:10:27 +00:00
Jayant Chowdhary
0c9840906a Merge "DngCreator : Add support for maximum resolution mode captures for ultra high resolution sensors." into sc-dev 2021-05-21 17:06:41 +00:00
Cecilia Hong
650323e9fb Merge "Update the media recommendation card UI for only showing recs from one app." into sc-dev am: 212037158d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550921

Change-Id: Ibe9a578c125f06aa0022765632fcdbfb54ec48eb
2021-05-21 17:04:35 +00:00
Grace Cheng
fc0c6cd6af Merge "Add plumbing to show/hide side-fps UI affordance near power button" into sc-dev am: 961749155a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14628982

Change-Id: I3b4dd09801d179bbf5abb0eeb3b6a5555be1a511
2021-05-21 17:04:11 +00:00
Lee Shombert
e28ce40823 Merge "Test for null package in isEnabledAndMatches()" into sc-dev am: 6c83011d9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14668164

Change-Id: I1cf751780b9c770f3d623582ba0eb6918d3cf5aa
2021-05-21 17:03:47 +00:00
Cecilia Hong
3dc165f53b Merge "Update the media recommendation card UI for only showing recs from one app." into sc-dev am: 212037158d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550921

Change-Id: I7226c4e0096e9340fd5e949025798179dbef91d1
2021-05-21 17:02:20 +00:00
Grace Cheng
d6c5d30814 Merge "Add plumbing to show/hide side-fps UI affordance near power button" into sc-dev am: 961749155a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14628982

Change-Id: I4666c6015024ca755e8588c90d17b17eca423968
2021-05-21 17:01:55 +00:00
Lee Shombert
e1b3bb4954 Merge "Test for null package in isEnabledAndMatches()" into sc-dev am: 6c83011d9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14668164

Change-Id: I2adb3ab388e721b9de5a6eddc183aedf17afdd95
2021-05-21 17:01:30 +00:00
Cecilia Hong
212037158d Merge "Update the media recommendation card UI for only showing recs from one app." into sc-dev 2021-05-21 17:00:14 +00:00
Grace Cheng
961749155a Merge "Add plumbing to show/hide side-fps UI affordance near power button" into sc-dev 2021-05-21 16:58:51 +00:00
TreeHugger Robot
164824b937 Merge "BatteryUsageStats atom - frameworks/base" into sc-dev am: e4cc52acce am: dc341cbacf am: c75c998ba0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14443150

Change-Id: I20fec9c49e7c804a6f7bfb165e5e7c1a269b3dac
2021-05-21 16:56:52 +00:00
Hangyu Kuang
25dc473401 Merge "Revert "trancoding: lazy-start transcoding service"" into sc-dev am: 36da5805e5 am: babefcf59f am: a1f32b71b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14534458

Change-Id: Ib80c13802c812475c3e61d9818eba6cbc7f06647
2021-05-21 16:56:30 +00:00
TreeHugger Robot
c75c998ba0 Merge "BatteryUsageStats atom - frameworks/base" into sc-dev am: e4cc52acce am: dc341cbacf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14443150

Change-Id: I37096b4776298af325435d46dbbaacbcf59a0a91
2021-05-21 16:56:00 +00:00
TreeHugger Robot
6accef1d0d Merge "BatteryUsageStats atom - frameworks/base" into sc-dev am: e4cc52acce am: 3ea3f384c5 am: 807011ff47
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14443150

Change-Id: I1f74e42226f73af3be4a14ca1d15ba678077d7ce
2021-05-21 16:55:59 +00:00
Hangyu Kuang
a1f32b71b9 Merge "Revert "trancoding: lazy-start transcoding service"" into sc-dev am: 36da5805e5 am: babefcf59f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14534458

Change-Id: I3ba33bf17ddb693caffafb546cc40d9c36d5c42c
2021-05-21 16:55:27 +00:00
Hangyu Kuang
2901fd6dbe Merge "Revert "trancoding: lazy-start transcoding service"" into sc-dev am: 36da5805e5 am: d3b1301478 am: 3773ed4433
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14534458

Change-Id: I3dc4aab649fd5717c5e7f2281325dfea43d6cbb5
2021-05-21 16:55:17 +00:00
Calin Juravle
fb6fa70694 [automerger skipped] Merge "Marked apks loaded by isolated processes as usedByOthers" am: 4c656038c9 am: c59aa931f7 -s ours am: 13fed45355 -s ours am: 5bf5ba7bc9 -s ours
am skip reason: Merged-In Ib041584926ea142f37993f434a728d90db30e9bc with SHA-1 9ba9092d83 is already in history

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

Change-Id: I79c8dcc4ec34608d5f41f86facdbd218a668eccc
2021-05-21 16:54:58 +00:00
Elliott Hughes
72d2a3f7cc Merge "maybePruneOldTraces: bail if modification times change." am: 9144eaf12f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1712554

Change-Id: I9b2e87531f9167aa7b83fd2b30bc75722dee9257
2021-05-21 16:54:17 +00:00
Lee Shombert
6c83011d9c Merge "Test for null package in isEnabledAndMatches()" into sc-dev 2021-05-21 16:39:24 +00:00
TreeHugger Robot
dc341cbacf Merge "BatteryUsageStats atom - frameworks/base" into sc-dev am: e4cc52acce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14443150

Change-Id: I7582023e6886227c68c3815c1910004ce6d7281b
2021-05-21 16:31:54 +00:00
TreeHugger Robot
807011ff47 Merge "BatteryUsageStats atom - frameworks/base" into sc-dev am: e4cc52acce am: 3ea3f384c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14443150

Change-Id: Ie66bb6bbdcad1ef7c67af469947a8381efef0f19
2021-05-21 16:31:35 +00:00