Commit Graph

59892 Commits

Author SHA1 Message Date
Automerger Merge Worker
78c5cb71a9 Merge "Change text size to align with that in launcher" into rvc-dev am: a4c7cb1ee2 am: 89e1d0d6d2
Change-Id: Id8c701e97240bbd38199625d9e4689708ed5096c
2020-02-26 03:12:38 +00:00
Automerger Merge Worker
9d747430ee Fine-tune the widget of "Allow rich content in Accessibility Settings" for security. am: ab05476fc1 am: 399dcf8f6d
Change-Id: I64535027dd94cee097a863062c8c7ecd99770115
2020-02-26 03:12:14 +00:00
Automerger Merge Worker
d6cdf25c03 Fine-tune the widget of "Allow rich content in Accessibility Settings" for security. am: ab05476fc1 am: e6dfc725db
Change-Id: I625ee6e94bbc694c8318ce966ee78a144b47938e
2020-02-26 03:12:00 +00:00
Automerger Merge Worker
89e1d0d6d2 Merge "Change text size to align with that in launcher" into rvc-dev am: a4c7cb1ee2
Change-Id: Ie944bb2163d7db1e642b4f742d4fbf88563e4993
2020-02-26 03:04:06 +00:00
Automerger Merge Worker
e6dfc725db Fine-tune the widget of "Allow rich content in Accessibility Settings" for security. am: ab05476fc1
Change-Id: I644d6ae2ccebe74f3f6201e4b5595d06559d83da
2020-02-26 03:03:54 +00:00
Automerger Merge Worker
69951f1926 Merge "Change text size to align with that in launcher" into rvc-dev am: a4c7cb1ee2
Change-Id: I7dafd083d3e24610692edf1587de7f5f44c457b2
2020-02-26 03:03:17 +00:00
Automerger Merge Worker
399dcf8f6d Fine-tune the widget of "Allow rich content in Accessibility Settings" for security. am: ab05476fc1
Change-Id: I3f6687e6e8988faa04799c0dabffdcc59e74e3a0
2020-02-26 03:03:06 +00:00
Raff Tsai
a4c7cb1ee2 Merge "Change text size to align with that in launcher" into rvc-dev 2020-02-26 02:52:42 +00:00
Julia Reynolds
bc0c7a626d Stop controller from steal preference clicks
Test: atest
Fixes: 150175360
Change-Id: Ia22058df0ddbd1a274a508e2600d12aa1b67a343
2020-02-25 10:49:23 -05:00
Peter_Liang
ab05476fc1 Fine-tune the widget of "Allow rich content in Accessibility Settings" for security.
1. Remove tag checker in HtmlTextPreference.
2. Set the max height for AnimatedImagePreference.

Bug: 149516547
Test: manaul test
Change-Id: I98f49d055db9427d91a3f1ca816e94a11d29cd3d
Merged-In: I98f49d055db9427d91a3f1ca816e94a11d29cd3d
(cherry picked from commit 10bc375176)
2020-02-25 09:06:12 +00:00
Automerger Merge Worker
6a0d69c9b6 Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b am: 622e966881
Change-Id: I444bba0f7568d6d488b8559a37b6ec9f30d2d697
2020-02-25 07:59:42 +00:00
Automerger Merge Worker
7991e1fe7a Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b am: aa0e7e8d37
Change-Id: Ib8cb42e69124e79c455a78efae655f99be3921c5
2020-02-25 07:59:29 +00:00
Automerger Merge Worker
622e966881 Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b
Change-Id: I38485ff2569e2c3e679676c490c25ddb25d86145
2020-02-25 07:48:31 +00:00
Automerger Merge Worker
aa0e7e8d37 Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b
Change-Id: I491a6b9fda42d5173040000bb286c448d830aad2
2020-02-25 07:48:12 +00:00
Tim Peng
14d0d125b4 Launch output switcher with media package information
-Output switcher would include transferable devices when media is active
-Output switcher would only include system devices when no media is active
-Add test cases

