Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
786,438 Commits 3 Branches 0 Tags
caff4c4c32a042ae5be514c13ef4e1206eebfae4
Commit Graph

19103 Commits

Author SHA1 Message Date
Nicolò Mazzucato
e8d8c8efed Merge "Add jank monitoring for taskbar appearing and disappearing" into tm-qpr-dev am: 0180bb596f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18805631

Change-Id: Iba25ae8912465d339211162aba000740093a1328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 15:37:01 +00:00
Nicolo' Mazzucato
b612fe0a58 Add jank monitoring for taskbar appearing and disappearing 
Bug: 228969045
Test: record a perfetto trace and make sure the interaction is there
Change-Id: I9bb46cd92a373ec4cfe43954cc66d983f1b380b1
 2022-06-28 08:27:29 +00: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
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
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
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
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
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
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
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
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
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
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
Treehugger Robot
75784f47a9 Merge "Add runtime crash information to sysprops" am: 68f657619c am: 0a3e8a46af am: f510d4e024 am: c021af23d3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107991

Change-Id: I9f4516d963b2031551e69284c792c39547e5029f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 01:23:16 +00:00
Treehugger Robot
8cc1782ba5 Merge "statemachine migration from base to modules-utils" am: 51e6e8a0e1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1893671

Change-Id: Ica83696aafc34e98de5a8a90838bb4b6a92ac58c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 00:59:17 +00:00
Treehugger Robot
f510d4e024 Merge "Add runtime crash information to sysprops" am: 68f657619c am: 0a3e8a46af 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107991

Change-Id: Ib5c224cd8192d883977d001a56194f8f8584e9ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 00:40:26 +00:00
Treehugger Robot
51e6e8a0e1 Merge "statemachine migration from base to modules-utils" 2022-06-14 23:52:11 +00:00
Treehugger Robot
0a3e8a46af Merge "Add runtime crash information to sysprops" am: 68f657619c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107991

Change-Id: Ia6e09648c74410ce5d14dd6b2032e59466034cb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 22:58:00 +00:00
Treehugger Robot
68f657619c Merge "Add runtime crash information to sysprops" 2022-06-14 22:28:58 +00:00
Matt Casey
f4075745d8 Merge "Finish mini-resolver after user action." into tm-dev am: 831370bffb am: 68bdb03d0c am: 01ca540e02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18838611

Change-Id: I2459cee0f1b9e37c9f4ae45fe681a5e3e50ebabd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 16:46:12 +00:00
Matt Casey
01ca540e02 Merge "Finish mini-resolver after user action." into tm-dev am: 831370bffb am: 68bdb03d0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18838611

Change-Id: I2c7712973096e672492f797d0b30249a26ef595c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 16:29:20 +00:00
Matt Casey
5f3b7d655f Merge "Finish mini-resolver after user action." into tm-dev am: 831370bffb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18838611

Change-Id: I51f844182e43db1ebe3c50a543ea04f499943fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 16:03:03 +00:00
Matt Casey
831370bffb Merge "Finish mini-resolver after user action." into tm-dev 2022-06-13 15:46:13 +00:00
Tiger Huang
ff4891638d Don't force IME drawing system bar backgrounds 
If IME doesn't have FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS, DecorView won't
show the color views for providing background color of system bars.
DecorView will call Window#onDrawLegacyNavigationBarBackgroundChanged
when the flag is changed. This gives NavigationBarController a chance
to decide whether to draw the legacy navigation bar background for the
IME or not.

Bug: 201375975
Test: Show IME in combinations of
      a. floating mode or non-floating mode
      b. gesture navigation or 3-button navigation
      c. taskbar or navigation bar
      d. light theme or dark theme
      And see if there is anything unexpected
Change-Id: If7ac32e2b874c04a260d542cb6a7595288aae182
 2022-06-13 12:24:57 +00:00
Yurii Zubrytskyi
4c2b5c8470 Merge changes from topic "Tiramisu-SDK-Finalization-revert-hack" into tm-dev am: 120aa88d0d am: 801d350fff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18764290

Change-Id: Ia19898c436e9b168efebc363ec19e9d3f10084a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-11 08:38:11 +00:00
Yurii Zubrytskyi
bd1e5cd3c5 Merge changes from topic "Tiramisu-SDK-Finalization-revert-hack" into tm-dev am: 120aa88d0d am: 4226e4b4e4 am: aed3061fec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18764290

Change-Id: Id43f749910e7d327cd0370071fc77de63af9267c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-11 08:37:40 +00:00
Yurii Zubrytskyi
4226e4b4e4 Merge changes from topic "Tiramisu-SDK-Finalization-revert-hack" into tm-dev am: 120aa88d0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18764290

Change-Id: Ic040b07c1559829833a4998f5001b8f34267c9a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-11 08:19:12 +00:00
Yurii Zubrytskyi
120aa88d0d Merge changes from topic "Tiramisu-SDK-Finalization-revert-hack" into tm-dev 
* changes:
  Catch parsing errors for pre-release platforms
  Revert "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE"
 2022-06-11 05:42:37 +00:00
Matt Casey
5b015f84af Finish mini-resolver after user action. 
Bug: 235440512
Test: Trigger mini resolver, press each button and press back and verify
      the resolver is gone.
Change-Id: Ib22f7f38b4c5f7143b5898dbc3c74e3c7a0450f3
 2022-06-10 18:06:18 +00:00
Daniel Sandler
c458354096 Merge "Android 1<3." into tm-dev am: 0f8269e68e am: 24650a74b5 am: 4e8afe4a98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18819106

Change-Id: Ic42648bf3e85888b7a8680c5b66c221f68a0e26e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 02:33:53 +00:00
Daniel Sandler
4e8afe4a98 Merge "Android 1<3." into tm-dev am: 0f8269e68e am: 24650a74b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18819106

Change-Id: I857bbfe8bb337fae261354cf77efe9f892273fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 02:17:41 +00:00
Daniel Sandler
a95ab05e3a Merge "Android 1<3." into tm-dev am: 0f8269e68e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18819106

Change-Id: Id245d8b53ae63dc7e47f1812528513e42b390312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 01:43:24 +00:00
Daniel Sandler
0f8269e68e Merge "Android 1<3." into tm-dev 2022-06-10 01:19:44 +00:00
Dan Sandler
2c57c9c164 Android 1<3. 
Fixes: 216297617
Test: adb shell am start -n android/com.android.internal.app.PlatLogoActivity
      adjust clock to 13:00
      for a bonus, long press on the bubbles
Change-Id: I3d32d452c6dd7a7e69aad86a033aba09ae8625d5
 2022-06-09 12:54:27 -04:00