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
771dd70a3f
Merge "Add null check before setting the visibility of swipe background" into qt-dev
...
am: 1079d2833a
2019-05-08 10:12:43 -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
47323f98a7
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
Christopher Dombroski
648671c956
[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:50:22 -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
3c20199b92
Merge "Disable settings preferences when the packages do not exist" into qt-dev
...
am: 46b356d37d
2019-05-07 21:18:15 -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
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
5b9759972e
Merge "Add an interface that returns time spent text for app." into qt-dev
...
am: 6e8c403360
2019-05-07 18:43:26 -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
6257d077bf
Merge "Hide display white balance setting depending on accessibility" into qt-dev
...
am: 11b68bc420
2019-05-07 14:36:47 -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
Fan Zhang
0f9d77ac88
Merge "Remove animator on app list." into qt-dev
...
am: 576cb8b0df
2019-05-07 13:36:53 -07: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
Linda Tseng
14e641709a
Merge "Update SliceViewStyle background color" into qt-dev
...
am: e3cc773f0d
2019-05-07 13:14:11 -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
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
Edgar Wang
133ffc9c57
Show admin dialog when preference is disabled by Device Admin
...
Fixes: 130694312
Test: manual & robotest
Change-Id: I9c6487ac056ec3d784bd6f6901e96869e27e0b3e
2019-05-08 02:04:05 +08:00
Yi-Ling Chuang
ae48547a1c
Merge "Hide dismissal swipe background before slice gets ready" into qt-dev
...
am: 9fcb35a009
2019-05-07 08:47:47 -07:00
TreeHugger Robot
9fcb35a009
Merge "Hide dismissal swipe background before slice gets ready" into qt-dev
2019-05-07 15:34:24 +00:00
Bram Bonné
522ff34b32
Merge "Adapts P2P settings to work with with new MAC privacy restrictions." into qt-dev
...
am: db6a70272e
2019-05-07 07:11:24 -07:00
Bram Bonné
db6a70272e
Merge "Adapts P2P settings to work with with new MAC privacy restrictions." into qt-dev
2019-05-07 14:02:04 +00:00
Arc Wang
ac75faa207
Fix back arrow in wifi settings "connect to this network connection qr code" does not work
...
When clicking back button, pop fragment and Finish the activity if there is nothing to pop
Bug: 132132756
Test: atest WifiDppConfiguratorActivityTest
Change-Id: Ia16951e79e578f1625e5fadd26553735fa90bffa
2019-05-07 18:06:54 +08:00
Yi-Ling Chuang
ce9903e8db
Hide dismissal swipe background before slice gets ready
...
Only make swipe background visible once slice has a successfual binding.
Bug: 131843256
Test: robotests
Change-Id: I7866873a217e8ca882634a48108939022713c87b
2019-05-07 17:54:33 +08:00
Kevin Chang
6a35095020
Merge "Change the attributes of SwitchBar and ToggleSwitch" into qt-dev
...
am: caa17e0ec7
2019-05-07 01:58:21 -07:00
Kevin Chang
caa17e0ec7
Merge "Change the attributes of SwitchBar and ToggleSwitch" into qt-dev
2019-05-07 08:53:28 +00:00
Stanley Wang
d841671f3c
Merge "Fix no touch feedback present on the settings suggestion card." into qt-dev
...
am: 87d9626a78
2019-05-07 00:56:50 -07:00
Stanley Wang
87d9626a78
Merge "Fix no touch feedback present on the settings suggestion card." into qt-dev
2019-05-07 07:45:31 +00:00
Raff Tsai
9ee63fae6a
Merge "ANR observed under settings when trying to reset network settings" into qt-dev
...
am: d6d5495aa1
2019-05-06 21:50:26 -07:00
Raff Tsai
d6d5495aa1
Merge "ANR observed under settings when trying to reset network settings" into qt-dev
2019-05-07 04:40:34 +00:00
Kevin Chang
461ee19c12
Merge "Change the string of Captions and reorder the feature in audio category" into qt-dev
...
am: 4b7d48320c
2019-05-06 21:11:21 -07:00
Kevin Chang
4b7d48320c
Merge "Change the string of Captions and reorder the feature in audio category" into qt-dev
2019-05-07 03:47:51 +00:00
Jason Chiu
7169917a1b
Merge "Add subtext for Wi-Fi items on Wi-Fi slice" into qt-dev
...
am: a892ed5cdd
2019-05-06 19:58:52 -07:00
