Commit Graph

19279 Commits

Author SHA1 Message Date
TreeHugger Robot
f0122ad578 Merge "Deprecate mRequestUpdateCursorAnchorInfoMonitorMode part 2" 2022-06-22 03:56:27 +00:00
TreeHugger Robot
43b6f4b22a Merge "Update TEST_MAPPING files following the move of BatteryStatsImpl" 2022-06-22 03:50:26 +00:00
TreeHugger Robot
4a2b184987 Merge "Deprecate mRequestUpdateCursorAnchorInfoMonitorMode part 1" 2022-06-22 02:37:50 +00:00
Chris Wailes
36991c3886 Merge "Add System Properties based settings for USAPs" am: a2143c07bb am: 6cb0a4dd92 am: ca5df431c5 am: 8b193879c6 am: 80f33ec0a9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2043395

Change-Id: I29906948f65013836fe7bb1d7d818b0bfedd21a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 00:33:44 +00:00
PETER LIANG
4de43265ab Merge "Fix clicking the allow/deny button of the dialog was not working after quickly clicking multiple times." 2022-06-22 00:30:57 +00:00
Dmitri Plotnikov
445e9364b5 Update TEST_MAPPING files following the move of BatteryStatsImpl
Bug: 236599255
Test: presubmit
Change-Id: I2e42d70219a07d9b65d65025d71ef7d55d0924ba
2022-06-21 17:14:03 -07:00
Chris Wailes
80f33ec0a9 Merge "Add System Properties based settings for USAPs" am: a2143c07bb am: 6cb0a4dd92 am: ca5df431c5 am: 8b193879c6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2043395

Change-Id: Icdf31b641bec9b3f39591586086640868c30f9ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 23:45:53 +00:00
Chris Wailes
8b193879c6 Merge "Add System Properties based settings for USAPs" am: a2143c07bb am: 6cb0a4dd92 am: ca5df431c5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2043395

Change-Id: I96acf477bb004cad2ee6ac87a98a1d7176c498ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 23:26:54 +00:00
Chris Wailes
ca5df431c5 Merge "Add System Properties based settings for USAPs" am: a2143c07bb am: 6cb0a4dd92
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2043395

Change-Id: I98e8a58abbbc5ac8ba5b8caad4dcb365495209c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 23:08:53 +00:00
Yohei Yukawa
752bf17e6b Deprecate mRequestUpdateCursorAnchorInfoMonitorMode part 2
This is the second step towards deprecating

  InputMethodManager#mRequestUpdateCursorAnchorInfoMonitorMode,

which was introduced as a minimum implementation to support
CursorAnchorInfo API in EditText [1]

Before this CL, there is a behavior discrepancy in

 InputMethodManager#updateCursorAnchorInfo()

handler because mRequestUpdateCursorAnchorInfoMonitorMode has a valid
value when and only when the editor component is EditText.

With this CL, the same behavior will be applied to non-View based
editors.

 [1]: I3c6b69bd9d79b199afe68d838f25effa6048e5cc
      cf8421df856a5950729ff1d0e73f21d480aa98fb

Bug: 236713697
Test: atest CtsInputMethodTestCases:InputMethodServiceTest#testOnUpdateCursorAnchorInfo
Change-Id: Ib17a05e11b7948c9e468e4efd0497dc1ed2f3559
2022-06-21 15:20:32 -07:00
Yohei Yukawa
c5af33d324 Deprecate mRequestUpdateCursorAnchorInfoMonitorMode part 1
This is the initial step towards deprecating

 InputMethodManager#mRequestUpdateCursorAnchorInfoMonitorMode,

which was introduced as a minimum implementation to support
CursorAnchorInfo API in EditText [1]

Before this CL, there is a behavior discrepancy in

 MSG_UPDATE_VIRTUAL_DISPLAY_TO_SCREEN_MATRIX

handler because mRequestUpdateCursorAnchorInfoMonitorMode has a valid
value when and only when the editor component is EditText.

With this CL, the same behavior will be applied to non-View based
editors.

 [1]: I3c6b69bd9d79b199afe68d838f25effa6048e5cc
      cf8421df856a5950729ff1d0e73f21d480aa98fb

