Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
649,503 Commits 3 Branches 0 Tags
fd490502aaccd6d8bfe8600e2edde048f4ee66f4
Commit Graph

16541 Commits

Author SHA1 Message Date
Siim Sammul
8e24806e0b Merge "Change settings observer for other processes to not pass a userhandle." into sc-dev am: 134b829e3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14426680

Change-Id: I7637d3751f5f521e2e82ff64c885a870f7aa2f5e
 2021-05-13 14:59:39 +00:00
Siim Sammul
8aa9913e66 Change settings observer for other processes to not pass a userhandle. 
Bug: 180584913
Test: Not a functionality change
Change-Id: Ibf0442f9de45694e33131c0ac327d840eea8fbfe
 2021-05-13 12:39:31 +00:00
Dmitri Plotnikov
0e4bcf7cce Merge "Do realistic data mocking in BluetoothPowerCalculatorTest" into sc-dev am: b5d43c6b71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14458439

Change-Id: I7ff1365621753c1e853cde8f140a5ff19646bbc1
 2021-05-13 01:33:49 +00:00
Dmitri Plotnikov
b5d43c6b71 Merge "Do realistic data mocking in BluetoothPowerCalculatorTest" into sc-dev 2021-05-13 01:22:04 +00:00
TreeHugger Robot
2f16683078 Merge "Fix BatteryStats Screen On timer reset" into sc-dev am: 1e1c864bc1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14523043

Change-Id: If2d284543172f1c6e02bc124b24cefe73538a969
 2021-05-13 01:10:57 +00:00
TreeHugger Robot
1e1c864bc1 Merge "Fix BatteryStats Screen On timer reset" into sc-dev 2021-05-13 00:55:43 +00:00
Michael Wachenschwanz
96906f72e3 Fix BatteryStats Screen On timer reset 
StopwatchTimer reset uses elapsedRealtime not uptime

Bug: 187844042
Test: builds + boots
Change-Id: I82286d74fef6256971361e70a787a2b39a7cbba4
 2021-05-12 16:19:02 -07:00
Dmitri Plotnikov
9828eb9044 Do realistic data mocking in BluetoothPowerCalculatorTest 
Bug: 187461241
Test: atest FrameworksCoreTests:BluetoothPowerCalculatorTest

Change-Id: I7974bd2ba434855a4b30e47b3e68e0a0569eb3f5
 2021-05-12 16:09:27 -07:00
Dmitri Plotnikov
99c9bc4ab2 Merge "Fix device-level wakelock battery attribution" into sc-dev am: dd9dcdfb72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14508393

Change-Id: I43f8aac2308c9b3e8f4fc33f818ed74655187164
 2021-05-12 22:54:10 +00:00
Dmitri Plotnikov
dd9dcdfb72 Merge "Fix device-level wakelock battery attribution" into sc-dev 2021-05-12 22:52:41 +00:00
Dmitri Plotnikov
59dd00ce46 Fix device-level wakelock battery attribution 
Bug: 187844042
Test: atest FrameworksCoreTests:WakelockPowerCalculatorTest
Change-Id: I4e14d962db37adeafb793022b50da0065628238c
 2021-05-12 14:21:12 -07:00
Connor O'Brien
e0f59ecb3d Merge "Log less on negative deltas in kernel CPU time readers" into sc-dev am: 0602a88a8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14489419

Change-Id: Idd7691ba0fe1d378e4e258db7f87d6319c064da0
 2021-05-12 18:59:03 +00:00
Connor O'Brien
0602a88a8f Merge "Log less on negative deltas in kernel CPU time readers" into sc-dev 2021-05-12 18:53:33 +00:00
Lucy Chang
53b8cf32a9 Merge "Don't send AccessibilityEent if text is unchanged" 2021-05-12 06:48:21 +00:00
PETER LIANG
46379dcec5 Merge changes from topic "a11y_floating_menu_migration_tooltip" into sc-dev am: 74a435858a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13990513

Change-Id: I3e009d9a5b9afe42ae37e8127ac2c92f89552146
 2021-05-12 03:23:33 +00:00
PETER LIANG
74a435858a Merge changes from topic "a11y_floating_menu_migration_tooltip" into sc-dev 
* changes:
  Add the new migration tooltip for accessibility floating menu.(2/n)
  Add the new migration tooltip for accessibility floating menu.(1/n)
  Add key ACCESSIBILITY_FLOATING_MENU_MIGRATION_TOOLTIP_PROMPT.
 2021-05-12 02:59:10 +00:00
Jeff DeCew
2f44158f48 Merge changes I11400a55,I49461363,Ia18b2dc3,I8c554755 into sc-dev am: aeddbdc7c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14492078

Change-Id: I1ef35ad6e81a211422c30972c970e191ac9d984f
 2021-05-11 22:41:29 +00:00
Jeff DeCew
aeddbdc7c9 Merge changes I11400a55,I49461363,Ia18b2dc3,I8c554755 into sc-dev 
* changes:
  Simplify SmartReplyView padding layout logic
  Smart action buttons now have 8dp corner radius
  Fix measure logic so that priority children can have more than 1/N space.
  Update the style of emphasized notification actions.
 2021-05-11 22:35:37 +00:00
