Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
542,466 Commits 3 Branches 0 Tags
56936beddd997d381a4e893c437d396caabbe02e
Commit Graph

542466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alison Cichowlas
8360b3c8d5 Merge "Refresh both lists and pinning preferences on change." into rvc-dev am: 582aeba50c am: b841426ac5 am: f5c007e092 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947583

Change-Id: If3c3ad5ae20030477597fda13455adbd8a32d19b
 2020-06-22 13:45:46 +00:00
Alison Cichowlas
e1870187f6 Merge "Refresh both lists and pinning preferences on change." into rvc-dev am: 582aeba50c am: 45b4885a90 am: 0dfb5908be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947583

Change-Id: I72155419834be77d809a1d9c330818210efee57e
 2020-06-22 13:45:44 +00:00
Alison Cichowlas
a41fbbc593 Merge "Refresh both lists and pinning preferences on change." into rvc-dev am: 582aeba50c am: 45b4885a90 am: 4ab48187ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947583

Change-Id: I00f41ab6b0ad376cc52fde535070c3d0ba4480ed
 2020-06-22 13:45:23 +00:00
Ken Chen
125db20ee5 Update DnsManagerTest for AIDL interface change 
Check one more parameter enforceDnsUid in ResolverOptionsParcel in
DnsManagerTest.

Bug: 159587277
Test: atest
com.android.server.connectivity.DnsManagerTest#testSendDnsConfiguration

Change-Id: Ic53f42b968626294c851dac252a70769846ba427
 2020-06-22 21:44:07 +08:00
TreeHugger Robot
1a3468740a Merge "Finish fixed rotation while the task has done transition" into rvc-dev 2020-06-22 13:42:41 +00:00
TreeHugger Robot
bda3156926 Merge "Remove fixed-rotation-transform setting" into rvc-dev 2020-06-22 13:42:27 +00:00
Matt Pietal
a2e2085cb3 Controls UI - Use custom icon for favoriting 
Apply custom icons, if any, during add controls. Edit controls the
issue still exists but will handle separately.

Fixes: 159562131
Test: manual, mock app use TYPE_FAN
Change-Id: Ib75756a8b6fa6e78a678fc8d6ceb3e4cdaafc142
 2020-06-22 09:36:48 -04:00
Fabian Kozynski
8a9516d762 Make SeekBar 1dp tall when disabled 
Test: manual
Fixes: 159369236

Change-Id: If28b65b66b78595d60a67e4f4c8deadf0393c1a0
 2020-06-22 09:34:02 -04:00
Alison Cichowlas
0dfb5908be Merge "Refresh both lists and pinning preferences on change." into rvc-dev am: 582aeba50c am: 45b4885a90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947583

Change-Id: I5c7175f1130a9f0d09c985cbc3b47d4b27912794
 2020-06-22 13:30:00 +00:00
Alison Cichowlas
f5c007e092 Merge "Refresh both lists and pinning preferences on change." into rvc-dev am: 582aeba50c am: b841426ac5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947583

Change-Id: I7a274e4cd4e355b5308aa287870d11e8d9d610d8
 2020-06-22 13:29:59 +00:00
Alison Cichowlas
4ab48187ce Merge "Refresh both lists and pinning preferences on change." into rvc-dev am: 582aeba50c am: 45b4885a90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947583

Change-Id: Idb3549c950ca5ba9dc432d5fd557ef64f1ec42e8
 2020-06-22 13:29:43 +00:00
Marvin Ramin
bcab7d088c CEC: Run all actions after TV allocates address 
Start all pending actions after TV allocates logical address. This
ensures DeviceDiscoveryAction is able to run. HdmiControlService
starting its power state in STANDBY prevents all Actions from being run.

Playback and Audio devices perform the same logic upon logical address
allocation.

Bug: 159104739
Test: atest HdmiCecLocalDeviceTvTest
Change-Id: I9a79ee02f5065abbedded26be385115279797977
 2020-06-22 13:28:49 +00:00
