Commit Graph

645477 Commits

Author SHA1 Message Date
Alexander Dorokhine
9053769983 Merge "Switch to a non-hidden way to compute data path and switch to subdir." into sc-dev am: aafffec2e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14675867

Change-Id: Ia3ef2e833e105b2743004d8a72ed9212fb693493
2021-06-16 07:15:06 +00:00
Alexander Dorokhine
aafffec2e3 Merge "Switch to a non-hidden way to compute data path and switch to subdir." into sc-dev 2021-06-16 07:00:17 +00:00
TreeHugger Robot
9a6dafd359 Merge "Fixed wipeData() so it doesn't depend on device_admin." into sc-dev am: 72ca552528
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14949624

Change-Id: Ie8796953e95a67942b8ce8c304f3e250aaf771f9
2021-06-16 06:49:56 +00:00
TreeHugger Robot
72ca552528 Merge "Fixed wipeData() so it doesn't depend on device_admin." into sc-dev 2021-06-16 06:45:36 +00:00
TreeHugger Robot
c559206bd8 Merge "Tweak vertical divider hight of RadioButtonPreference" into sc-dev am: 04e32fa3d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972760

Change-Id: I368de72fbea997a0ef819e3fed67620e8c62c6a1
2021-06-16 06:42:55 +00:00
TreeHugger Robot
04e32fa3d2 Merge "Tweak vertical divider hight of RadioButtonPreference" into sc-dev 2021-06-16 06:35:52 +00:00
TreeHugger Robot
388d8a3657 Merge "ContentCapture: DEBUG flag to log raw text" into sc-dev am: 949b4d2940
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982209

Change-Id: I1ee7c180158628fac9711a795ab04a78fbe33886
2021-06-16 06:34:52 +00:00
Kevin Chyn
5e82ec2682 Merge "Move non-settings-specific logic to frameworks/base" into sc-dev am: ffc5989fd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972615

Change-Id: I2b7855c2a4745b9f087b6b1c068515ea2c73aaf8
2021-06-16 06:34:12 +00:00
TreeHugger Robot
949b4d2940 Merge "ContentCapture: DEBUG flag to log raw text" into sc-dev 2021-06-16 06:32:35 +00:00
Kevin Chyn
ffc5989fd3 Merge "Move non-settings-specific logic to frameworks/base" into sc-dev 2021-06-16 06:13:17 +00:00
Minche Li
6619759631 Merge "Calculates the window height fraction on screen by the draggable bounds for magnification switch button" into sc-dev am: 70aaf815b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14921895

Change-Id: I3e75bc49991c1682f7c36474dcf07496618817aa
2021-06-16 05:20:24 +00:00
Minche Li
70aaf815b6 Merge "Calculates the window height fraction on screen by the draggable bounds for magnification switch button" into sc-dev 2021-06-16 04:58:37 +00:00
TreeHugger Robot
1522a2d92a Merge "Limit marquee in QS tiles to 1" into sc-dev am: 014c064431
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982226

Change-Id: Ie57d1c48d76f097a92c17b9d935278f2a597cb22
2021-06-16 04:07:46 +00:00
TreeHugger Robot
699738b370 Merge "Set quick_qs_offset_height to 48dp in waterfall" into sc-dev am: 8a39e97d7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14966792

Change-Id: Ifde912d63eba1660ca9a60c55ea6b240400e7ac1
2021-06-16 04:07:02 +00:00
Colin Cross
9c00e6e8cd Merge "Revert "Revert "HULK SMASH! We've gotta declare REL.""" into sc-dev am: 5c80e3491d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14991077

Change-Id: Ib0f71f6a4dd6418c8c7f92c8144f37ec4d0f4051
2021-06-16 04:05:40 +00:00
TreeHugger Robot
014c064431 Merge "Limit marquee in QS tiles to 1" into sc-dev 2021-06-16 04:01:09 +00:00
TreeHugger Robot
8a39e97d7e Merge "Set quick_qs_offset_height to 48dp in waterfall" into sc-dev 2021-06-16 04:00:25 +00:00
mincheli
5c8b13c47f Calculates the window height fraction on screen by the draggable bounds for magnification switch button
In the previous change ag/14776093, the window height fraction used
"windowHeightFraction = (float) mParams.y / mWindowHeight;". And it
causes the  Y-position deviated after the rotation is changed.
To correct this, we used the draggable bounds to calculate the window
height fraction.
See b/189715285#comment3