Connor O'Brien
3f8d333016 Log less on negative deltas in kernel CPU time readers 
Logging the second, third etc. negative delta detected for a single
UID increases logging without a clear debugging benefit vs. just
noting the UIDs with at least one negative delta.

Bug: 182272121
Change-Id: Ia7c6994203493467d07eeb8092da1679864dc89e
Signed-off-by: Connor O'Brien <connoro@google.com>
 2021-05-11 15:19:29 -07:00
Michael Wachenschwanz
9d5efb7abf Merge "Wipe BatteryStats on Custom Power Bucket change" into sc-dev am: 7d8d752737 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14353265

Change-Id: I4a563d5e9e0a9ce88634d8385d8fc680d211a5bd
 2021-05-11 20:15:08 +00:00
Michael Wachenschwanz
7d8d752737 Merge "Wipe BatteryStats on Custom Power Bucket change" into sc-dev 2021-05-11 20:02:25 +00:00
TreeHugger Robot
c406ed409f Merge "AttachedSurfaceControl: Respond to API feedback." into sc-dev am: ab367ab510 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14443528

Change-Id: I5379ca05d097ffd510245f611bdd90263b901206
 2021-05-11 19:46:19 +00:00
TreeHugger Robot
ab367ab510 Merge "AttachedSurfaceControl: Respond to API feedback." into sc-dev 2021-05-11 19:13:05 +00:00
Marcin Oczeretko
f6505499f0 Merge "Count the overall number of missed frames" into sc-dev am: af586a1465 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14340806

Change-Id: Ie22aab20594e09f12a342e9d287d637960a6d3c4
 2021-05-11 09:40:51 +00:00
Marcin Oczeretko
af586a1465 Merge "Count the overall number of missed frames" into sc-dev 2021-05-11 09:09:40 +00:00
Winson Chung
db1462b327 Merge "Add test api to gc system and sysui" into sc-dev am: d011237d39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14461845

Change-Id: I125efeeaa7d30d53570498ec3d5a5f856554587d
 2021-05-11 05:18:18 +00:00
Winson Chung
d011237d39 Merge "Add test api to gc system and sysui" into sc-dev 2021-05-11 05:02:35 +00:00
Charles Chen
3db473fb61 Merge "Fix IME switch dialog crash on Dual rootDA display" into sc-dev am: c8bf38ce25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14305130

Change-Id: I014c3f314db5fe6c166e9833f5e8cadb15d01e96
 2021-05-11 04:19:23 +00:00
Charles Chen
c8bf38ce25 Merge "Fix IME switch dialog crash on Dual rootDA display" into sc-dev 2021-05-11 04:08:49 +00:00
Michael Wachenschwanz
fa2a4f44bd Wipe BatteryStats on Custom Power Bucket change 
If the supported OTHER EnergyConsumers change after a reboot, the
MeasuredEnergyStats from the reboot can no longer be considered valid.

Bug: 178504428
Test: atest FrameworksCoreTests:com.android.internal.power.MeasuredEnergyStatsTest
Change-Id: I2561c459c0b2a881661bd2913f9413a2cbd96abb
 2021-05-10 18:55:47 -07:00
Jeff DeCew
c6d567d239 Fix measure logic so that priority children can have more than 1/N space. 
The priority previously just put the view at the front of the list, which ensured that super long user-provided actions couldn't cause the priority action at the end to be truncated.  However, this still meant that a priority action at the start whose text would have it be longer than 1/3 of the action space would be capped at 1/3 instead of taking on some of the user-defined child's space.

Bug: 187533622
Test: Post Notify2 app's Call style w/ Screen action; notice that "Decline" is not truncated.

Change-Id: Ia18b2dc366ba7cac13ed845acac59d89206e7d5e
 2021-05-10 21:55:04 -04:00
Dmitri Plotnikov
f2cbb1015c Merge "Convert BatteryStats.dumpLocked from BatteryStatsHelper to BatteryUsageStats" into sc-dev am: 7b32d78264 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14207705

Change-Id: I8c67f52f8a94c3ac6ed62e3383824baaaba33d05
 2021-05-11 01:49:23 +00:00
Jeff DeCew
2ca6b4399a Update the style of emphasized notification actions. 
* This removed many of the differences between CallStyle and emphasized actions.
* These actions are now pill shaped with a solid bg color, no stroke, less height, less spacing between, and wrapping content instead of splitting space equally.

Fixes: 187533622
Test: manual testing with Notify, Notify2, and Clock (using timers and alarms)
Change-Id: I8c554755755c59f2756870f7cd2e0c533d22d823
 2021-05-10 21:41:52 -04:00
Dmitri Plotnikov
7b32d78264 Merge "Convert BatteryStats.dumpLocked from BatteryStatsHelper to BatteryUsageStats" into sc-dev 2021-05-11 01:24:56 +00:00
Menghan Li
1770367341 Merge "Apply dark theme for volume key shortcut warning dialog" into sc-dev am: f774ba0dac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14419594