Bug: 236713697
Test: presubmit
Change-Id: I8d42aef4ffd81253181ba876f8970179643d834c
2022-06-21 15:19:16 -07:00
TreeHugger Robot
539e79f468 Merge "BatteryStatsImpl: Add parcel methods for DisplayBatteryStats." into tm-qpr-dev-plus-aosp 2022-06-21 20:22:34 +00:00
TreeHugger Robot
de32fd8eba Merge "BatteryStatsImpl: Add parcel methods for DisplayBatteryStats." into tm-d1-dev-plus-aosp 2022-06-21 20:22:30 +00:00
Riley Jones
33bf969b3f Merge "Changing ActionMenuItemView to provide the Button class name to accessibility services." 2022-06-21 19:10:48 +00:00
Vadim Caen
c21bb6a1b1 Merge "Prevent callback registration when back flag is disabled" into tm-dev am: 1c6de844ce am: 0592820f44 am: 9e2a134dde
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18794217

Change-Id: Id3181b7f8155aa5e3bda8c1604fd70a0cd290601
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 22:35:13 +00:00
Vadim Caen
f238735a02 Merge "Prevent callback registration when back flag is disabled" into tm-dev am: 1c6de844ce am: 0592820f44
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18794217

Change-Id: Ia11db8e296958a5a8598e29d8719ba38784e14e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 21:19:56 +00:00
Vadim Caen
9e2a134dde Merge "Prevent callback registration when back flag is disabled" into tm-dev am: 1c6de844ce am: 0592820f44
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18794217

Change-Id: I367c3888b726f0f7c83d382881741478e715d549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 21:19:32 +00:00
Vadim Caen
b38e19fdc3 Merge "Prevent callback registration when back flag is disabled" into tm-dev am: 1c6de844ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18794217

Change-Id: I8054556537104bb80d940272b367ed9b8ffa520c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 21:02:34 +00:00
Nick Chameyev
ef0fa1054a Merge "Update the number of columns on config change in share sheet" into tm-qpr-dev am: f3697ffee8 am: b82facd63d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799656

Change-Id: Ica6e122d0ef1e771c0c367504b061d20e857f9a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 09:44:18 +00:00
Vadim Caen
a2e45f1ed1 Prevent callback registration when back flag is disabled
When the enableOnBackInvokedCallback is set to false (or not set),
registering an OnBackInvokedCallback should be a no-op to avoid
overriding the default compat callback.

Test: Manual testing registering a callback on an app with the flag
disabled and doing a back gesture. Currently we don't have test
executing a back gesture so automated tests are not possible

Bug: 235206960

Change-Id: I54d843f11130a78ed5a68cbe4722e601a2086ee1
Merged-In: I54d843f11130a78ed5a68cbe4722e601a2086ee1
(cherry picked from commit aa48dc3c2d)
2022-06-20 11:40:18 +02:00
Nick Chameyev
b82facd63d Merge "Update the number of columns on config change in share sheet" into tm-qpr-dev am: f3697ffee8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799656

Change-Id: Ia7a44b241dc7dffdcb49afc157752443e60ebbd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 09:33:28 +00:00
Nick Chameyev
f3697ffee8 Merge "Update the number of columns on config change in share sheet" into tm-qpr-dev 2022-06-20 09:24:35 +00:00
Peter_Liang
414b5da8c0 Fix clicking the allow/deny button of the dialog was not working after quickly clicking multiple times.
Root cause:
Show at least two dialogs after quickly clicking multiple times.

Goal:
Should only show one dialog on the screen.

Bug: 233248607
Test: atest AccessibilityShortcutChooserActivityTest
Change-Id: I772c69267c799a9201bfa7846140c139f745c1e0
2022-06-20 15:57:51 +08:00
Vadim Caen
14c60531bd Merge "Prevent callback registration when back flag is disabled" 2022-06-19 13:39:58 +00:00
Dmitri Plotnikov
b2d812345d Merge "Move BatteryStatsImpl to com.android.server.power.stats" 2022-06-17 23:26:31 +00:00
Shumao Hou
7da46301e1 BatteryStatsImpl: Add parcel methods for DisplayBatteryStats.
DisplayBatteryStats didn't have parcel methods and the estimated
multidisplay screen power was always initialized from 0.
The estimated screen power of the app will become inaccurate
after rebooting.