Bug: 189715285
Test: atest MagnificationModeSwitchTest
Change-Id: I1adcea12f0a96c64c9c6e386dc2feb8e3a9ffcf3
2021-06-16 01:59:16 +00:00
Colin Cross
5c80e3491d Merge "Revert "Revert "HULK SMASH! We've gotta declare REL.""" into sc-dev 2021-06-16 01:55:36 +00:00
Colin Cross
67f28e7448 Revert "Revert "HULK SMASH! We've gotta declare REL.""
This reverts commit 30bb1d09eb.

Reason for revert: b/191191441

Bug: 171506470
Bug: 191191441
Change-Id: I698709a27f3b09e5e02143efd7a71157b5ecf75a
2021-06-16 01:54:59 +00:00
Evan Rosky
33e7c4c687 Merge "Make WindowState.isVisibleRequested actually report requested" into sc-v2-dev 2021-06-16 01:45:05 +00:00
Alexander Dorokhine
66e09afd54 Switch to a non-hidden way to compute data path and switch to subdir.
We need to store other things in the appsearch data dir other than what
Icing stores, such as the storage info cache.

Bug: 177685938
Bug: 181787682
Test: Presubmit
Change-Id: I903c34a2c891d617217d44f5126d0d31c8c6bf39
2021-06-15 16:43:28 -07:00
Alexander Dorokhine
42b9652adb Merge "Update framework from jetpack." into sc-dev am: ad37babc9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14834284

Change-Id: Ib4cd0a29ebc5bdb73d29662a70455ae0288c15e6
2021-06-15 23:35:42 +00:00
Alexander Dorokhine
ad37babc9f Merge "Update framework from jetpack." into sc-dev 2021-06-15 23:20:43 +00:00
Vinit Nayak
2c6b4d5fc9 Merge "Pass nav button disable and AOD events to launcher" into sc-v2-dev 2021-06-15 23:05:15 +00:00
Jing Ji
99ae542e05 [automerger skipped] Validate the ServiceRecord state while handling misbehaving FGS am: ae5a219b95 -s ours am: a388d2533d -s ours
am skip reason: Merged-In If18e1d7ba88aef693349b82dc6e70f7d98c68665 with SHA-1 e9b096473f is already in history

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

Change-Id: Ie4c1e24240e4d555a803357c0021f300f04f7a83
2021-06-15 22:38:51 +00:00
Jing Ji
a388d2533d [automerger skipped] Validate the ServiceRecord state while handling misbehaving FGS am: ae5a219b95 -s ours
am skip reason: Merged-In If18e1d7ba88aef693349b82dc6e70f7d98c68665 with SHA-1 e9b096473f is already in history

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

Change-Id: I64138221dba7defd84c31b64fa84b6aea7c1d09b
2021-06-15 22:19:10 +00:00
Siarhei Vishniakou
c3fb5dcd53 Merge "Remove FLAG_INPUTFILTER_TRUSTED in MotionEventInjector" into sc-dev am: 5d552869af
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14676739

Change-Id: I6ad42551ed0bbd48270fb3386f717727b3374779
2021-06-15 21:55:49 +00:00
TreeHugger Robot
6f348778c2 Merge "Improved implementation of VoiceInteractionManagerService.setDisabled()" into sc-dev am: 50bbe88967
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14940217

Change-Id: Iaf1b2982e5de166b6298a21310a79b22702206c8
2021-06-15 21:55:21 +00:00
Siarhei Vishniakou
5d552869af Merge "Remove FLAG_INPUTFILTER_TRUSTED in MotionEventInjector" into sc-dev 2021-06-15 21:50:35 +00:00
TreeHugger Robot
50bbe88967 Merge "Improved implementation of VoiceInteractionManagerService.setDisabled()" into sc-dev 2021-06-15 21:45:38 +00:00
TreeHugger Robot
78bb87d1c6 Merge "Make inline suggestions tooltip is not magnified" into sc-dev am: cac7ab9c5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14514105