Change-Id: Ice644ef88d2b38e4885d8bcb63e365b71ce5f9e0
 2021-05-11 01:06:34 +00:00
Menghan Li
f774ba0dac Merge "Apply dark theme for volume key shortcut warning dialog" into sc-dev 2021-05-11 00:57:44 +00:00
Peter_Liang
0ca995f360 Add the new migration tooltip for accessibility floating menu.(2/n) 
Patch Action:
1.Linkify the text related to migration tooltip.
2.Create the component name of the sub setting of
Accessibility button let framework side could launch to
the corresponding setting page.

Bug: 175365399
Test: atest AccessibilityShortcutControllerTest AnnotationLinkSpanTest AccessibilityFloatingMenuTooltipViewTest MigrationTooltipViewTest
Change-Id: I2af5aaa5cf1789f406f423c64c91f0e23c31e6eb
 2021-05-11 08:13:09 +08:00
Dmitri Plotnikov
e43992bbdb Convert BatteryStats.dumpLocked from BatteryStatsHelper to BatteryUsageStats 
Bug: 162380414
Test: atest FrameworksCoreTests:BatteryUsageStatsTest

Change-Id: Icb508c60e037ee983c0ebde5905ec0a08fe648c3
 2021-05-10 15:20:18 -07:00
Winson Chung
3d5b012471 Add test api to gc system and sysui 
Bug: 186268407
Test: Presubmit
Test: adb shell cmd statusbar run-gc
Change-Id: Ie0567e1a75f6c991d226b5f90f1b126139b6be44
 2021-05-10 13:13:06 -07:00
Jorim Jaggi
c81312dac7 Merge "Correctly start tracing only where we are counting frames" into sc-dev am: 5f6968d277 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14411197

Change-Id: Iecd52b9c65179d44ac3d2b0c50f71f843c3f0aef
 2021-05-10 15:54:34 +00:00
Jorim Jaggi
5f6968d277 Merge "Correctly start tracing only where we are counting frames" into sc-dev 2021-05-10 15:37:28 +00:00
menghanli
208c172515 Apply dark theme for volume key shortcut warning dialog 
Bug: 186076332
Test: Manual testing
Change-Id: I602e19af16baa466c29bdd3fde21e5b14024c26a
 2021-05-10 11:19:16 +08:00
Jeff DeCew
8f30ae77ce Merge changes I7275175e,I4422c7e7 into sc-dev am: 21e2de2d4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14420504

Change-Id: If2d3540bd2455fdb04900e446523deb2caa54eba
 2021-05-07 15:46:29 +00:00
Jeff DeCew
21e2de2d4c Merge changes I7275175e,I4422c7e7 into sc-dev 
* changes:
  Small tweaks to improve messaging/conversation appearance.
  Correct the centering of the conversation avatars when badged
 2021-05-07 15:30:34 +00:00
Rubin Xu
af37a00f81 Merge "Remove unused isProfileActivePasswordSufficientForParent()" into sc-dev am: c4ac63a881 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14467997

Change-Id: I0d001af9a966844c56ba3d5148c78752b5d6bd1a
 2021-05-07 14:04:53 +00:00
Rubin Xu
f7a6c02cc8 Remove unused isProfileActivePasswordSufficientForParent() 
Bug: 182561862
Test: builds
Change-Id: I26d18113862c64c51333f62b81db65e335ccd18c
 2021-05-07 11:22:35 +01:00
Charles Chen
71cb758286 Fix IME switch dialog crash on Dual rootDA display 
The crash is because when the IME switch dialog created window token
is removed, it should switch back to listen to ImeContainer.
However, previous CL use the wrong API findAreaForToken, which only
finds the DisplayArea.Token under mAreaForLayer list.
In this scenario, we cannot find one because ImeContainer is moved to
its sub-RootDisplayArea.

This CL updates the naming and add more javaDoc to prevent from
confusion.

Test: atest WindowContextListenerControllerTests
Test: manual - repro steps in b/186366728#comment1
fixes: 186366728

Change-Id: I50d3247b0a158e83d09be893d31802d673a60697
 2021-05-07 10:03:02 +00:00
Tiffany Nguyen
c555f1c996 Merge "Log the battery saver changed atom on initialization." 2021-05-07 04:18:53 +00:00
Jeff DeCew
61b8ed9853 Correct the centering of the conversation avatars when badged 
Fixes: 185593456
Test: visual
Change-Id: I4422c7e76cbb85f7a03bd69d53e38ef737dd80d6
 2021-05-06 10:39:50 -04:00
vichang
8ab2a20952 Merge "Copy StringPool to framework" am: ffe7986d71 am: 91a9308a30 am: f4b981eb46 am: 3a424f08d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684883

Change-Id: Ie8bdb2482daddfd725a4a5d40b0b6d7818f7ce8e
 2021-05-06 12:32:58 +00:00