Bug: 235321975
Test: manual test.
1. Unplug the device.
2. Use an app for a while and keep screen on.
3. Capture the first bug report.
4. Reboot the device.
5. Capture the second bug report.
The estimated screen power of the app shouldn't become lower after rebooting the device.

Author: Shumao Hou <shumao1129@gmail.com>
Change-Id: If74e285102a7350c17c2fc40a205b2031e82f5f4
(cherry picked from commit 79c3779bb1)
2022-06-17 22:02:30 +00:00
Shumao Hou
2814d58002 BatteryStatsImpl: Add parcel methods for DisplayBatteryStats.
DisplayBatteryStats didn't have parcel methods and the estimated
multidisplay screen power was always initialized from 0.
The estimated screen power of the app will become inaccurate
after rebooting.

Bug: 235321975
Test: manual test.
1. Unplug the device.
2. Use an app for a while and keep screen on.
3. Capture the first bug report.
4. Reboot the device.
5. Capture the second bug report.
The estimated screen power of the app shouldn't become lower after rebooting the device.

Author: Shumao Hou <shumao1129@gmail.com>
Change-Id: If74e285102a7350c17c2fc40a205b2031e82f5f4
(cherry picked from commit 79c3779bb1)
2022-06-17 21:58:37 +00:00
Chris Wailes
e05e1ffffe Add System Properties based settings for USAPs
This CL updates the configuration handling for USAP system properties.

Test: Build; flash; set property; check device state
Bug: 161725679
Change-Id: Ia1f6c4f4f7b8798d9c906953629bed61ce618f54
2022-06-17 10:49:17 -07:00
Anna Zhuravleva
048826155b Merge "Add Bilingual Suggested locale adapter." 2022-06-17 12:55:58 +00:00
Dmitri Plotnikov
842b134e2c Move BatteryStatsImpl to com.android.server.power.stats
Bug: 235635119
Test: atest FrameworksCoreTests:BatteryStatsTests
Test: atest FrameworksServicesTests:BatteryStatsTests
Test: atest BatteryUsageStatsProtoTests:BatteryUsageStatsPulledTest
NoNonSdkCheck: BatteryStatsImpl is being permanently moved to a different package. All data available via these hidden API is also available in dumpsys.
Change-Id: I39be1c66c23f43d339f9076c6b87902f6ef35967
2022-06-16 17:06:59 -07:00
Hui Yu
65ff3763ac Merge "Fix the missing history event problem." into tm-dev am: 25019b3782 am: f6743c032c am: 9e578ed3ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18582121

Change-Id: Ifdcc7b3a444773a428bdc8361c358aac62f2151a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 19:37:19 +00:00
Xin Li
195b02b570 Merge "Merge Android 12 QPR 3" 2022-06-16 18:51:54 +00:00
Hui Yu
fa083fb1c1 Merge "Fix the missing history event problem." into tm-dev am: 25019b3782 am: f6743c032c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18582121

Change-Id: If407fc52cef5e9c478a39b275cb5f9ea808e9bee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 18:32:30 +00:00
Hui Yu
9e578ed3ac Merge "Fix the missing history event problem." into tm-dev am: 25019b3782 am: f6743c032c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18582121

Change-Id: I94c52ccbdc1b734d16f3dc9f99023e7a17973000
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 18:32:18 +00:00
Hui Yu
2358e1baac Merge "Fix the missing history event problem." into tm-dev am: 25019b3782 am: 929f9b4f3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18582121

Change-Id: Ic47991e67b065151b12ebcd9ddbf0663f428dd7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 18:31:55 +00:00
Hui Yu
929f9b4f3f Merge "Fix the missing history event problem." into tm-dev am: 25019b3782
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18582121

Change-Id: I46df2a891727581cd98e25f25c808d3218af9826
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 18:06:44 +00:00
Hui Yu
b8f5fadbf7 Merge "Fix the missing history event problem." into tm-dev am: 25019b3782
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18582121

