Mady Mellor
6980806291
Merge changes I500c566e,I4b5ffc26 into sc-v2-dev am: 81ce27f854 am: 3d1ed7a4f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15440807
Change-Id: I1dc04db9282adeb658a672d979426f1a2748521e
2021-08-03 01:22:29 +00:00
Jooyung Han
891189ffc9
[automerger skipped] Merge "APK signature verification: use FileChannel#size" am: a54768b010 am: 3ea4035bf1 -s ours am: f5193b1f91 -s ours am: 7238381529 -s ours
...
am skip reason: Merged-In I3015fc30574c36c18c0d0c9ae7453d33a1349927 with SHA-1 ec78f1a834 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1782428
Change-Id: I9156298495f0ae47891ec242b5fa2eeaef83adc2
2021-08-03 01:22:16 +00:00
Winson Chiu
336c65c9ec
Merge "Revert "Only dump necessary info when specifying a package"" into sc-dev am: 7708fd9733 am: f5d1413036 am: d5294fd589
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433531
Change-Id: I94ef9b290c634503269fbea384109c74b5c3cc04
2021-08-03 01:22:02 +00:00
Mady Mellor
3d1ed7a4f8
Merge changes I500c566e,I4b5ffc26 into sc-v2-dev am: 81ce27f854
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15440807
Change-Id: I16d4d764895a3d2c3f8725e0949559398b164011
2021-08-03 01:21:53 +00:00
Winson Chiu
a5a6012d2d
Merge "Revert "Only dump necessary info when specifying a package"" into sc-dev am: 7708fd9733 am: 847ca37229 am: e19a511299
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433531
Change-Id: I751ab0e920c8dad70d5763f0499b45a66dc2499e
2021-08-03 01:21:29 +00:00
Mady Mellor
81ce27f854
Merge changes I500c566e,I4b5ffc26 into sc-v2-dev
...
* changes:
Update the flyout width to be smaller on large screens
Updates to manage button based on latest mocks
2021-08-03 01:07:12 +00:00
Jooyung Han
7238381529
[automerger skipped] Merge "APK signature verification: use FileChannel#size" am: a54768b010 am: 3ea4035bf1 -s ours am: f5193b1f91 -s ours
...
am skip reason: Merged-In I3015fc30574c36c18c0d0c9ae7453d33a1349927 with SHA-1 ec78f1a834 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1782428
Change-Id: I1d05e670487aec432de64f8c7214aba57964efcd
2021-08-03 01:05:05 +00:00
Winson Chiu
d5294fd589
Merge "Revert "Only dump necessary info when specifying a package"" into sc-dev am: 7708fd9733 am: f5d1413036
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433531
Change-Id: If5b7c5c4354f2844f1404f74ac98e7036fe2a517
2021-08-03 01:04:38 +00:00
Winson Chiu
e19a511299
Merge "Revert "Only dump necessary info when specifying a package"" into sc-dev am: 7708fd9733 am: 847ca37229
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433531
Change-Id: I2508e7cd1a385e7da6bee0f4c86b82fc07fa59cf
2021-08-03 01:04:19 +00:00
Winson Chiu
347021b183
Merge "Revert "Only dump necessary info when specifying a package"" into sc-dev am: 7708fd9733 am: 8d4355e671
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433531
Change-Id: I4971701c04517a52349010f1e27874f0991a70f0
2021-08-03 01:03:51 +00:00
Jooyung Han
f5193b1f91
[automerger skipped] Merge "APK signature verification: use FileChannel#size" am: a54768b010 am: 3ea4035bf1 -s ours
...
am skip reason: Merged-In I3015fc30574c36c18c0d0c9ae7453d33a1349927 with SHA-1 ec78f1a834 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1782428
Change-Id: I8033b5802bfa43b1df5cfff6128f4b9ede9e85b9
2021-08-03 00:52:03 +00:00
Winson Chiu
847ca37229
Merge "Revert "Only dump necessary info when specifying a package"" into sc-dev am: 7708fd9733
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433531
Change-Id: I9333a7a285b4c8379352f65ac6b68044a8a31c11
2021-08-03 00:48:09 +00:00
Winson Chiu
8d4355e671
Merge "Revert "Only dump necessary info when specifying a package"" into sc-dev am: 7708fd9733
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433531
Change-Id: Iad44fd027e325f790ba5eba2b47bf7dfcdf99108
2021-08-03 00:47:35 +00:00
Winson Chiu
f5d1413036
Merge "Revert "Only dump necessary info when specifying a package"" into sc-dev am: 7708fd9733
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433531
Change-Id: I1d250fa242c96ac81d714b361d00df224ff9cd8c
2021-08-03 00:47:24 +00:00
Riddle Hsu
8e7a5c4233
Merge "Associate starting window in task fragment with base task" into sc-v2-dev am: 25f50a91e8 am: 0b9d5851c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15371455
Change-Id: I8accf311a921baf41f493848df3467dd25243a17
2021-08-03 00:47:23 +00:00
Jooyung Han
3ea4035bf1
Merge "APK signature verification: use FileChannel#size" am: a54768b010
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1782428
Change-Id: Ie35b54a6475dc811b684714d32c5e1bf2050132f
2021-08-03 00:35:21 +00:00
Winson Chiu
7708fd9733
Merge "Revert "Only dump necessary info when specifying a package"" into sc-dev
2021-08-03 00:32:30 +00:00
Adam He
9da5ec3d99
Merge "Add test for FLAGS_ALL_CONTROL for assist structure viewnodes."
2021-08-03 00:30:55 +00:00
Riddle Hsu
0b9d5851c9
Merge "Associate starting window in task fragment with base task" into sc-v2-dev am: 25f50a91e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15371455
Change-Id: I813776a9f0e4b0ebf6fcb6a0cf5c515cf0e8cf37
2021-08-03 00:29:07 +00:00
Vishnu Nair
83589d5a43
Merge "SurfaceView: Synchronize destframe updates with SurfaceView size changes" into sc-dev am: 40ddf958e6 am: 59a9ae7e45 am: 15d4c60bda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15363651
Change-Id: I3c7e429ec6a0a1401092d25288b4c1ec0ac6652d
2021-08-03 00:19:26 +00:00
Jooyung Han
a54768b010
Merge "APK signature verification: use FileChannel#size"
2021-08-03 00:18:57 +00:00
Vishnu Nair
baa6388891
Merge "SurfaceView: Synchronize destframe updates with SurfaceView size changes" into sc-dev am: 40ddf958e6 am: 67ebbffe5f am: 4f2836ad3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15363651
Change-Id: Ie7871422a11aa42ea5157958d852de9ff959c7d8
2021-08-03 00:18:55 +00:00
Riddle Hsu
25f50a91e8
Merge "Associate starting window in task fragment with base task" into sc-v2-dev
2021-08-03 00:15:48 +00:00
Vishnu Nair
15d4c60bda
Merge "SurfaceView: Synchronize destframe updates with SurfaceView size changes" into sc-dev am: 40ddf958e6 am: 59a9ae7e45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15363651
Change-Id: I47e76acd09cad14ac9d6e8cc5fe2cd8542ffa932
2021-08-03 00:09:14 +00:00
Vishnu Nair
4f2836ad3a
Merge "SurfaceView: Synchronize destframe updates with SurfaceView size changes" into sc-dev am: 40ddf958e6 am: 67ebbffe5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15363651
Change-Id: I2b8aced34c8249d99843a69fe1d639da01a989ca
2021-08-03 00:08:58 +00:00
Vishnu Nair
896775a952
Merge "SurfaceView: Synchronize destframe updates with SurfaceView size changes" into sc-dev am: 40ddf958e6 am: f315a466d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15363651
Change-Id: I7366b93293ea9bfd6bfb6a39f8b0488963de2742
2021-08-03 00:08:32 +00:00
Vishnu Nair
67ebbffe5f
Merge "SurfaceView: Synchronize destframe updates with SurfaceView size changes" into sc-dev am: 40ddf958e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15363651
Change-Id: Ibb5b01b673814faac6e15e4bda80ff070d0f2928
2021-08-02 23:54:34 +00:00
Vishnu Nair
59a9ae7e45
Merge "SurfaceView: Synchronize destframe updates with SurfaceView size changes" into sc-dev am: 40ddf958e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15363651
Change-Id: If59676e4adbb8088133186b4d6a67863d2e662c4
2021-08-02 23:54:30 +00:00
Vishnu Nair
f315a466d5
Merge "SurfaceView: Synchronize destframe updates with SurfaceView size changes" into sc-dev am: 40ddf958e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15363651
Change-Id: Iaa4cd234f7c1d9ba8053bcccf18f1f04fc66e9d1
2021-08-02 23:54:02 +00:00
Vishnu Nair
40ddf958e6
Merge "SurfaceView: Synchronize destframe updates with SurfaceView size changes" into sc-dev
2021-08-02 23:35:38 +00:00
Haiping Yang
f73d730f69
Merge "Dovetail refresh for PowerMenu"
2021-08-02 22:49:14 +00:00
Emilian Peev
bd0c1dcff8
Merge "Camera: Enable rotate and crop overrides" into sc-v2-dev am: 8cd46b20a3 am: b5c701fca7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14885277
Change-Id: Iacd68ea5d928e7a453b6a0379762a1dabb457076
2021-08-02 21:22:17 +00:00
Emilian Peev
b5c701fca7
Merge "Camera: Enable rotate and crop overrides" into sc-v2-dev am: 8cd46b20a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14885277
Change-Id: Ied17213113ed7116dd78e4f4fe41919e9d0c4dd9
2021-08-02 21:04:42 +00:00
Mady Mellor
3289ae9f64
Update the flyout width to be smaller on large screens
...
On phone we use 60% of the screen which is huge on
tablet. This change uses 30% of the screen for the
flyout on large screens & enforces a minimum for
that value.
Test: manual - get a long message in a bubble on a
tablet, it should have similar width
as it does on phone.
Bug: 186776550
Change-Id: I500c566edd9941dc2bd149692eaf95c6e6f4aa61
2021-08-02 14:03:01 -07:00
Emilian Peev
8cd46b20a3
Merge "Camera: Enable rotate and crop overrides" into sc-v2-dev
2021-08-02 20:54:12 +00:00
Joshua Mccloskey
2ae9aa4264
Merge "Set package name for learn more action" into sc-dev am: 308cc9919e am: b1ef2b7da3 am: c1a45f01dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15332854
Change-Id: I3d4e2618268c85596a62a87aa95ea2c99e7c0fb1
2021-08-02 20:48:23 +00:00
Evan Severson
43d01b3ca3
Merge "Restrict the mic and cam phone call ops when toggle is muted" into sc-dev am: b13bdd4ae2 am: 3b9fcd9cd0 am: 4cb7ad82f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15430629
Change-Id: I335183caec31fe61ca1592ea8d000ebe64f195c9
2021-08-02 20:48:14 +00:00
Joshua Mccloskey
3c4541f4fc
Merge "Set package name for learn more action" into sc-dev am: 308cc9919e am: 1945ea1739 am: 9ae30c27b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15332854
Change-Id: Ic6273e199573eea8e4d2cb866c4f46ed1bb021a1
2021-08-02 20:47:50 +00:00
Evan Severson
31fcee1a87
Merge "Restrict the mic and cam phone call ops when toggle is muted" into sc-dev am: b13bdd4ae2 am: d07e9fab1a am: d77f0f2932
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15430629
Change-Id: Icf04431fbc15ad35dcf64843e97edf7fc3af681e
2021-08-02 20:46:07 +00:00
Lee Shombert
6ea05c4e09
Merge "Do not cache wildcard users (PermissionManager)"
2021-08-02 20:40:28 +00:00
Joshua Mccloskey
c1a45f01dc
Merge "Set package name for learn more action" into sc-dev am: 308cc9919e am: b1ef2b7da3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15332854
Change-Id: I4e9841f6e53c2b41b48a5c039a954afab62b35a9
2021-08-02 20:34:33 +00:00
Evan Severson
4cb7ad82f3
Merge "Restrict the mic and cam phone call ops when toggle is muted" into sc-dev am: b13bdd4ae2 am: 3b9fcd9cd0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15430629
Change-Id: I21b5fe25577b184ae09abf344570591efe9dcbbe
2021-08-02 20:34:09 +00:00
Joshua Mccloskey
9ae30c27b1
Merge "Set package name for learn more action" into sc-dev am: 308cc9919e am: 1945ea1739
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15332854
Change-Id: I4a3f3fef26b0b10886bc6c623eb3e985c04d2c2a
2021-08-02 20:34:01 +00:00
Joshua Mccloskey
1657d0b6c4
Merge "Set package name for learn more action" into sc-dev am: 308cc9919e am: cdc7ff8e23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15332854
Change-Id: I96018a40ca3482c7d1a2e87cab0fdaddf1f325b4
2021-08-02 20:33:53 +00:00
Evan Severson
d77f0f2932
Merge "Restrict the mic and cam phone call ops when toggle is muted" into sc-dev am: b13bdd4ae2 am: d07e9fab1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15430629
Change-Id: If06ebe2d7eec04a76132afc32d4afb5457c97400
2021-08-02 20:33:36 +00:00
Evan Severson
77a0d3448c
Merge "Restrict the mic and cam phone call ops when toggle is muted" into sc-dev am: b13bdd4ae2 am: 35ab18106e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15430629
Change-Id: Ia32fcb8de1dc6dc7522b2f6148783c4cdfd46791
2021-08-02 20:33:32 +00:00
Caitlin Cassidy
6baa40c921
[automerger skipped] Merge "[Dagger] Add BatteryMeterViewController. Future CLs will move Dependency.get calls from BatteryMeterView to this controller." into sc-v2-dev am: f67fa09cb9 am: 760bb791d3 -s ours
...
am skip reason: Merged-In I4d23a32d4ecda4f4327552b3703e9893ad544bdb with SHA-1 0f2513cbb7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340290
Change-Id: I034452c90ed728616dbf59fc19ca90c38077c4bc
2021-08-02 20:15:49 +00:00
Joshua Mccloskey
1945ea1739
Merge "Set package name for learn more action" into sc-dev am: 308cc9919e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15332854
Change-Id: Iccd6e86ed05e1b3982cce8e898530c5180555ba7
2021-08-02 20:08:44 +00:00
Evan Severson
d07e9fab1a
Merge "Restrict the mic and cam phone call ops when toggle is muted" into sc-dev am: b13bdd4ae2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15430629
Change-Id: I55d56cf93f8f7916296d931a7ed7180a0229df40
2021-08-02 20:08:29 +00:00
Joshua Mccloskey
b1ef2b7da3
Merge "Set package name for learn more action" into sc-dev am: 308cc9919e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15332854
Change-Id: I1eca5872edfc3fd79a877b5af4796c56f9da9d1f
2021-08-02 20:08:28 +00:00