Alison Cichowlas
b841426ac5 Merge "Refresh both lists and pinning preferences on change." into rvc-dev am: 582aeba50c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947583

Change-Id: Ia754efaef47403e43e4bac27335c80ecf1b91974
 2020-06-22 13:15:23 +00:00
Alison Cichowlas
45b4885a90 Merge "Refresh both lists and pinning preferences on change." into rvc-dev am: 582aeba50c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11947583

Change-Id: Ifd9ce364e8117b1f4be7cdfd569b0fb34e7bb87b
 2020-06-22 13:15:10 +00:00
Matt Pietal
d0ab4bec4f Controls UI - Fix icon tint for custom icons 
ImageView has state that cannot be reversed regarding tintList, even
if you set it to null. Therefore only clear the tint if we absolutely
need to in order to avoid an override.

Bug: 159559045
Test: manual
Change-Id: Id2223136a76f7e7e3118d95f1ad126f768199d3f
 2020-06-22 09:06:41 -04:00
Alison Cichowlas
582aeba50c Merge "Refresh both lists and pinning preferences on change." into rvc-dev 2020-06-22 12:58:57 +00:00
arangelov
c00bd0c91f Show disclosure for work profile on org owned device in keyguard 
Fixes: 149073538
Test: manually provisioned a work profile on org owned device appears
Test: removed a work profile on org owned device to see disclosure disappears
Test: manually set up device as DO to see disclosure appears
Test: manually created a regular non-organization owned work profile to
see disclosure does not exist
Test: atest KeyguardIndicationControllerTest

Change-Id: I1df774cb4389b64779e7e329c3a1c7ff0b68c3ee
 2020-06-22 12:28:17 +01:00
TreeHugger Robot
c29497cb1f Merge "Fix "Allow/Deny" popup window no respond when enable pointer location" into rvc-dev am: ace942e57b am: 4ed1d04b68 am: 36ab28afcb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846910

Change-Id: If385caad6466f1d79b721bc7c6537c45f5acebbb
 2020-06-22 10:48:12 +00:00
Automerger Merge Worker
ef1ecf62d5 Merge changes from topic "am-cb21d9627e334118b18655797a8d36c3" into rvc-d1-dev-plus-aosp am: 029f8edd2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931079

Change-Id: I8f93131a3d268eb8df587d004d91e44c0febfc03
 2020-06-22 10:47:42 +00:00
Automerger Merge Worker
86da00e955 Merge "Merge "Fix "Allow/Deny" popup window no respond when enable pointer location" into rvc-dev am: ace942e57b am: 4ed1d04b68 am: ae5393e775" into rvc-qpr-dev-plus-aosp 2020-06-22 10:47:14 +00:00
TreeHugger Robot
0aed0587de Merge "Fix "Allow/Deny" popup window no respond when enable pointer location" into rvc-dev am: ace942e57b am: 9a3eba50a2 am: f77508ffe6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846910

Change-Id: I719bcbebf9ecd07c695583b56c589903b7b3a2cd
 2020-06-22 10:46:58 +00:00
TreeHugger Robot
8d3098750c Merge "Fix "Allow/Deny" popup window no respond when enable pointer location" into rvc-dev am: ace942e57b am: 4ed1d04b68 am: ae5393e775 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846910

Change-Id: I191474093dd46270e5376403ffed897958f42b13
 2020-06-22 10:46:56 +00:00
Galia Peycheva
6013c32f2f Merge "Make config_assistantOnTopOfDream a TestApi" into rvc-dev am: 60d5549eda am: ff8d81faee am: 5dee7f50a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931079

Change-Id: Id6061fd90a50028f70b1745756bd1009c7bdd919
 2020-06-22 10:46:38 +00:00
