Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
647,192 Commits 3 Branches 0 Tags
bea8533c28a483a804e514adcebb6ea5cf3daa49
Commit Graph

647192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
bea8533c28 Merge "[automerger skipped] Merge "Convert VcnNetworkProvider to use NetworkOffers" am: e98c98156c am: 65995498c4 -s ours" into sc-dev-plus-aosp 2021-06-16 20:43:06 +00:00
TreeHugger Robot
f2522e992b Merge "Exempt some callers from min-window restrictions" into sc-dev am: 916a356f71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14988270

Change-Id: Ie24ba2b054483ab96b7f5e1f3dc1c95dc1f7ebec
 2021-06-16 20:42:57 +00:00
Treehugger Robot
41613e0cf0 [automerger skipped] Merge "Convert VcnNetworkProvider to use NetworkOffers" am: e98c98156c am: 65995498c4 -s ours 
am skip reason: Merged-In I88c69c0be9f6fd81839fb1595ed00341001694a5 with SHA-1 9dfb804a4e is already in history

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

Change-Id: I215400472370bab22bca10e4260d8c3d3058fe23
 2021-06-16 20:42:56 +00:00
Caitlin Cassidy
1702769b29 Merge "[Status Bar] Fix NPE in #dumpBarTransitions." into sc-dev am: ae8d7cff27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14997041

Change-Id: Ifab95650a37f63ac9058ed59b2c252bdeb2e4951
 2021-06-16 20:42:01 +00:00
TreeHugger Robot
916a356f71 Merge "Exempt some callers from min-window restrictions" into sc-dev 2021-06-16 20:30:44 +00:00
Caitlin Cassidy
ae8d7cff27 Merge "[Status Bar] Fix NPE in #dumpBarTransitions." into sc-dev 2021-06-16 20:21:27 +00:00
Treehugger Robot
65995498c4 Merge "Convert VcnNetworkProvider to use NetworkOffers" am: e98c98156c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673238

Change-Id: I8a6ea3d190caf2717b200227e7b16d9fde3f78f8
 2021-06-16 20:08:06 +00:00
TreeHugger Robot
d22103d92a Merge "[DO NOT MERGE] Update power menu info messsage" into sc-dev am: 100b0929b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14939748

Change-Id: Id924e2cad08f0fe97f1280db1e8fd05142dab65d
 2021-06-16 20:02:33 +00:00
Beth Thibodeau
eea3ab74c8 [DO NOT MERGE] Update power menu info messsage am: be3e2e9228 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14939748

Change-Id: I9269e255bd375e5f860cbf0bd55181cd2ced712a
 2021-06-16 20:02:30 +00:00
TreeHugger Robot
100b0929b7 Merge "[DO NOT MERGE] Update power menu info messsage" into sc-dev 2021-06-16 19:57:59 +00:00
TreeHugger Robot
12e857c8b8 Merge "Don't show estimate with center notch" into sc-dev am: 7bb24f6378 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14998945

Change-Id: I99d01d1c01453f8fe807d3be8e1a2a6e4fa922e0
 2021-06-16 19:49:59 +00:00
Matt Casey
7c84f87793 Merge "Updated animation for long screenshot crop entrance." into sc-dev am: f12e42de4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14985541

Change-Id: Ib710d1897622d1b992c649174f473fc3d18c222c
 2021-06-16 19:49:43 +00:00
Treehugger Robot
e98c98156c Merge "Convert VcnNetworkProvider to use NetworkOffers" 2021-06-16 19:48:58 +00:00
Matt Casey
72ea242c9e Merge "Fix LongScreenshotActivity rotation" into sc-dev am: 11aac84721 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14999594

Change-Id: I8dc4635ae45c0b7fdac98d7208f68383718a51b1
 2021-06-16 19:48:52 +00:00
TreeHugger Robot
7bb24f6378 Merge "Don't show estimate with center notch" into sc-dev 2021-06-16 19:46:45 +00:00
Matt Casey
f12e42de4e Merge "Updated animation for long screenshot crop entrance." into sc-dev 2021-06-16 19:32:46 +00:00
Matt Casey
11aac84721 Merge "Fix LongScreenshotActivity rotation" into sc-dev 2021-06-16 19:32:14 +00:00
TreeHugger Robot
b825d204dc Merge "Log FGS ENTER event synchronously." into sc-dev am: 9515d87dbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14985631