Change-Id: If5c508f866cec2c22cb534ae20da06dade629438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 18:05:34 +00:00
Hui Yu
25019b3782 Merge "Fix the missing history event problem." into tm-dev 2022-06-16 18:03:26 +00:00
Makoto Onuki
c920cb83cc Merge "Don't allow dangerous operations on shared handlers" 2022-06-16 14:39:38 +00:00
Nick Chameyev
9f3eb8d046 Update the number of columns on config change in share sheet
mMaxTargetsPerRow wasn't updated in the chooser
multi profile pager adapter, this adapter sets
the number of columns in the grid layout manager.
This led to incorrect number of columns when display
size changes in runtime.

Bug: 235572712
Test: open share sheet, fold the device =>
 check that the number of columns is updated
Change-Id: I1f3f3bff8a4d23909ccd4c00b74091183c28821b
2022-06-16 14:17:35 +00:00
Vadim Caen
aa48dc3c2d Prevent callback registration when back flag is disabled
When the enableOnBackInvokedCallback is set to false (or not set),
registering an OnBackInvokedCallback should be a no-op to avoid
overriding the default compat callback.

Test: Manual testing registering a callback on an app with the flag
disabled and doing a back gesture. Currently we don't have test
executing a back gesture so automated tests are not possible

Bug: 235206960

Change-Id: I54d843f11130a78ed5a68cbe4722e601a2086ee1
2022-06-16 12:41:46 +00:00
Shumao Hou
79c3779bb1 BatteryStatsImpl: Add parcel methods for DisplayBatteryStats.
DisplayBatteryStats didn't have parcel methods and the estimated
multidisplay screen power was always initialized from 0.
The estimated screen power of the app will become inaccurate
after rebooting.

Bug: 235321975
Test: manual test.
1. Unplug the device.
2. Use an app for a while and keep screen on.
3. Capture the first bug report.
4. Reboot the device.
5. Capture the second bug report.
The estimated screen power of the app shouldn't become lower after rebooting the device.

Author: Shumao Hou <shumao1129@gmail.com>
Change-Id: If74e285102a7350c17c2fc40a205b2031e82f5f4
2022-06-15 15:50:23 -07:00
huiyu
ae5e234cec Fix the missing history event problem.
[ag/8009931 is to fix the missing event problem and it get reverted in ag/15961577.
Now revert the change that causes the problem.]

Make a copy of mHistoryCur and add the copy to history buffer after
starting a new history file.

Bug: 230799882
Test: ag/8009931 reproduce steps.
Change-Id: If9339ed5182b65b9c59c119894e4f317b2e5751c
2022-06-15 12:55:09 -07:00
Makoto Onuki
a15d36b097 Don't allow dangerous operations on shared handlers
Test: Boot, tree hugger
Fix: 235594693
Change-Id: I1c14bc2e4dd22623cecbd166ea20cd62f6a8d790
2022-06-15 17:34:19 +00:00
Tiger Huang
f95f1a7949 Merge "Don't force IME drawing system bar backgrounds" into tm-qpr-dev am: 42ff37a278 am: 5e41b1eb20
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18869506

Change-Id: I1c0ed1cfa1d36c43ee33e554ff0bb204465b3266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:29:37 +00:00
Tiger Huang
5e41b1eb20 Merge "Don't force IME drawing system bar backgrounds" into tm-qpr-dev am: 42ff37a278
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18869506

Change-Id: I8dc2e62fe2c1357f82bffdc9af2f6b17acf2e81d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:10:02 +00:00
Tiger Huang
42ff37a278 Merge "Don't force IME drawing system bar backgrounds" into tm-qpr-dev 2022-06-15 05:34:36 +00:00
Treehugger Robot
aaa865f8e2 Merge "statemachine migration from base to modules-utils" am: 51e6e8a0e1 am: 8cc1782ba5 am: 4ecafadd7b am: d712bd402b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1893671

Change-Id: Ic9b0e6524abda9fdda863baec05adbc53417b1e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 03:06:36 +00:00
Dmitri Plotnikov
d4e7604d04 Merge "Remove dependency of battery history on com.android.internal.os.BatteryStatsImpl" 2022-06-15 02:13:58 +00:00
Treehugger Robot
4ecafadd7b Merge "statemachine migration from base to modules-utils" am: 51e6e8a0e1 am: 8cc1782ba5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1893671

Change-Id: I5ba9d65a7223fbf9d1f371e672491f09b05c1940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:25:27 +00:00