Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
651,185 Commits 3 Branches 0 Tags
331bfa122ddeede1d29927060993ba7be73321b1
Commit Graph

651185 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jordan Demeulenaere
331bfa122d Merge "Fix bouncer to launcher/app animation" into sc-dev am: 6057f676ae am: bd34dda81f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14964838

Change-Id: I058d1f6bcc06f4867e18b520ea6cc80cdb8e6543
 2021-06-16 12:43:25 +00:00
Vadim Caen
c56e719763 Merge "Release the SurfacePackageViewHost on splash screen removed" into sc-dev am: dc07d29bd0 am: ab9a4b9a5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14775423

Change-Id: I3441505c251060ef5bf23c2f360bb9ad486457b0
 2021-06-16 12:42:57 +00:00
Jordan Demeulenaere
8137ee2bd7 Merge "Fix bouncer to launcher/app animation" into sc-dev am: 6057f676ae am: aa84526493 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14964838

Change-Id: I8e80b1a63c74f79df4f49367042e5762d0cb638d
 2021-06-16 12:42:51 +00:00
Vadim Caen
ab9a4b9a5a Merge "Release the SurfacePackageViewHost on splash screen removed" into sc-dev am: dc07d29bd0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14775423

Change-Id: I41c53ecabb544054bbe522baf5ffddaac211975b
 2021-06-16 12:31:00 +00:00
Vadim Caen
dc07d29bd0 Merge "Release the SurfacePackageViewHost on splash screen removed" into sc-dev 2021-06-16 12:27:47 +00:00
Jordan Demeulenaere
aa84526493 Merge "Fix bouncer to launcher/app animation" into sc-dev am: 6057f676ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14964838

Change-Id: I78bee621846f56fd5b58c42419af685936673c1c
 2021-06-16 12:26:03 +00:00
Jordan Demeulenaere
bd34dda81f Merge "Fix bouncer to launcher/app animation" into sc-dev am: 6057f676ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14964838

Change-Id: I7075a34cc9e948fb79424f0e36162001b3017721
 2021-06-16 12:25:19 +00:00
PETER LIANG
7fdfc5ab41 Merge "Update the default position of the Accessibility floating menu." into sc-dev am: d89dae0094 am: 24ef8890bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934425

Change-Id: I5e81a41f0e06beeefc9a0e08599fec20f9d52c50
 2021-06-16 12:22:20 +00:00
PETER LIANG
10637c03e8 Merge "Update the default position of the Accessibility floating menu." into sc-dev am: d89dae0094 am: 1b4fd20a1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934425

Change-Id: Ide2716fc4b540649ee28a6303a94a81e5e0c1aa1
 2021-06-16 12:21:49 +00:00
Jordan Demeulenaere
6057f676ae Merge "Fix bouncer to launcher/app animation" into sc-dev 2021-06-16 12:13:43 +00:00
PETER LIANG
1b4fd20a1d Merge "Update the default position of the Accessibility floating menu." into sc-dev am: d89dae0094 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934425

Change-Id: Ifd3ca1949671b363bba2218a5869e633093dd13a
 2021-06-16 12:04:52 +00:00
PETER LIANG
24ef8890bc Merge "Update the default position of the Accessibility floating menu." into sc-dev am: d89dae0094 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934425

Change-Id: Ie79a0289e8dcdae6fcc138177d87443901f4e014
 2021-06-16 12:04:07 +00:00
PETER LIANG
d89dae0094 Merge "Update the default position of the Accessibility floating menu." into sc-dev 2021-06-16 11:52:45 +00:00
Louis Chang
a0ea692579 Merge "Avoid activity positioned on top of always-on-top activities" into sc-v2-dev am: 74c8a7102f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972762

Change-Id: Iabbaef872abd792c0905d1b75be74e382cd9541d
 2021-06-16 11:29:13 +00:00
Louis Chang
74c8a7102f Merge "Avoid activity positioned on top of always-on-top activities" into sc-v2-dev 2021-06-16 11:14:07 +00:00
Nikita Ioffe
69ede3fc26 Merge "Explicitly set generate_hashtree: false" into sc-dev am: a2d7f96154 am: 220a3a4f1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14965613

Change-Id: Iffc6ca0159646f42a6bca9b5e8768f4a6052be84
 2021-06-16 10:54:43 +00:00
Automerger Merge Worker
993fcda55b Merge "Merge "Add a new string for a migration tooltip of Accessibility floating menu." into sc-dev am: 29ab842516 am: d0554a2d70" into sc-v2-dev-plus-aosp 2021-06-16 10:54:20 +00:00
PETER LIANG
38cd8e5e41 Merge "Add a new string for a migration tooltip of Accessibility floating menu." into sc-dev am: 29ab842516 am: d0554a2d70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14950061