Change-Id: If5e5472a2bebd949fd484faf1c1129ae995ad4ed
 2021-06-16 19:27:31 +00:00
Mady Mellor
3ef476bb28 Merge "ignore a flaky test" into sc-dev am: 36810e7002 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15000871

Change-Id: I0b99608cf5c02aa9ba2eafa2393f920202c9784d
 2021-06-16 19:27:16 +00:00
Ryan Prichard
c47e6abc0c Merge "Stop exporting symbols from app_process" into sc-dev am: 3ea5e5d03e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14977103

Change-Id: I8ed85e1a9d434cbcd4224097c5d59b0f8228f3ee
 2021-06-16 19:26:45 +00:00
Beth Thibodeau
7dc1b41fc8 Merge "Fix media transitions when inactive" into sc-dev am: fa16fdf098 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946933

Change-Id: I5c8a7a357183aaceccaafe08a19b5cc0c4c9ac05
 2021-06-16 19:26:22 +00:00
Stanislav Zholnin
cffcf462e6 Merge "Add support of AttributionIds and AttributionChains to Discrete registry" into sc-dev am: d5b63b58b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14936972

Change-Id: I7c4dc0d7bc5f84c54bd6dff28524604e79254fc3
 2021-06-16 19:26:08 +00:00
Evan Chen
386a890ab9 Merge "Fix mCachedAssociations for multiple users" into sc-dev am: 10778dd4d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972608

Change-Id: Ieba25bbfbb185e3613b69c6b238aabcbf43609cf
 2021-06-16 19:25:36 +00:00
TreeHugger Robot
9515d87dbb Merge "Log FGS ENTER event synchronously." into sc-dev 2021-06-16 19:18:42 +00:00
Mady Mellor
36810e7002 Merge "ignore a flaky test" into sc-dev 2021-06-16 19:16:48 +00:00
Ryan Prichard
3ea5e5d03e Merge "Stop exporting symbols from app_process" into sc-dev 2021-06-16 19:08:47 +00:00
Beth Thibodeau
fa16fdf098 Merge "Fix media transitions when inactive" into sc-dev 2021-06-16 19:08:21 +00:00
Stanislav Zholnin
d5b63b58b5 Merge "Add support of AttributionIds and AttributionChains to Discrete registry" into sc-dev 2021-06-16 18:44:18 +00:00
Evan Chen
10778dd4d0 Merge "Fix mCachedAssociations for multiple users" into sc-dev 2021-06-16 18:36:36 +00:00
Josh Tsuji
b493035a69 Merge "Allow forcing status bar state changes and do so during a cancelled screen off." into sc-dev am: 87dc276313 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14968078

Change-Id: I02acbed42891c8c9753cc7043c301e421bb1dda0
 2021-06-16 17:59:23 +00:00
Josh Tsuji
87dc276313 Merge "Allow forcing status bar state changes and do so during a cancelled screen off." into sc-dev 2021-06-16 17:46:04 +00:00
Mady Mellor
179fce0fb5 ignore a flaky test 
Test: treehugger
Bug: 191264972
Change-Id: I450a85406dfd4e8e6fecf878affa2c0440b8c36b
 2021-06-16 10:10:03 -07:00
TreeHugger Robot
8b164133d0 Merge changes from topic "cuj-sysui-launches" into sc-dev am: b538b60ea6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14965045

Change-Id: I26803319f43b8d88ac4511e65f622871f80dc431
 2021-06-16 16:49:58 +00:00
Antonio Kantek
e3c75a1ad5 Merge "Adding com.android.car.cluster.home.xml" into sc-dev am: 56330ddf59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14910481

Change-Id: I7a7156a1523b9a3ac15184d34265858ea8c3e6ae
 2021-06-16 16:45:59 +00:00
TreeHugger Robot
b538b60ea6 Merge changes from topic "cuj-sysui-launches" into sc-dev 
* changes:
  Instrument SysUI app launches
  Add SysUI app launches CUJ to InteractionJankMonitor
 2021-06-16 16:45:48 +00:00
