Commit Graph

640852 Commits

Author SHA1 Message Date
Kriti Dang
27bed48c5f Merge "Adding unknown constant to AudioManager ENCODED_SURROUND_OUTPUT mode constants" into sc-dev am: 7e6abece7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14064205

Change-Id: Ifbcfc2784f04c0435d8535562ecbc4751df76d4e
2021-04-09 13:31:04 +00:00
Kriti Dang
7e6abece7d Merge "Adding unknown constant to AudioManager ENCODED_SURROUND_OUTPUT mode constants" into sc-dev 2021-04-09 12:51:31 +00:00
Anton Hansson
8a6a35d386 Separate out lists of modules from build rules am: 33b9b855f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14138467

Change-Id: I19f76c0849b1ecb0aedf465ba8206b131738ef59
2021-04-09 12:22:48 +00:00
Anton Hansson
33b9b855f3 Separate out lists of modules from build rules
This simplifies management of the build rules across different branches
that may have different lists of modules.

Additionally, we dedupe the list of module system stubs.

Bug: 184839225
Test: m
Change-Id: Ibef1fb686305b5b1b50811b7d1c6d677d07d7177
2021-04-09 10:22:34 +01:00
Orion Hodson
10d4a94560 Merge "Revert "Remove setFrame from surface_control setGeometry"" into sc-dev am: 397cb14bd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14126988

Change-Id: I68ed44ecaef8895c1a4b438f1114506e2eb29ff0
2021-04-09 07:41:27 +00:00
Orion Hodson
397cb14bd3 Merge "Revert "Remove setFrame from surface_control setGeometry"" into sc-dev 2021-04-09 07:34:01 +00:00
Charles Chen
8926087107 Merge "Allow config context to inflate views" into sc-dev am: c22aff4e4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13482649

Change-Id: Idc103720792c36b1a1e3331a5d2bea72e87e8efa
2021-04-09 07:17:18 +00:00
TreeHugger Robot
7f6cff76e5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0584a987a4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I833a79803ada7a84bf4318fd41723acbb8a1dcd4
2021-04-09 07:17:02 +00:00
Charles Chen
c22aff4e4d Merge "Allow config context to inflate views" into sc-dev 2021-04-09 06:56:16 +00:00
TreeHugger Robot
0584a987a4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-09 06:45:32 +00:00
Remi NGUYEN VAN
56d46bdbba Merge "Add option to make sign-in notification ongoing" into sc-dev am: 8ee625f06d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14048285

Change-Id: I4bfb33d68324bc1e61f3a0d0021181d5161b5881
2021-04-09 06:34:16 +00:00
Remi NGUYEN VAN
8ee625f06d Merge "Add option to make sign-in notification ongoing" into sc-dev 2021-04-09 06:17:17 +00:00
SongFerng Wang
7707048742 Merge "Create config KEY_ADDITIONAL_NR_ADVANCED_BAND_INT_ARRAY" into sc-dev am: b4f7678c4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14112966

Change-Id: I28098a49ae163ba8b718278cd24b753b4516a571
2021-04-09 06:13:57 +00:00
Haiping Yang
1b8b0109c1 Merge "Manual cp of ag/9958222" 2021-04-09 05:57:41 +00:00
SongFerng Wang
b4f7678c4a Merge "Create config KEY_ADDITIONAL_NR_ADVANCED_BAND_INT_ARRAY" into sc-dev 2021-04-09 05:45:31 +00:00
Jeff Sharkey
2e58634383 Merge "New BLUETOOTH_ADVERTISE manifest permission." into sc-dev am: 7627719334
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14065920

Change-Id: I60b159d8ebf1e72a4b92769845a659d3dc24c4ae
2021-04-09 05:37:30 +00:00
TreeHugger Robot
150ce3b2b5 Merge "Create SettingsTransitionActivity" into sc-dev am: 2305704ba5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14032706

Change-Id: Idccd744d842cb498536f5f12745c7a38c3180352
2021-04-09 05:36:02 +00:00
TreeHugger Robot
826fe598b7 Merge "usb: Address some API review comments" into sc-dev am: 0a0ddadab5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13921669