Change-Id: Id7fe0d317df8198e714f5d52c088248533fbb31b
 2021-06-16 10:54:11 +00:00
Nikita Ioffe
6522dd4085 Merge "Explicitly set generate_hashtree: false" into sc-dev am: a2d7f96154 am: 386c27f012 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14965613

Change-Id: Id78ac98c3c01cbfa9582b781050ebf9201a0bca8
 2021-06-16 10:54:08 +00:00
PETER LIANG
36c6359eb8 Merge "Add a new string for a migration tooltip of Accessibility floating menu." into sc-dev am: 29ab842516 am: 6469283e6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14950061

Change-Id: I6c0b3b0ee79b2849ad37a46cb47e96918ea8789a
 2021-06-16 10:53:59 +00:00
Nikita Ioffe
386c27f012 Merge "Explicitly set generate_hashtree: false" into sc-dev am: a2d7f96154 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14965613

Change-Id: Ief471bc30cb7efb14f67223f4b713cb6add7e175
 2021-06-16 10:41:45 +00:00
PETER LIANG
6469283e6a Merge "Add a new string for a migration tooltip of Accessibility floating menu." into sc-dev am: 29ab842516 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14950061

Change-Id: I4145c48b95b636c94d025c458f1898950f3d7e3b
 2021-06-16 10:41:27 +00:00
Nikita Ioffe
220a3a4f1c Merge "Explicitly set generate_hashtree: false" into sc-dev am: a2d7f96154 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14965613

Change-Id: Idf9209f23f30ae1c0688ecced766dfb6f6f24b57
 2021-06-16 10:41:04 +00:00
PETER LIANG
d0554a2d70 Merge "Add a new string for a migration tooltip of Accessibility floating menu." into sc-dev am: 29ab842516 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14950061

Change-Id: Idfac3e21a2ce6e59138926641bebb5d79e6494a9
 2021-06-16 10:40:38 +00:00
Nikita Ioffe
a2d7f96154 Merge "Explicitly set generate_hashtree: false" into sc-dev 2021-06-16 10:30:35 +00:00
PETER LIANG
29ab842516 Merge "Add a new string for a migration tooltip of Accessibility floating menu." into sc-dev 2021-06-16 10:29:45 +00:00
Jordan Demeulenaere
534aef4d05 Fix bouncer to launcher/app animation 
This CL ensures that we don't show the keyguard early when unlocking the
phone from the bouncer after swiping up on the lockscreen.

Bug: 191031464
Test: Manual, swipe up on lockscreen with PIN
Change-Id: Id7269189c857e1108a8e33074bb5abfd40437deb
 2021-06-16 12:10:28 +02:00
Selim Cinek
6178a64fc3 Merge "Modified the way the notifications clip to the boundary" into sc-v2-dev am: 980bbcd892 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14980950

Change-Id: I953fa3e9885b7bee3b70028f33931414d5356300
 2021-06-16 09:56:44 +00:00
Stanley Wang
0d2d569a3d Merge "Update the IllustrationPreference of SettingsLib." into sc-dev am: 4a762bc62b am: 8c4d38ed83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972861

Change-Id: I164d6d3ff2abe3b549f96421a6867dc3fc662d88
 2021-06-16 09:56:31 +00:00
Selim Cinek
980bbcd892 Merge "Modified the way the notifications clip to the boundary" into sc-v2-dev 2021-06-16 09:55:57 +00:00
Stanley Wang
24d4097433 Merge "Refine the IllustrationPreference." into sc-dev am: 09d0cbaff9 am: b4fbfb020f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972769

Change-Id: Ib9ce56c187f2a239fab0a906f7571ed860e967b8
 2021-06-16 09:55:55 +00:00
Stanley Wang
1e8e90bb66 Merge "Update the IllustrationPreference of SettingsLib." into sc-dev am: 4a762bc62b am: 507c425047 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972861

Change-Id: Ic999cda4eb07fc6186d2cc5b1d914c68fd5a56e2
 2021-06-16 09:55:38 +00:00
Stanley Wang
3731d46369 Merge "Refine the IllustrationPreference." into sc-dev am: 09d0cbaff9 am: b319aa84d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972769

Change-Id: I8c6e8b5a5d7279c51117b38a94494adb28cca9a5
 2021-06-16 09:55:27 +00:00
Stanley Wang
507c425047 Merge "Update the IllustrationPreference of SettingsLib." into sc-dev am: 4a762bc62b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972861