Antonio Kantek
56330ddf59 Merge "Adding com.android.car.cluster.home.xml" into sc-dev 2021-06-16 16:31:31 +00:00
Josh Tsuji
b34e3b0cb7 Allow forcing status bar state changes and do so during a cancelled screen off. 
During screen off, we show the AOD UI without fully switching to the KEYGUARD state. When screen off is cancelled, we ask all components to reset to the SHADE state, which should also reset the UI components we changed to show AOD. However, since the StatusBarState was already SHADE, this is ignored.

This adds a force flag, which we use when cancelling screen off to make sure that all UI components are reset to the SHADE state regardless.

Test: cancel screen off, pull down the shade
Fixes: 190986023
Change-Id: I79baeb71ac5d1ed45602ac55cdca996b3bed0ac3
 2021-06-16 12:00:43 -04:00
Beth Thibodeau
41e2968373 Merge "[DO NOT MERGE] Open QS when swiping from status bar in power menu" into sc-dev am: 6962b10349 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14925347

Change-Id: I3c4afa11568150dcefd642ff2ff47987bed20e2a
 2021-06-16 15:48:31 +00:00
Beth Thibodeau
328669afe0 [DO NOT MERGE] Open QS when swiping from status bar in power menu am: 66bf998085 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14925347

Change-Id: I8a966bec76d693ac003866bfdf6e8c371f642524
 2021-06-16 15:48:27 +00:00
TreeHugger Robot
6f5a8d5c36 Merge "Update system status chip animation length to 1.5s" into sc-dev am: 1090459a0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14985634

Change-Id: I716ecf539772a98b652908d739ca6f549733bc3b
 2021-06-16 15:47:47 +00:00
Soonil Nagarkar
dcbca39607 Merge "Fix bugs in LocationManagerService and AppOpsPolicy" into sc-dev am: a244ceeb2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14924835

Change-Id: I06e1291e905d873f19da6d06522df93c9b868835
 2021-06-16 15:46:36 +00:00
Beth Thibodeau
6962b10349 Merge "[DO NOT MERGE] Open QS when swiping from status bar in power menu" into sc-dev 2021-06-16 15:42:18 +00:00
TreeHugger Robot
1090459a0e Merge "Update system status chip animation length to 1.5s" into sc-dev 2021-06-16 15:39:08 +00:00
Soonil Nagarkar
a244ceeb2e Merge "Fix bugs in LocationManagerService and AppOpsPolicy" into sc-dev 2021-06-16 15:37:32 +00:00
Beth Thibodeau
0cfc11f78d Fix media transitions when inactive 
When there is no active media, the carousel should remain at the bottom
of QS. Also ensure that the carousel transitions properly when the media
changes state from active to inactive or vice versa

Fixes: 184535146
Test: visual

Change-Id: I9bcdb76b54c6303785a5783d84e876c162301b14
 2021-06-16 11:25:13 -04:00
Caitlin Cassidy
2f583ee73a [Status Bar] Fix NPE in #dumpBarTransitions. 
Test: atest
Fixes: 190927484
Change-Id: I7b0962b1240fde81c256f93a9aec479205f47101
 2021-06-16 15:20:21 +00:00
Issei Suzuki
387cc25cf2 Merge "Persist Theme name instead of ID for ShortcutInfo" into sc-dev am: 41e7f367ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14783472

Change-Id: Ib9cbb8c121483602fd6a1d28f0ab63047a36a2a3
 2021-06-16 15:17:24 +00:00
Fabian Kozynski
5d22bdc35f Don't show estimate with center notch 
On devices with center notch, don't show the remaining battery estimate,
but default to percentage.

Test: manual
Fixes: 185144346
Change-Id: I85caa33c66c3185a9bb1612b5f7d0237fe57842a
 2021-06-16 11:05:38 -04:00
Issei Suzuki
41e7f367ed Merge "Persist Theme name instead of ID for ShortcutInfo" into sc-dev 2021-06-16 14:57:36 +00:00
TreeHugger Robot
4c4859a8bc Merge "Don't promote the animation on Task's parent when clearing task" into sc-dev am: 04350c57de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14963617

Change-Id: I8dee5ab25c4f67d0d408bb17b6a50aafc62a47d4
 2021-06-16 13:43:36 +00:00