Bug: 150179490
Test: make -j42 RunSettingsRoboTests
Change-Id: Ice0048d3a0b78e02ec21dd3664efc0239abbb9cb
2020-02-25 15:45:56 +08:00
Jack Yu
490eba353b Merge "Added slot index in area info broadcast" into rvc-dev 2020-02-25 07:41:37 +00:00
Raff Tsai
c4d5ccdef1 Change text size to align with that in launcher
Fixes: 150129990
Test: visual
Change-Id: I89bd2edba85a980235cf3dec2926cc7d278f7bc2
2020-02-25 11:39:46 +08:00
Automerger Merge Worker
e6c57426cd Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a
Change-Id: I1dc710279b2a6fbfeac34951121ed9d7c3a4ee0a
2020-02-24 21:48:28 +00:00
Automerger Merge Worker
2d84cdbc3a Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a
Change-Id: Idc2d504f99fdea780fcda81a221e2f57bc242e82
2020-02-24 21:36:32 +00:00
Automerger Merge Worker
840506e88a Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7
Change-Id: Ifa566bf809360db17a6932ee5ebaede2eb63e1b3
2020-02-24 21:15:28 +00:00
Xiangyu/Malcolm Chen
aaee4539c7 Merge "Catch crash in mobile network ProgressDialog" 2020-02-24 21:07:17 +00:00
Jack Yu
5a4dabcba2 Added slot index in area info broadcast
Added slot index information in the broadcast
so the receiver knows which slot to get information.

Test: Manual
Change-Id: Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7
Fix: 150126754
2020-02-24 11:54:34 -08:00
Automerger Merge Worker
50bd5698ef [automerger skipped] Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev am: cdc7fffd2c am: e987aeecde -s ours
am skip reason: Change-Id Ife215d0901bd9fc3055495b0495ba175ed0dfa26 with SHA-1 5f503b87ea is in history