Change-Id: I690b8b91aed71839ce7b19c32e7de209cb08a863
2021-06-15 21:36:45 +00:00
Ilya Matyukhin
3d40fa2f50 Merge "Add traces for touch events and fix trace naming" into sc-dev am: 825555290f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14977408

Change-Id: I759099ffea1dd9050cd141f4acc505d5c7106149
2021-06-15 21:36:32 +00:00
Jeff Sharkey
a204ce35fb Merge "Revert "HULK SMASH! We've gotta declare REL."" into sc-dev am: a56beb126d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14973563

Change-Id: I40aa288800c21763fd59acf25c7951297e7060bd
2021-06-15 21:36:21 +00:00
Nikita Ioffe
da242ddc8a Merge "Allow holders of INSTALL_PACKAGE_UPDATES permission to update APEXes" into sc-dev am: 4173c5a51a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14965611

Change-Id: Ieaf28ffb309ffc258c79eac8c82cfe95d75837fa
2021-06-15 21:36:07 +00:00
TreeHugger Robot
bdcf3d919f Merge "Use PWLE for waveforms and add ramp down to zero" into sc-dev am: 5bb0024e1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14734461

Change-Id: I52a0bbbead9b3235a294e392ede3f45338fefb64
2021-06-15 21:35:39 +00:00
TreeHugger Robot
350b26662a Merge "Refresh the call indicators whenever carrier config is changed" into sc-dev am: 7f848ec12a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982365

Change-Id: I9b21a293f909c72c095704468bccf088fa6bb5ec
2021-06-15 21:34:44 +00:00
TreeHugger Robot
cac7ab9c5c Merge "Make inline suggestions tooltip is not magnified" into sc-dev 2021-06-15 21:22:09 +00:00
Ilya Matyukhin
825555290f Merge "Add traces for touch events and fix trace naming" into sc-dev 2021-06-15 21:07:54 +00:00
Jeff Sharkey
a56beb126d Merge "Revert "HULK SMASH! We've gotta declare REL."" into sc-dev 2021-06-15 21:03:41 +00:00
Nikita Ioffe
4173c5a51a Merge "Allow holders of INSTALL_PACKAGE_UPDATES permission to update APEXes" into sc-dev 2021-06-15 21:03:05 +00:00
TreeHugger Robot
5bb0024e1f Merge "Use PWLE for waveforms and add ramp down to zero" into sc-dev 2021-06-15 20:50:45 +00:00
TreeHugger Robot
7f848ec12a Merge "Refresh the call indicators whenever carrier config is changed" into sc-dev 2021-06-15 20:47:45 +00:00
TreeHugger Robot
066585c188 Merge "Need to call resetFgsRestrictionLocked() before calling setFgsRestrictionLocked() again." into sc-dev am: d26ab5ef57
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14981904

Change-Id: I0663f9b373f11ab4255f6ef92b1cf2554c52725e
2021-06-15 20:30:12 +00:00
TreeHugger Robot
d26ab5ef57 Merge "Need to call resetFgsRestrictionLocked() before calling setFgsRestrictionLocked() again." into sc-dev 2021-06-15 20:28:15 +00:00
Miranda Kephart
2cbb36db60 Merge "Make Markup fade in from screenshots" into sc-dev am: f34c9ede73
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14969136

Change-Id: I19e606c5a2d511688b1923c7857040f7c41e7d9d
2021-06-15 20:07:34 +00:00
Miranda Kephart
f34c9ede73 Merge "Make Markup fade in from screenshots" into sc-dev 2021-06-15 20:04:45 +00:00
TreeHugger Robot
6eb32e08cb Merge "Adjust inset to center icon in a muted volume row." into sc-dev am: 1d2aaf9026
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14965684

Change-Id: Ibd86f8c827332ba20139ed90a2e180f3b617e8ef
2021-06-15 19:47:44 +00:00
TreeHugger Robot
7b99553525 Merge "Properly check for SDK before nullifying attribution tag" into sc-dev am: b3c8d6d2e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14940427

Change-Id: I5df6b730463cad92d108ff13d4f18256b977b673
2021-06-15 19:47:26 +00:00
TreeHugger Robot
1d2aaf9026 Merge "Adjust inset to center icon in a muted volume row." into sc-dev 2021-06-15 19:41:35 +00:00