Galia Peycheva
25dd51e6cb Merge "Close assistant activities on closeSystemDialogs" into rvc-dev am: 9e639bb382 am: 833a388c52 am: 35e63103bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837612

Change-Id: I288df610062e394a9b1db4b8f9c22177933d274f
 2020-06-22 10:46:32 +00:00
Galia Peycheva
07ad38c1ca Merge "Make config_assistantOnTopOfDream a TestApi" into rvc-dev am: 60d5549eda am: 991261951a am: 5b255ed02a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931079

Change-Id: I23208a971b1423d4a61ec70e935b0df6498a62ba
 2020-06-22 10:46:18 +00:00
Galia Peycheva
d7c4151d61 Merge "Close assistant activities on closeSystemDialogs" into rvc-dev am: 9e639bb382 am: 1b85a98793 am: f8b6880e40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837612

Change-Id: I6cc699bcd5339cc9dfc3bd69684262a2e77dacf7
 2020-06-22 10:46:10 +00:00
TreeHugger Robot
36ab28afcb Merge "Fix "Allow/Deny" popup window no respond when enable pointer location" into rvc-dev am: ace942e57b am: 4ed1d04b68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846910

Change-Id: I9a9dff7a1f72ecbdc6af4aa55982d70a01912ae7
 2020-06-22 10:34:05 +00:00
Automerger Merge Worker
029f8edd2e Merge changes from topic "am-cb21d9627e334118b18655797a8d36c3" into rvc-d1-dev-plus-aosp 
* changes:
  Merge "Make config_assistantOnTopOfDream a TestApi" into rvc-dev am: 60d5549eda am: ff8d81faee
  Merge "Close assistant activities on closeSystemDialogs" into rvc-dev am: 9e639bb382 am: 833a388c52
 2020-06-22 10:33:15 +00:00
TreeHugger Robot
ae5393e775 Merge "Fix "Allow/Deny" popup window no respond when enable pointer location" into rvc-dev am: ace942e57b am: 4ed1d04b68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846910

Change-Id: Ic03643b9f86f0d42483b09e302502a9ff1b266b3
 2020-06-22 10:33:11 +00:00
TreeHugger Robot
f77508ffe6 Merge "Fix "Allow/Deny" popup window no respond when enable pointer location" into rvc-dev am: ace942e57b am: 9a3eba50a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846910

Change-Id: I96324744e65c21bfd19b74107157696661165392
 2020-06-22 10:33:00 +00:00
Galia Peycheva
5dee7f50a8 Merge "Make config_assistantOnTopOfDream a TestApi" into rvc-dev am: 60d5549eda am: ff8d81faee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931079

Change-Id: Iba1e811e966a7ea9230cfd6f49d56d661d9dae9a
 2020-06-22 10:32:52 +00:00
Galia Peycheva
35e63103bf Merge "Close assistant activities on closeSystemDialogs" into rvc-dev am: 9e639bb382 am: 833a388c52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837612

Change-Id: Ie133efdf935090e8c15a2eaa56bd7bc56111d8a0
 2020-06-22 10:32:44 +00:00
Galia Peycheva
5b255ed02a Merge "Make config_assistantOnTopOfDream a TestApi" into rvc-dev am: 60d5549eda am: 991261951a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931079

Change-Id: I40d64b4064595aca2a77a5abc2772cbb3233ab60
 2020-06-22 10:32:41 +00:00
Galia Peycheva
8f9134c4c3 Merge "Make config_assistantOnTopOfDream a TestApi" into rvc-dev am: 60d5549eda am: ff8d81faee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931079

Change-Id: Ib159b2dba25c32a6e252b0a56db1deb2c723d04b
 2020-06-22 10:32:35 +00:00
Galia Peycheva
f8b6880e40 Merge "Close assistant activities on closeSystemDialogs" into rvc-dev am: 9e639bb382 am: 1b85a98793 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837612