Change-Id: I9a0084905d9ebff8c24515e657b42173adfdbe4d
 2021-06-16 09:38:25 +00:00
Stanley Wang
8c4d38ed83 Merge "Update the IllustrationPreference of SettingsLib." into sc-dev am: 4a762bc62b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972861

Change-Id: I09c15931ef80909d03964b645643946decacce45
 2021-06-16 09:38:12 +00:00
Stanley Wang
b4fbfb020f Merge "Refine the IllustrationPreference." into sc-dev am: 09d0cbaff9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972769

Change-Id: Ia2d71f6233b118be5c1dcfcea93e44d5856f5047
 2021-06-16 09:37:48 +00:00
Stanley Wang
b319aa84d2 Merge "Refine the IllustrationPreference." into sc-dev am: 09d0cbaff9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972769

Change-Id: I9ec435a85af181c5e9ff9bde8be78a7004b2abf8
 2021-06-16 09:37:45 +00:00
Stanley Wang
4a762bc62b Merge "Update the IllustrationPreference of SettingsLib." into sc-dev 2021-06-16 09:24:55 +00:00
TreeHugger Robot
55db3274e0 Merge "ContentCaptureEvent: Log composing and selection indices" into sc-dev am: 8f74aa34ee am: 86428a3591 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14960922

Change-Id: I46663ad77b5556558b5c0467d37fdc2251da25f8
 2021-06-16 09:24:52 +00:00
Stanley Wang
09d0cbaff9 Merge "Refine the IllustrationPreference." into sc-dev 2021-06-16 09:22:00 +00:00
TreeHugger Robot
ec797d2ef9 Merge "ContentCaptureEvent: Log composing and selection indices" into sc-dev am: 8f74aa34ee am: 27b4e2ffcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14960922

Change-Id: Ie054a555d169671d9925f31d4b21064e3c463f64
 2021-06-16 09:19:44 +00:00
TreeHugger Robot
86428a3591 Merge "ContentCaptureEvent: Log composing and selection indices" into sc-dev am: 8f74aa34ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14960922

Change-Id: I68a7abf9d4da0dbfb1d1276814f65e7971fe6586
 2021-06-16 09:10:09 +00:00
TreeHugger Robot
27b4e2ffcc Merge "ContentCaptureEvent: Log composing and selection indices" into sc-dev am: 8f74aa34ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14960922

Change-Id: Ia2b4d9bbac4e41b8f78ba0895b95e4fb5b4dc514
 2021-06-16 09:09:13 +00:00
TreeHugger Robot
8f74aa34ee Merge "ContentCaptureEvent: Log composing and selection indices" into sc-dev 2021-06-16 08:46:41 +00:00
Kevin Chyn
13772b5f53 Merge "Refactor/Move isTestModeEnabled to frameworks/base" into sc-dev am: 5c7cdbb8f5 am: 62bcc81085 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14984518

Change-Id: Ie5d2838f21e4db2e985c2f66d478d603c955ef28
 2021-06-16 08:26:16 +00:00
Kevin Chyn
1af9943be2 Merge "Refactor/Move isTestModeEnabled to frameworks/base" into sc-dev am: 5c7cdbb8f5 am: 500e16534b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14984518

Change-Id: I498758028a747caf125e514a2346391eac277fba
 2021-06-16 08:25:51 +00:00
Kevin Chyn
500e16534b Merge "Refactor/Move isTestModeEnabled to frameworks/base" into sc-dev am: 5c7cdbb8f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14984518

Change-Id: Ifab1b716fc8540108b37791069841ec031595e7b
 2021-06-16 08:09:26 +00:00
Kevin Chyn
62bcc81085 Merge "Refactor/Move isTestModeEnabled to frameworks/base" into sc-dev am: 5c7cdbb8f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14984518

Change-Id: Ie20b5750f3cf03b1bc1649ff0bda1518baf2e66a
 2021-06-16 08:08:16 +00:00
Rhed Jao
a5b8bc9288 Merge "Add support to update the throttle time of silent updates" into sc-dev am: b55a5da715 am: 3c8bfa2dcd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909659

Change-Id: Ia8d785525f60d6aa48330d2f9c635cdc4f4de55e
 2021-06-16 08:01:19 +00:00
Rhed Jao
646968a446 Merge "Add support to update the throttle time of silent updates" into sc-dev am: b55a5da715 am: d8ba9c2620 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909659

Change-Id: I66efaaf322ac0caf3d6ce7f92c2f6e32431b4160
 2021-06-16 08:00:38 +00:00