TreeHugger Robot
d5899d883e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6c9b2fc393 -s ours am: 913f57d41c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15448326
Change-Id: I8a903b1cbe1799c0877dc19fb176c5ea2aeb446b
2021-08-03 05:19:22 +00:00
TreeHugger Robot
913f57d41c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6c9b2fc393 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15448326
Change-Id: I5b2e1529902025f11aa7abe7a3d2c5d9e8db960e
2021-08-03 05:10:10 +00:00
Chris Li
8195500f70
Merge "Call with Shell transition for TRANSIT_KEYGUARD_OCCLUDE/UNOCCLUDE" into sc-v2-dev am: 3a39ccf93d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15436501
Change-Id: I507d7a9e32550f8b96056e8eec8886b69e315b5a
2021-08-03 05:04:23 +00:00
Chris Li
3a39ccf93d
Merge "Call with Shell transition for TRANSIT_KEYGUARD_OCCLUDE/UNOCCLUDE" into sc-v2-dev
2021-08-03 04:58:30 +00:00
TreeHugger Robot
6c9b2fc393
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-03 04:57:33 +00:00
TreeHugger Robot
aa59c306a0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c4c85214ad -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15445183
Change-Id: I3dc3fc4fa0991bac4030f68e02bf07fbc4f5fc7a
2021-08-03 04:54:58 +00:00
TreeHugger Robot
b738d9e7e4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 97a7d7edb5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15448075
Change-Id: I78b1586a8de7b372d8f5a98150720d9557f066e5
2021-08-03 04:54:47 +00:00
TreeHugger Robot
c4c85214ad
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-08-03 04:50:41 +00:00
TreeHugger Robot
97a7d7edb5
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-08-03 04:35:54 +00:00
Shawn Lin
58758b2754
Merge "[DO NOT MERGE] Fixed LocalDisplayAdapterTest test failure" into sc-v2-dev am: ac5c8d29f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401700
Change-Id: I1268b36f1114412b6337c5005024ab2031288635
2021-08-03 04:31:59 +00:00
shawnlin
b5e3feddd4
[DO NOT MERGE] Fixed LocalDisplayAdapterTest test failure am: dcc1ed475a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401700
Change-Id: Ib7d79d602f0f8869076dea7b26cabfe33af11a5c
2021-08-03 04:31:45 +00:00
Shawn Lin
ac5c8d29f2
Merge "[DO NOT MERGE] Fixed LocalDisplayAdapterTest test failure" into sc-v2-dev
2021-08-03 04:19:16 +00:00
Bill Yi
3337455396
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8d4242aa046bd94364f15573c271a8f4db2356cd
2021-08-03 03:19:21 +00:00
Bill Yi
1cd73a062d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib14972fb3047cb1ef362e603d4141f8d20e522bf
2021-08-03 03:16:27 +00:00
Louis Chang
435fbc6921
Merge "Sending TaskFragment token to client for the launching activity" into sc-v2-dev am: 3acc328b12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15407674
Change-Id: Iab5ddf47b82b128674ec3cc6c1017cf8417689af
2021-08-03 02:43:39 +00:00
Louis Chang
3acc328b12
Merge "Sending TaskFragment token to client for the launching activity" into sc-v2-dev
2021-08-03 02:25:11 +00:00
Chih-hung Hsieh
6bf41e2475
Merge "Remove system-headers, minimize unwanted warnings." am: 4e6598eef7 am: 6c423b166c am: df6f18e77a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1778852
Change-Id: If763b36395af7fdcd251f1e80aa0e780c85d1033
2021-08-03 01:49:46 +00:00
Wei Sheng Shih
34c8bd2e69
Merge "Showing starting window on freeform windowing mode." into sc-v2-dev am: 244416ae3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401452
Change-Id: Idf984c49318ace3da0155b59c907ab5c3fb08995
2021-08-03 01:49:18 +00:00
Wei Sheng Shih
244416ae3f
Merge "Showing starting window on freeform windowing mode." into sc-v2-dev
2021-08-03 01:37:29 +00:00
Chih-hung Hsieh
df6f18e77a
Merge "Remove system-headers, minimize unwanted warnings." am: 4e6598eef7 am: 6c423b166c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1778852
Change-Id: I068d9de923165a4799645c81399309b1c1dcf1d1
2021-08-03 01:35:40 +00:00
Chih-hung Hsieh
6c423b166c
Merge "Remove system-headers, minimize unwanted warnings." am: 4e6598eef7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1778852
Change-Id: Ia82e9c2feed21fad71aebb2bf3064e437b877212
2021-08-03 01:22:18 +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
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
Chih-hung Hsieh
4e6598eef7
Merge "Remove system-headers, minimize unwanted warnings."
2021-08-03 01:02:45 +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
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
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
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
Jooyung Han
a54768b010
Merge "APK signature verification: use FileChannel#size"
2021-08-03 00:18:57 +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
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
40ddf958e6
Merge "SurfaceView: Synchronize destframe updates with SurfaceView size changes" into sc-dev
2021-08-02 23:35:38 +00:00
Bill Yi
a017d8308f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8a1e99dabbfddb7880b0ed030a28b132f55ad38e
2021-08-02 23:11:24 +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
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
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
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