Change-Id: I38bd4199e4654b8ad58db320cca920e3b53a6d05
 2020-06-22 10:32:34 +00:00
Galia Peycheva
8388a28c39 Merge "Close assistant activities on closeSystemDialogs" into rvc-dev am: 9e639bb382 am: 833a388c52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837612

Change-Id: I3b7dd3366e918e352469571ad2b81015c0916126
 2020-06-22 10:32:24 +00:00
TreeHugger Robot
9a3eba50a2 Merge "Fix "Allow/Deny" popup window no respond when enable pointer location" into rvc-dev am: ace942e57b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846910

Change-Id: I73721271274ca197fa3d17869ca9edfbccf59f5e
 2020-06-22 10:13:53 +00:00
TreeHugger Robot
4ed1d04b68 Merge "Fix "Allow/Deny" popup window no respond when enable pointer location" into rvc-dev am: ace942e57b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846910

Change-Id: I8a5cb088d618a226495a0c0758734bbe427e35db
 2020-06-22 10:13:51 +00:00
Galia Peycheva
991261951a Merge "Make config_assistantOnTopOfDream a TestApi" into rvc-dev am: 60d5549eda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931079

Change-Id: Ia2bcaf8dad86cc4f35211ba88e922a14af4c3ccb
 2020-06-22 10:13:24 +00:00
Galia Peycheva
1b85a98793 Merge "Close assistant activities on closeSystemDialogs" into rvc-dev am: 9e639bb382 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837612

Change-Id: I939f50a91c721cb83357d0a396440c0bda7d1573
 2020-06-22 10:13:19 +00:00
Galia Peycheva
ff8d81faee Merge "Make config_assistantOnTopOfDream a TestApi" into rvc-dev am: 60d5549eda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931079

Change-Id: I653bb2626afac50265e75cc9c0bb22ad27069698
 2020-06-22 10:13:18 +00:00
Galia Peycheva
833a388c52 Merge "Close assistant activities on closeSystemDialogs" into rvc-dev am: 9e639bb382 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837612

Change-Id: I7fef13bf3ef6240141748375f55080f977391173
 2020-06-22 10:13:16 +00:00
TreeHugger Robot
ace942e57b Merge "Fix "Allow/Deny" popup window no respond when enable pointer location" into rvc-dev 2020-06-22 10:12:10 +00:00
Galia Peycheva
60d5549eda Merge "Make config_assistantOnTopOfDream a TestApi" into rvc-dev 2020-06-22 09:57:51 +00:00
Galia Peycheva
9e639bb382 Merge "Close assistant activities on closeSystemDialogs" into rvc-dev 2020-06-22 09:57:51 +00:00
Automerger Merge Worker
9f51ef5eb4 Merge "Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev am: 438073fcfe am: d34fdc53da" into rvc-d1-dev-plus-aosp am: 570633d976 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881938

Change-Id: Id88892e1e8605b59e7f78cf8b5ea9915ffdb090d
 2020-06-22 09:43:27 +00:00
Automerger Merge Worker
d881d890c4 Merge "Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev am: 438073fcfe am: d34fdc53da am: c15659d08c" into rvc-qpr-dev-plus-aosp 2020-06-22 09:43:20 +00:00
Lorenzo Colitti
fe6936dc7c Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev am: 438073fcfe am: d34fdc53da am: c15659d08c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881938

Change-Id: I3173d9946fcdb174cd4f15682c6d9247353cf6a1
 2020-06-22 09:43:13 +00:00
Lorenzo Colitti
effac8b57e Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev am: 438073fcfe am: 02d6e628a1 am: c76202a044 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881938

Change-Id: I6832c3551241d67876917916bf96944bda6e9dab
 2020-06-22 09:43:11 +00:00
Automerger Merge Worker
570633d976 Merge "Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev am: 438073fcfe am: d34fdc53da" into rvc-d1-dev-plus-aosp 2020-06-22 09:31:03 +00:00