Change-Id: I06e3e7be6dad6dfa84d5b756ce33e35af8316adf
2021-04-09 05:35:35 +00:00
Jeff Sharkey
7627719334 Merge "New BLUETOOTH_ADVERTISE manifest permission." into sc-dev 2021-04-09 05:22:23 +00:00
TreeHugger Robot
2305704ba5 Merge "Create SettingsTransitionActivity" into sc-dev 2021-04-09 05:21:17 +00:00
TreeHugger Robot
0a0ddadab5 Merge "usb: Address some API review comments" into sc-dev 2021-04-09 05:14:47 +00:00
TreeHugger Robot
cdb5f00f96 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 5b44b784be -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie0d0db238c4131d39cc1c0682986654deb795c90
2021-04-09 05:13:56 +00:00
TreeHugger Robot
a967a3abc0 Merge "Add doc for NetworkScore#getLegacyInt" into sc-dev am: cf1e26b13c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14125152

Change-Id: Id16fba9f32aba1357c701c0c81a6ee4df7042e4f
2021-04-09 05:13:43 +00:00
TreeHugger Robot
c6312f7b77 Merge "Show colorAccent icon color for connected Wi-Fi entry" into sc-dev am: e08ddd5fe2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14097781

Change-Id: I08cb5f892b361a782fb2d9ab0a4dfe6ce5abc82b
2021-04-09 05:13:25 +00:00
Peter Li
4f8c860ab8 Merge "Implement timeout mechanism when HotwordDetectionService initializes" into sc-dev am: 2fa9e7823e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14034628

Change-Id: I459ca02b36f6178f92dd591f4153a5ba39161de9
2021-04-09 05:10:50 +00:00
TreeHugger Robot
5b44b784be Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-09 05:00:26 +00:00
TreeHugger Robot
cf1e26b13c Merge "Add doc for NetworkScore#getLegacyInt" into sc-dev 2021-04-09 04:38:09 +00:00
TreeHugger Robot
e08ddd5fe2 Merge "Show colorAccent icon color for connected Wi-Fi entry" into sc-dev 2021-04-09 04:33:08 +00:00
Bill Yi
db47fbb763 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1d68ccb3936bfb3fd5b8b777995883a27733ac89
2021-04-09 04:29:29 +00:00
Peter Li
2fa9e7823e Merge "Implement timeout mechanism when HotwordDetectionService initializes" into sc-dev 2021-04-09 04:25:46 +00:00
Bill Yi
9870f8cbe9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-09 03:56:47 +00:00
Santiago Etchebehere
942ffddcc9 Merge "Provide access to a mirror of WallpaperEngine SurfaceControl" into sc-dev am: 676a66efc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14119913

Change-Id: I7070c1823b6b5b309e55075b0ea43498ca8d447a
2021-04-09 03:27:32 +00:00
Wesley Wang
b8007462f6 Merge "Support wireless charge state" into sc-dev am: 4c15ae9181
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14127305

Change-Id: If9b4c143120df62cb009c5c637da515ea2df1fee
2021-04-09 03:27:15 +00:00
Evan Severson
d6cc9b5a70 Merge "Update mic/cam toggles to the latest UI mocks" into sc-dev am: 81a64e22f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14024566

Change-Id: I16e67e270dca33f9e332c8e24b5e3b6d0318042f
2021-04-09 03:26:56 +00:00
Winson Chung
4ed8beefd3 Merge "Fix issue with lagging pip movement after entering/exiting dismiss" into sc-dev am: 4cfadfd806
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14108880

Change-Id: I3f12f52194292745502d9e547aaeed628cb09b0a
2021-04-09 03:26:41 +00:00
Winson Chung
793c798f90 Merge "Add log to verify display change is called" into sc-dev am: 550b33fced
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14129970

Change-Id: Ia53d8c008c663cc17d0db340934ba3ddbedc781b
2021-04-09 03:26:27 +00:00
Winson Chung
dc63457ffc Merge "Add null check for base activity" into sc-dev am: 4a382d9547
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14129977

Change-Id: I0d9e33fb2c05d5e27f1b2e33f802622f965c5917
2021-04-09 03:26:16 +00:00
TreeHugger Robot
b4a8b0f0a0 Merge "Integrated policy-exempt-apps into setLockTaskPackages()." into sc-dev am: 66a76544f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14098507

