Shawn Lin
c3373e463e
Merge "Update to use NAV_BAR_KIDS_MODE settings key for kids mode organizer" into tm-dev am: 8b8de88b3e am: 4ef7bb163e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665878
Change-Id: Ia7e9c7e8dadce5ca925fb5228fbf59ff0bba5a21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 04:15:09 +00:00
Shawn Lin
4ef7bb163e
Merge "Update to use NAV_BAR_KIDS_MODE settings key for kids mode organizer" into tm-dev am: 8b8de88b3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665878
Change-Id: I74983e91a7d6215a7d317aec15d1ed7750d16fa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 04:02:41 +00:00
Shawn Lin
8b8de88b3e
Merge "Update to use NAV_BAR_KIDS_MODE settings key for kids mode organizer" into tm-dev
2022-04-18 03:41:27 +00:00
KRIS CHEN
2faabef5e7
Merge "Reset mAcquiredReceived on udfps-fingerdown" into tm-dev am: e6d80e53b7 am: 69b5e04820 am: 12ab97e692
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17752392
Change-Id: I0c6c929a1b858a29af7d14a1bd91014652acc555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 03:07:53 +00:00
Rhed Jao
cf910d105c
Merge changes I14e4cc5c,I2875765b
...
* changes:
Fix cross user package visibility leakage for PackageManager (1/n)
Add filtering uninstalled package flag to the shouldFilterApplication
2022-04-18 03:05:50 +00:00
KRIS CHEN
12ab97e692
Merge "Reset mAcquiredReceived on udfps-fingerdown" into tm-dev am: e6d80e53b7 am: 69b5e04820
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17752392
Change-Id: Iac8777fd467fd5bf9af5298ae71bc6871eb3535b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 02:48:05 +00:00
KRIS CHEN
16244ee416
Merge "Reset mAcquiredReceived on udfps-fingerdown" into tm-dev am: e6d80e53b7 am: 9ca7a50692
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17752392
Change-Id: I559272381548c9acd3c905ffe1d516e44f1d2d11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 02:47:36 +00:00
KRIS CHEN
69b5e04820
Merge "Reset mAcquiredReceived on udfps-fingerdown" into tm-dev am: e6d80e53b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17752392
Change-Id: If6ff0877cdd61b106bb2978a60d61dbe0b1bc3fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 02:26:30 +00:00
KRIS CHEN
9ca7a50692
Merge "Reset mAcquiredReceived on udfps-fingerdown" into tm-dev am: e6d80e53b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17752392
Change-Id: Ic8cc0b72f10d46435f83e6c730c9f4bfea3a15d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 02:25:46 +00:00
KRIS CHEN
e6d80e53b7
Merge "Reset mAcquiredReceived on udfps-fingerdown" into tm-dev
2022-04-18 02:09:21 +00:00
Louis Chang
5a54318b03
Merge "Allow resumed activity to turn-screen-on only when being started" into tm-qpr-dev am: 7bd505f7ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17707504
Change-Id: I4f572ef050f563255ec5442bcb2121a5c397755c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 01:15:43 +00:00
Louis Chang
7bd505f7ab
Merge "Allow resumed activity to turn-screen-on only when being started" into tm-qpr-dev
2022-04-18 01:00:37 +00:00
TreeHugger Robot
7f47fc5bda
Merge "Fix broken test in WifiEnterpriseRestrictionUtils" into tm-dev am: 7332464413 am: 5d07e1a2e2 am: 7d5fd430c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17767847
Change-Id: I661f2f5900a743773a8cec5c515f312e8fffac6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-17 20:39:40 +00:00
TreeHugger Robot
7d5fd430c8
Merge "Fix broken test in WifiEnterpriseRestrictionUtils" into tm-dev am: 7332464413 am: 5d07e1a2e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17767847
Change-Id: I97657a6c0e83d8c7d8cccbc5235d2569f9d72d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-17 20:20:09 +00:00
TreeHugger Robot
911902e60a
Merge "Fix broken test in WifiEnterpriseRestrictionUtils" into tm-dev am: 7332464413 am: dcc5019823
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17767847
Change-Id: Iba02d72e94d2b69637ddc80ab0483954a6949e08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-17 20:19:43 +00:00
TreeHugger Robot
5d07e1a2e2
Merge "Fix broken test in WifiEnterpriseRestrictionUtils" into tm-dev am: 7332464413
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17767847
Change-Id: I464f11d674a19e94b2d694c281f3d00821f0e814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-17 20:05:28 +00:00
TreeHugger Robot
dcc5019823
Merge "Fix broken test in WifiEnterpriseRestrictionUtils" into tm-dev am: 7332464413
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17767847
Change-Id: Ie47181b8e2f18fca7fe89fb045e8402ef4f65fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-17 20:04:36 +00:00
TreeHugger Robot
7332464413
Merge "Fix broken test in WifiEnterpriseRestrictionUtils" into tm-dev
2022-04-17 19:52:43 +00:00
Weng Su
c3d7451737
Merge "Restrict Wi-Fi toggle in Internet Panel" into tm-dev am: 3a3beb2eb9 am: e1c6b4db3b am: c9eaebb21b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17697543
Change-Id: I21331271bc0b55a5606367a68d4f2d18ef093971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-17 19:10:12 +00:00
Weng Su
c9eaebb21b
Merge "Restrict Wi-Fi toggle in Internet Panel" into tm-dev am: 3a3beb2eb9 am: e1c6b4db3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17697543
Change-Id: I5b7b932e7c8349b8dee63cad4e4770a13988ff82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-17 18:55:34 +00:00
Weng Su
13e8f88ea8
Merge "Restrict Wi-Fi toggle in Internet Panel" into tm-dev am: 3a3beb2eb9 am: 502eb2d04b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17697543
Change-Id: I252a1d4fd16449873222d5ac7773ab813db7c8ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-17 18:47:49 +00:00
Weng Su
e1c6b4db3b
Merge "Restrict Wi-Fi toggle in Internet Panel" into tm-dev am: 3a3beb2eb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17697543
Change-Id: Ia7d78f5037217aceae52e87ffd160aa0f1fb1ecd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-17 18:35:07 +00:00
Weng Su
502eb2d04b
Merge "Restrict Wi-Fi toggle in Internet Panel" into tm-dev am: 3a3beb2eb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17697543
Change-Id: I182f9469eb6ace1c7e31a476fe3b0a345e96b359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-17 18:34:13 +00:00
Weng Su
3a3beb2eb9
Merge "Restrict Wi-Fi toggle in Internet Panel" into tm-dev
2022-04-17 18:13:02 +00:00
Weng Su
6b9407780e
Restrict Wi-Fi toggle in Internet Panel
...
- Disable Wi-Fi toggle when user is not allowed to change Wi-Fi state.
- Show restriction message in Wi-Fi toggle summary.
Bug: 203168097
Test: manual test
atest -c InternetDialogTest
Change-Id: I9e637a1f782997de1486921f5eb0093f59ecb02f
2022-04-17 18:10:57 +00:00
Robin Lee
684af89999
Merge "Make CentralSurfaces optional" into tm-dev am: db778eeed0 am: e20b1416ab am: 2d1d6e30c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17757969
Change-Id: Idf95f909e7cd4fe69878df15afa372c7ad1200b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-17 14:30:48 +00:00
Robin Lee
2d1d6e30c7
Merge "Make CentralSurfaces optional" into tm-dev am: db778eeed0 am: e20b1416ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17757969
Change-Id: I96f2aba86ffe4662d0f5ac8e390cff3899582683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-17 14:16:50 +00:00
Robin Lee
46a6217820
Merge "Make CentralSurfaces optional" into tm-dev am: db778eeed0 am: 59b1c739b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17757969
Change-Id: I4c0b06a011ad443b873a69908484429e17324fc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-17 14:16:22 +00:00
Robin Lee
e20b1416ab
Merge "Make CentralSurfaces optional" into tm-dev am: db778eeed0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17757969
Change-Id: I16a0daf972a27862ed94dc9bc17c1f04dff5b770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-17 13:55:05 +00:00
Robin Lee
59b1c739b8
Merge "Make CentralSurfaces optional" into tm-dev am: db778eeed0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17757969
Change-Id: Ie4d3bd568bd1146f71fddc84e5d71576a0942b56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-17 13:54:08 +00:00
Robin Lee
db778eeed0
Merge "Make CentralSurfaces optional" into tm-dev
2022-04-17 13:19:34 +00:00
Hui Yu
e1eca844cb
Merge "Deferred BOOT_COMPLETED broadcast does not mean queue is not idle." into tm-dev am: 525fad6cb2 am: 0530be1405 am: 626138cb85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17779272
Change-Id: Iee01da74662f3ee8334006e259df6d696a013c21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-16 22:57:56 +00:00
Lyn Han
5282cb0dfe
Merge "Reduce notification section gap on lockscreen; increase gap when going to shade" into tm-dev am: ccdd4e74b2 am: 0f481b7039 am: e60cab4a0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17769427
Change-Id: I9a1ea9bea498f1140c108afebc8b7bf1b8c2b88c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-16 22:57:19 +00:00
Hui Yu
2020b1f651
Merge "Deferred BOOT_COMPLETED broadcast does not mean queue is not idle." into tm-dev am: 525fad6cb2 am: 9c2888d98d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17779272
Change-Id: I03e1d0fd4450564a96a3f9e9360c6a4f3ecd5c6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-16 22:34:17 +00:00
Hui Yu
626138cb85
Merge "Deferred BOOT_COMPLETED broadcast does not mean queue is not idle." into tm-dev am: 525fad6cb2 am: 0530be1405
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17779272
Change-Id: I1364b9dc8f0b51e71963c4fc4a0ffbfc36e6851f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-16 22:34:15 +00:00
Lyn Han
e60cab4a0c
Merge "Reduce notification section gap on lockscreen; increase gap when going to shade" into tm-dev am: ccdd4e74b2 am: 0f481b7039
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17769427
Change-Id: If2a768d111b619130848445e5a1a8762708eb6a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-16 22:34:09 +00:00
Lyn Han
5e27498b5c
Merge "Reduce notification section gap on lockscreen; increase gap when going to shade" into tm-dev am: ccdd4e74b2 am: d93b121053
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17769427
Change-Id: I7d7602607a70a53d2931535992b8125ce71d5488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-16 22:33:46 +00:00
Hui Yu
0530be1405
Merge "Deferred BOOT_COMPLETED broadcast does not mean queue is not idle." into tm-dev am: 525fad6cb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17779272
Change-Id: Ic9b44fa45064f4ff11bf458c63a12262f33ca9c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-16 22:14:13 +00:00
Lyn Han
0f481b7039
Merge "Reduce notification section gap on lockscreen; increase gap when going to shade" into tm-dev am: ccdd4e74b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17769427
Change-Id: I572f54faac29a7e6a240bd47fac16c6158f86db7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-16 22:13:47 +00:00
Robin Lee
fe27832cfc
[automerger skipped] Make CentralSurfaces optional am: 217caf6028 -s ours
...
am skip reason: Merged-In Id0a5e35e113bb1d0268c7f687cbd54799a1d9b77 with SHA-1 0c673b1148 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17782033
Change-Id: I40c91dc2ec0d4a089887d991b7246af66c64f8de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-16 22:13:14 +00:00
Hui Yu
9c2888d98d
Merge "Deferred BOOT_COMPLETED broadcast does not mean queue is not idle." into tm-dev am: 525fad6cb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17779272
Change-Id: Id5e5a9a60e77123742770426e8a5de9b6e9a550a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-16 22:13:08 +00:00
Lyn Han
d93b121053
Merge "Reduce notification section gap on lockscreen; increase gap when going to shade" into tm-dev am: ccdd4e74b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17769427
Change-Id: I8c107017583930db6dea176406ba45a3a2cc5b79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-16 22:12:52 +00:00
Hui Yu
525fad6cb2
Merge "Deferred BOOT_COMPLETED broadcast does not mean queue is not idle." into tm-dev
2022-04-16 21:33:45 +00:00
Lyn Han
ccdd4e74b2
Merge "Reduce notification section gap on lockscreen; increase gap when going to shade" into tm-dev
2022-04-16 21:31:12 +00:00
Robin Lee
217caf6028
Make CentralSurfaces optional
...
CentralSurfaces will instacrash on TV devices if it doesn't haave all
of its dependencies available. Since it is included by SystemUIBinder
via CentralSurfacesModule, we need to remove SystemUIBinder from TV.
When we do that, we find that BouncerSwipeTouchHandler has a hard
dependency on phone.CentralSurfaces meaning that CentralSurfaces was
not actually optional any more.
So we need to convert the dependency there to Optional<>. In future
the fact that TV does not have a CentralSurfaces should guarantee
compile errors if this happens again and keep CentralSurfaces actually
Optional as the javadocs say.
We also need to remove a lot of phone-specific assumptions under the
dreams/touch area, as the following classes remain present even after
this change:
- com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController
- com.android.systemui.statusbar.phone.NotificationShadeWindowControllerImpl
- com.android.systemui.statusbar.phone.ConfigurationControllerImpl
- com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager
- com.android.systemui.statusbar.phone.DozeParameters
But that's a much larger task for another day.
Bug: 228414760
Change-Id: Id0a5e35e113bb1d0268c7f687cbd54799a1d9b77
(cherry picked from commit 0c673b1148 )
Merged-In: Id0a5e35e113bb1d0268c7f687cbd54799a1d9b77
2022-04-16 18:12:31 +00:00
TreeHugger Robot
2642c04b3b
Merge "Make CentralSurfaces optional"
2022-04-16 03:33:34 +00:00
Jay Sullivan
e850b41e94
Merge "Add media perms to DefaultPermissionGrantPolicy" into tm-dev am: 27817f0b54 am: cc83409e0e am: 3313823970
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17749002
Change-Id: I6d786f6d6a32f57d22c1b54b75dd8e3ffa2d3700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-16 03:09:39 +00:00
TreeHugger Robot
9c072f1875
Merge "Make BackEvent#getTouchX and BackEvent#getTouchY floats." into tm-dev am: e16244c3cd am: 11c1bbb234 am: 2e4361c361
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17650054
Change-Id: I82bdd18d838ba39352471bf2a064b6ac1d16de9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-16 03:09:03 +00:00
Lyn Han
4076d49140
Merge "Restore notification stack updates during lockscreen-to-shade" into tm-dev am: 022f4485d6 am: 552ce28c56 am: b7c45270cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17765603
Change-Id: I4c34ce9e8f8e0c251251ed44b55c59b01eb340d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-16 03:08:19 +00:00
Lyn Han
030c6890a9
Merge "Fix clipped notifications in sensitive mode" into tm-dev am: aed82fe299 am: c34c64c9ba am: 34ace61a48
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17776962
Change-Id: I68a033a5257bf8a6db117d42a053dbe27ab18b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-16 03:07:42 +00:00