Change-Id: Ie6f82b5ca7e409d9148af938fd4318ee8770d0a1
2020-02-24 17:46:58 +00:00
Automerger Merge Worker
f6ae9a4864 Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev am: cdc7fffd2c am: 5228fbbb91
Change-Id: I6a366015c4458c04ff67cfe9d610ef272f751454
2020-02-24 17:46:43 +00:00
Automerger Merge Worker
e987aeecde Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev am: cdc7fffd2c
Change-Id: I503efe54953615b70760d817cff50a438316e424
2020-02-24 17:31:43 +00:00
Automerger Merge Worker
5228fbbb91 Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev am: cdc7fffd2c
Change-Id: Ie76c3c24f331a3dc741075ab8f8a1a64dc38a163
2020-02-24 17:31:33 +00:00
TreeHugger Robot
cdc7fffd2c Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev 2020-02-24 17:22:49 +00:00
Automerger Merge Worker
fe6a2d20fa [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours am: cff703ccb9 -s ours
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 ef009cc832 is in history

Change-Id: I395fbdeb7daffbee72f4b744439e279b66a1e967
2020-02-24 15:30:51 +00:00
Automerger Merge Worker
30a21c11a3 [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours am: 35294a1532 -s ours
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history

Change-Id: I3524d32759c97cce78da380f4de3c0a768705be0
2020-02-24 15:30:42 +00:00
Automerger Merge Worker
cff703ccb9 [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history

Change-Id: I015da63fc64ac8bbd35b64c7f30eed2ee84d93b8
2020-02-24 15:18:24 +00:00
Automerger Merge Worker
35294a1532 [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history

Change-Id: Id69bc466f138dc5db47a853b01ed09507048e5b7
2020-02-24 15:18:08 +00:00
Automerger Merge Worker
f9779a0435 [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history

Change-Id: Id3bf8f851a257a95cbdb747dc7f7f93b71ae7d26
2020-02-24 15:06:03 +00:00
Automerger Merge Worker
e1763f51db Merge "Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c am: 7ed2795dc7" into rvc-d1-dev-plus-aosp 2020-02-24 11:38:43 +00:00
Automerger Merge Worker
0271fa5b83 Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c am: 7ed2795dc7
Change-Id: Ie13ee289b7b9563fb5ff78ed201fc6d03bcd34eb
2020-02-24 11:38:39 +00:00
Automerger Merge Worker
1904c8958e Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c am: 33b626bd9f
Change-Id: Ief0d08c86ba784c9dc33ba053422a1a84c58ee02
2020-02-24 11:38:33 +00:00
shafik
ea6f37e1d7 Use AppOpsManager#setUidMode instead of #setMode
Security related app-ops should be set with AppOpsManager#setUidMode
instead of AppOpsManager#setMode.

Test: manual - toggle All Files Access for a test app, reboot device and
observe in /data/system/appops.xml that the mode was for UID instead of
package
Test: ensure that the right state is reflected in the relevant Settings
activities
Bug: 146425146
Merged-In: ac8aba0c4a

Change-Id: I261953ff88bc049cf0a2f04f8caac00b8cc6f704
(cherry picked from commit ac8aba0c4a)
2020-02-24 11:28:41 +00:00
Automerger Merge Worker
7ed2795dc7 Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c
Change-Id: Id50dba13c23393c1d5424b4ebff341c910116673
2020-02-24 11:25:07 +00:00
Automerger Merge Worker
33b626bd9f Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c
Change-Id: If1f87ff6dee1fea9662589ce5c33f4726feb5eb3
2020-02-24 11:24:58 +00:00
TreeHugger Robot
520cb5851c Merge "Keep contextual card dismissal info upon deletion" into rvc-dev 2020-02-24 11:07:19 +00:00
govenliu
497c1e372a [Wi-Fi] Set Wi-Fi Privacy option at the last one position
Keep the privacy option at the last one even user choose the Static in ip settings.

Bug: 150094718
Test: manually push API and check UI order.
Change-Id: Ib44900f359d65532b6c6228c00739faffa652de2
2020-02-24 18:38:57 +08:00
Automerger Merge Worker
2ec6c2616b Merge "Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 43032a4a28" into rvc-d1-dev-plus-aosp 2020-02-24 10:21:47 +00:00
Automerger Merge Worker
3aaa1ed859 Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 43032a4a28
Change-Id: I37d0c5f7a89b898fe918bb54fea243802eb48dc1
2020-02-24 10:21:44 +00:00
Automerger Merge Worker
04f0c00637 Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 0f8726124d
Change-Id: I33fcd9e6e363c56318aff9f400dffeec6a0576c8
2020-02-24 10:21:41 +00:00
Automerger Merge Worker
3e09f3eecb [automerger skipped] Bluetooth device slice improvement am: 05f5b8e7c4 am: a1dad7246d -s ours
am skip reason: Change-Id I47e9c47b2ab0adacdbdbde34522d7c0172adda75 with SHA-1 05f5b8e7c4 is in history

Change-Id: I501751f9a7c645da090086ebc94341fd0ea0a821
2020-02-24 10:21:34 +00:00
Automerger Merge Worker
5ad696881f Bluetooth device slice improvement am: 05f5b8e7c4 am: 545c9009b0
Change-Id: Ic0931466231b2068f5eb495204cf78ba88eb72bb
2020-02-24 10:21:28 +00:00
Automerger Merge Worker
43032a4a28 Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b
Change-Id: Ie079b5f6cb03b0d9dad956def4f1c109bddecb10
2020-02-24 10:08:02 +00:00
Automerger Merge Worker
0f8726124d Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b
Change-Id: I231979a8624ea9c06d896baeeb112a8add86e5cb
2020-02-24 10:08:01 +00:00
Automerger Merge Worker
a1dad7246d Bluetooth device slice improvement am: 05f5b8e7c4
Change-Id: Ie82b6e8aacbc92b3e664f488d960b64774898738
2020-02-24 10:07:52 +00:00
Automerger Merge Worker
545c9009b0 Bluetooth device slice improvement am: 05f5b8e7c4
Change-Id: I50406bfcc898110679d99931293553c82eebe5fb
2020-02-24 10:07:35 +00:00
TreeHugger Robot
bdf85c224b Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev 2020-02-24 10:03:53 +00:00