Change-Id: I8f0a7e3ac802b041e4ab2ea996bdcc88d09b6ffd
2021-04-09 03:25:58 +00:00
Treehugger Robot
2a3d314ccf [automerger skipped] Merge "UWB: Add Reason to onRangingStop()" am: b3cbeb79a2 am: 76481e8bfb am: 6f79405bc5 -s ours am: 0740c3d7c5 -s ours
am skip reason: skip tag Change-Id Iff880ac6d8343df784fb8cb830ec830749351820 with SHA-1 dd0543f051 is already in history

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

Change-Id: I52285c7b7460d0306f96ebc281101a556b27cfcf
2021-04-09 03:25:19 +00:00
Treehugger Robot
e05d94952f Merge "Add documentation on EthernetNetworkSpecifier API" am: 682a98d823 am: 02471bd905 am: 7fa8f1fa68 am: 2eb331a032
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669186

Change-Id: I363487538cfd74349c860024e7aadd207c82e593
2021-04-09 03:24:51 +00:00
Remi NGUYEN VAN
b577dd30c5 Merge "Improve documentation on simulateDataStall" am: 3dd880eca5 am: 4b24e01c29 am: 5ca9ccb568 am: 25f9e89c83
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669505

Change-Id: I66f67e2331133aada654c869ed350e41adc96ee3
2021-04-09 03:24:33 +00:00
Remi NGUYEN VAN
69896dd065 Merge "Set ParseException constructors as public" am: e067d9618c am: 226c9332af am: 448672dada am: a3d08794bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669051

Change-Id: Ia2ed3041b767d73a26ede33523536dbfd354bcaf
2021-04-09 03:24:09 +00:00
Remi NGUYEN VAN
9f230a8323 Merge "Replace fields with getters in keepalive API" am: 8c5ae7e37f am: e07d038931 am: b4d44cfe7f am: 85c9c7b44f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669345

Change-Id: Iede7a4e0c7072fac3233c5ed931bea8a08be339f
2021-04-09 03:23:40 +00:00
Remi NGUYEN VAN
b17ef47c68 Merge "Add RequiresPermission to TestNetworkManager" am: 9641e3404c am: 38d3867b89 am: c9fcf1b385 am: f00f8e572e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669187

Change-Id: I0eb520356941f2c591d9d81aa09436d415bd65dc
2021-04-09 03:22:57 +00:00
Chiachang Wang
beec86fed4 Merge "Use UserHandle#getUid() taken a UserId" into sc-dev am: 1618a4df47
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14122529

Change-Id: I196dca2df8df6714743535d1d70e6ed64d53db93
2021-04-09 03:22:33 +00:00
TreeHugger Robot
e65eafce4d Merge "Remove carrier prefix before displaying emergency numbers" into sc-dev am: 48663c1310
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14116968

Change-Id: I5a70cde237d020ff404432377666e26693b6d0d9
2021-04-09 03:21:50 +00:00
Santiago Etchebehere
676a66efc0 Merge "Provide access to a mirror of WallpaperEngine SurfaceControl" into sc-dev 2021-04-09 03:16:27 +00:00
Santiago Etchebehere
8a884b22a4 Provide access to a mirror of WallpaperEngine SurfaceControl
Bug: 179127643
Test: manual: tested behavior of wallpaper preview in older
WallpaperPicker apk and new version

Change-Id: I3b66cbdf2198228e990fae6400d019da91bc93c9
2021-04-09 03:14:26 +00:00
Yi-Ling Chuang
c9cd83a193 Create SettingsTransitionActivity
SettingsTransitionActivity is an abstract activity being in charge of
the transition feature. Activities extending it will get settings
transition applied.

We make CollapsingToolbarBaseActivity extend this activity. Clients
extending CollapsingToolbarBaseActivity will have both app bar behaviour
and the transition applied.

Also add android:transitionName into the collapsing layout, so the
transition would start from the back arrow on the action bar.

And bump the min_sdk to 29 to relevant dependencies.

Bug: 177480673
Test: rebuild and apply it on NotificationHistoryActivity
Change-Id: I8e070a0f07080d027fec7b944bdcdbb758ae44b7
2021-04-09 11:09:52 +08:00
Wesley Wang
4c15ae9181 Merge "Support wireless charge state" into sc-dev 2021-04-09 03:09:15 +00:00