Yi-Ling Chuang
ead58c3d6d
Merge "Add null check before setting the visibility of swipe background" into qt-dev am: 1079d2833a
...
am: 9a8717c9c0
2019-05-08 10:48:29 -07:00
Alex Salo
83a63abd2d
Re-enable the test
...
Update the test to handle new API and simplify the logic in the
controller.
Bug: 130897305
Test: make RunSettingsRoboTests -j64
Change-Id: I0c46ff22d4a3bf913add753f85a24af9aeee0a33
2019-05-08 17:48:12 +00:00
Fan Zhang
25e5a98734
Merge "Add flag to disable part of event_logging in Settings." into qt-dev
...
am: c949d12a12
2019-05-08 10:40:03 -07:00
Edgar Wang
ed2e1e9a0f
Merge "Show admin dialog when preference is disabled by Device Admin" into qt-dev
...
am: e3278d8240
2019-05-08 10:32:06 -07:00
Lei Yu
9bc3273489
Update datausage for DataUsagePreferenceController
...
Data usage number was wrong because we didn't set correct
subId, this CL fixes this issue.
Bug: 132113657
Test: RunSettingsRoboTests
Change-Id: If7c9cf2f4709d9a8e5f9a154c02de9484800d6d5
2019-05-08 10:25:10 -07:00
JeiFeng Lee
d851d36b8c
Merge "[PATCH] Buttons in storage settings" into qt-dev
...
am: d88ca05b2e
2019-05-08 10:16:42 -07:00
TreeHugger Robot
c949d12a12
Merge "Add flag to disable part of event_logging in Settings." into qt-dev
2019-05-08 17:15:03 +00:00
Yi-Ling Chuang
9a8717c9c0
Merge "Add null check before setting the visibility of swipe background" into qt-dev
...
am: 1079d2833a
2019-05-08 10:12:51 -07:00
TreeHugger Robot
e3278d8240
Merge "Show admin dialog when preference is disabled by Device Admin" into qt-dev
2019-05-08 17:03:42 +00:00
TreeHugger Robot
d88ca05b2e
Merge "[PATCH] Buttons in storage settings" into qt-dev
2019-05-08 16:35:12 +00:00
TreeHugger Robot
1079d2833a
Merge "Add null check before setting the visibility of swipe background" into qt-dev
2019-05-08 16:34:32 +00:00
Aran Ink
6e858db304
Merge "Create Settings preference for Global Actions Panel." into qt-dev am: 70313a4600
...
am: 6bf5b847f6
2019-05-08 07:40:11 -07:00
Aran Ink
6bf5b847f6
Merge "Create Settings preference for Global Actions Panel." into qt-dev
...
am: 70313a4600
2019-05-08 07:35:13 -07:00
Annie Meng
6e2a67f538
Change inactive backup UI to show "Disabled by admin"
...
Change text displayed when backup is inactive for a user from "Backup
service isn't active" to "Disabled by admin".
Bug: 131296047
Test: Make backup inactive, check UI (primary and work profile)
Change-Id: I087755fa1e79564d320fe1fa62de92e3dc40a343
2019-05-08 15:18:10 +01:00
Aran Ink
70313a4600
Merge "Create Settings preference for Global Actions Panel." into qt-dev
2019-05-08 14:16:07 +00:00
TreeHugger Robot
5894aa6948
Merge "Misc change about ResetNetworkConfirm"
2019-05-08 08:10:16 +00:00
Christopher Dombroski
acc87f1d3f
[automerger skipped] Treat mode_default as denied for install_unknown_apps am: 4b78bcd5cd am: aebc5bbc94 am: 1d163af113 am: 6b34347b4c -s ours am: 484d5f914b -s ours
...
am: d4e19bf92ed3864daebd
2019-05-07 23:40:39 -07:00
Winson Chung
14a487f821
Merge "Disable settings preferences when the packages do not exist" into qt-dev am: 46b356d37d
...
am: 0936f8f942
2019-05-07 23:24:20 -07:00
Christopher Dombroski
d4e19bf92e
[automerger skipped] Treat mode_default as denied for install_unknown_apps am: 4b78bcd5cd am: aebc5bbc94 am: 1d163af113 am: 6b34347b4c -s ours
...
am: 484d5f914bd3864daebd
2019-05-07 22:56:47 -07:00
Christopher Dombroski
484d5f914b
[automerger skipped] Treat mode_default as denied for install_unknown_apps am: 4b78bcd5cd am: aebc5bbc94 am: 1d163af113
...
am: 6b34347b4cd3864daebd
2019-05-07 22:00:45 -07:00
Winson Chung
0936f8f942
Merge "Disable settings preferences when the packages do not exist" into qt-dev
...
am: 46b356d37d
2019-05-07 21:29:28 -07:00
Fan Zhang
622eb0e021
Merge "Add an interface that returns time spent text for app." into qt-dev am: 6e8c403360
...
am: 83ff47b4d1
2019-05-07 21:27:37 -07:00
Christopher Dombroski
6b34347b4c
Treat mode_default as denied for install_unknown_apps am: 4b78bcd5cd am: aebc5bbc94
...
am: 1d163af113
2019-05-07 21:15:40 -07:00
Yi-Ling Chuang
0f75eb550e
Add null check before setting the visibility of swipe background
...
Some contextual cards does not allow card dismissal, so they won't have
swipe background declared in the layout file. Add null check to prevent
from NPE.
Fixes: 132209310
Test: robotests & launch Settings
Change-Id: I31f897f445c4901d007c8187fe69aea416b915d1
2019-05-08 12:04:36 +08:00
Winson Chung
46b356d37d
Merge "Disable settings preferences when the packages do not exist" into qt-dev
2019-05-08 03:47:09 +00:00
Arc Wang
1d2527061a
Fix Wi-Fi QR code scanner height at 360dp
...
To avoid error message cut on small screen devices
Bug: 131628795
Test: manual
Change-Id: I33fa55da22823064608739bed33cdd287bffa0b8
2019-05-08 11:43:22 +08:00
Christopher Dombroski
1d163af113
Treat mode_default as denied for install_unknown_apps am: 4b78bcd5cd
...
am: aebc5bbc94
2019-05-07 20:20:44 -07:00
Christopher Dombroski
aebc5bbc94
Treat mode_default as denied for install_unknown_apps
...
am: 4b78bcd5cd
2019-05-07 19:14:43 -07:00
Arc Wang
10371fd3a5
Add margin 24dp to the error message of Wi-Fi QR code scanner
...
Bug: 131628073
Test: manual
Change-Id: I8eaf461efbc8e3c44952d92b151ca621c4640bc1
2019-05-08 09:53:15 +08:00
Fan Zhang
83ff47b4d1
Merge "Add an interface that returns time spent text for app." into qt-dev
...
am: 6e8c403360
2019-05-07 18:22:13 -07:00
TreeHugger Robot
6e8c403360
Merge "Add an interface that returns time spent text for app." into qt-dev
2019-05-08 00:11:32 +00:00
Antony Sargent
4bb253358b
Fix two problems related to data connectivity in the multi-SIM header
...
When you have multiple active SIMs, the Network & internet page has a
header showing entries for each one, with summary text indicating which
one is used for data (and whether it is just set as the default, or
actively using data). We were not properly setting this text when either
data wasn't being used, eg when connected to wifi, or mobile data was
disabled for this SIM. This CL fixes both these problems by adding new
helper classes to listen for relevant events.
Test: make RunSettingsRoboTests
Fixes: 124394250
Fixes: 128857712
Change-Id: I34f2679752fa41a50247dd0b12581cbfd77a34f6
2019-05-07 16:10:52 -07:00
joshmccloskey
ac653b9838
Updated Face Enroll Introduction
...
Test: Builds.
Bug: 131774204
Change-Id: Ibccd54185b9d8ffbfd2678be1c8680ffb1699425
2019-05-07 15:28:14 -07:00
Jonathan Scott
687b18067c
[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController.
...
Bug: 127605586
Test: Manual
Change-Id: Id85632b5e6975fc5f92d6e8126a6603a07f097e1
2019-05-07 15:28:05 -07:00
Daniel Solomon
8a38791509
Merge "Hide display white balance setting depending on accessibility" into qt-dev am: 11b68bc420
...
am: b907794aa3
2019-05-07 15:17:04 -07:00
Fan Zhang
31486b9195
Merge "Remove animator on app list." into qt-dev am: 576cb8b0df
...
am: 73d79ef7a1
2019-05-07 14:59:18 -07:00
Brad Ebinger
5caefbff3f
Resolve the SIM call manager per subId
...
The SIM call manager used to be resolved based
on what the default voice subscription ID was.
This caused settings to be displayed for the
incorrect subscription. A new API has been added
that allows settings to query the SIM call manager
per subId.
Test: manual, unit testing
Bug: 131627085
Change-Id: I7699508429f7df7a138c24c4c7a6e9f1148b84da
2019-05-07 21:45:05 +00:00
Daniel Solomon
b907794aa3
Merge "Hide display white balance setting depending on accessibility" into qt-dev
...
am: 11b68bc420
2019-05-07 14:36:31 -07:00
Linda Tseng
92a40b644a
Merge "Update SliceViewStyle background color" into qt-dev am: e3cc773f0d
...
am: a73b95041f
2019-05-07 14:24:23 -07:00
Fan Zhang
547c975bcc
Add flag to disable part of event_logging in Settings.
...
- Fork SettingsEventLogWriter from EventLogWritter. This is identical to
the base class except it overrides some logging method with a flag
check. We can't entirely disable event_log logging because some of the stuff
being logged will not exist in stats_log, for example paired metadata.
Bug: 129697155
Test: robotest
Change-Id: I9cd46bbb54cb85737bbf7760e315c1fe34f77498
2019-05-07 14:23:23 -07:00
Daniel Solomon
11b68bc420
Merge "Hide display white balance setting depending on accessibility" into qt-dev
2019-05-07 21:19:36 +00:00
Aran Ink
b8e81544ef
Use correct constants for Global Actions Panel settings.
...
Test: Automated tests pass. Manual testing allows enabling/disabling of secure setting via Settings preference.
Fixes: 132182180
Fixes: 132184167
Change-Id: I62caccfe64e073c95b0c0f8a42e5728cf7f3c1ca
2019-05-07 16:36:56 -04:00
Aaron Heuckroth
2659c0f61b
Create Settings preference for Global Actions Panel.
...
Test: Automated tests pass.
Bug: 127295457
Change-Id: I6502d4c8541a3f279fb96d5f050f13890db8f376
2019-05-07 16:27:59 -04:00
Winson Chung
cfd0a66f7b
Disable settings preferences when the packages do not exist
...
Bug: 131273934
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationLegacyPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationSwipeUpPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationEdgeToEdgePreferenceControllerTest
Change-Id: I5b12831d0eacbaa9c8b13d7a7b380b8c99f20009
2019-05-07 20:16:05 +00:00
Fan Zhang
73d79ef7a1
Merge "Remove animator on app list." into qt-dev
...
am: 576cb8b0df
2019-05-07 13:12:48 -07:00
Lei Yu
45423baaae
Increate max height of sliceView
...
To make sure it can have 8 devices at maximum.
Fixes: 130357332
Test: Manual
Change-Id: I4274a04d1dd8447b9b5904a77af2723e4637f22a
2019-05-07 12:57:45 -07:00
Linda Tseng
a73b95041f
Merge "Update SliceViewStyle background color" into qt-dev
...
am: e3cc773f0d
2019-05-07 12:56:20 -07:00
Fan Zhang
576cb8b0df
Merge "Remove animator on app list." into qt-dev
2019-05-07 19:05:39 +00:00
Linda Tseng
e3cc773f0d
Merge "Update SliceViewStyle background color" into qt-dev
2019-05-07 18:55:31 +00:00
Adam He
e840691e52
Display profile picker for content capture settings.
...
Fixes: 131748579
Test: manual verification
Change-Id: Iccce8aab8eb3596cb195d64d5711e9407a844541
2019-05-07 11:31:57 -07:00
