Commit Graph

9138 Commits

Author SHA1 Message Date
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
Fan Zhang
83ff47b4d1 Merge "Add an interface that returns time spent text for app." into qt-dev
am: 6e8c403360

Change-Id: I0e015174b752787eecba1be40937de42ebff19f9
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
Daniel Solomon
8a38791509 Merge "Hide display white balance setting depending on accessibility" into qt-dev am: 11b68bc420
am: b907794aa3

Change-Id: Ia6389a2a35414b60bf7fcb0f742fef1314438383
2019-05-07 15:17:04 -07:00
Daniel Solomon
b907794aa3 Merge "Hide display white balance setting depending on accessibility" into qt-dev
am: 11b68bc420

Change-Id: Ia7e0f7dc5accacb00b9981bac0b143b41a1984c1
2019-05-07 14:36:31 -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
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
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
d26db3793f Merge "Hide dismissal swipe background before slice gets ready" into qt-dev am: 9fcb35a009
am: 922ecb6628

Change-Id: Ie3af39287ecdd7d60749ddb883f686d04853301a
2019-05-07 08:58:28 -07:00
Yi-Ling Chuang
922ecb6628 Merge "Hide dismissal swipe background before slice gets ready" into qt-dev
am: 9fcb35a009

Change-Id: I47970b4ad73a3eb22367c0151c671d1c6016ee4d
2019-05-07 08:47:48 -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
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
Raff Tsai
0d894197f6 Merge "ANR observed under settings when trying to reset network settings" into qt-dev
am: d6d5495aa1

Change-Id: I8ee5162f44c834cb74ceeff14f604e480b123e9a
2019-05-06 21:50:30 -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
Jason Chiu
1dafe9864e Merge "Add subtext for Wi-Fi items on Wi-Fi slice" into qt-dev am: a892ed5cdd
am: 3b1bdd5726

Change-Id: I1443fadd11ce48628466e4c9e4918204800d0c84
2019-05-06 20:44:44 -07:00
Jason Chiu
3b1bdd5726 Merge "Add subtext for Wi-Fi items on Wi-Fi slice" into qt-dev
am: a892ed5cdd

Change-Id: I097d25d222176fa2bab51603e1cfe6a26a8bc47a
2019-05-06 19:58:51 -07:00
TreeHugger Robot
a892ed5cdd Merge "Add subtext for Wi-Fi items on Wi-Fi slice" into qt-dev 2019-05-07 02:45:19 +00:00
Yi-Ling Chuang
27c257b63a Limit the number of permissions being displayed. am: 922064ed69
am: 6e167068fb

Change-Id: I0fada80d47402a90e01a4963a1bc8923408fe736
2019-05-06 10:44:55 -07:00
Yi-Ling Chuang
6e167068fb Limit the number of permissions being displayed.
am: 922064ed69

Change-Id: I55fcc111d5d67e0e67c327894abb7fa9150c5346
2019-05-06 10:27:32 -07:00
tmfang
b031388999 Fix WebViewAppPickerTest
- Also do some minor refactoring

Test: robotest
Fixes: 131921277
Change-Id: I8de2e1b9b384ef9722bbe95111b86193fddb83d5
2019-05-06 15:25:53 +08:00
Yi-Ling Chuang
922064ed69 Limit the number of permissions being displayed.
To avoid a long permission summary, let's limit the number to three.

Fixes: 117978938
Test: robotests
Change-Id: Id83fac7ad91140b22757d3e6e8eb72d86ad6ad42
2019-05-06 14:12:00 +08:00
Yi-Ling Chuang
1e389acc47 Merge "Use PermissionControllerManager to get permission groups" into qt-dev am: 1dfc43879e
am: fa2074562f

Change-Id: I5b9a242da167d368eae3e1039c4c7d70d8788e50
2019-05-05 19:59:17 -07:00
Yi-Ling Chuang
fa2074562f Merge "Use PermissionControllerManager to get permission groups" into qt-dev
am: 1dfc43879e

Change-Id: I549648a29b886fa353d9bc5f0935aa26880f5940
2019-05-05 19:55:19 -07:00
TreeHugger Robot
1dfc43879e Merge "Use PermissionControllerManager to get permission groups" into qt-dev 2019-05-06 02:39:13 +00:00
Julia Reynolds
448852d943 Merge "Gentle notifications screen" into qt-dev am: 21dbfce634
am: dab05c6169

Change-Id: I2f2dde1e2d87b899cf5dd44411ae17c861b5ccf6
2019-05-04 13:39:53 -07:00
Julia Reynolds
dab05c6169 Merge "Gentle notifications screen" into qt-dev
am: 21dbfce634

Change-Id: Ia9544235000388615571f5c9f44263b0cd539b88
2019-05-04 13:30:54 -07:00
Julia Reynolds
21dbfce634 Merge "Gentle notifications screen" into qt-dev 2019-05-04 20:02:39 +00:00
Julia Reynolds
643eb7572f Gentle notifications screen
With lockscreen and status bar settings

Test: robo tests
Bug: 128445911
Change-Id: I46c5943d4d8dc1ee74b5b920239f259f5880a2d3
2019-05-04 14:59:53 +00:00
Julia Reynolds
551bc81d0c Merge "Populate recent notifying apps from usage events" into qt-dev am: 4a7a1086d0
am: e1f8525853

Change-Id: I75f76273b87f2573031fd80d4dd71ed64a633096
2019-05-04 07:50:43 -07:00
Julia Reynolds
e1f8525853 Merge "Populate recent notifying apps from usage events" into qt-dev
am: 4a7a1086d0

Change-Id: If0c2d93b616c62a9ed49d41f69d7e0a5a5ea34a6
2019-05-04 07:41:18 -07:00
TreeHugger Robot
4a7a1086d0 Merge "Populate recent notifying apps from usage events" into qt-dev 2019-05-04 14:30:29 +00:00
Fan Zhang
8a17654a19 Merge "Format app data usage using IEC unit, not SI unit." into qt-dev am: 805ba40194
am: 301e0ec462

Change-Id: Idd3a90b808b6516a3754cff8048e6e2a44c3b9eb
2019-05-04 03:43:14 -07:00
Fan Zhang
301e0ec462 Merge "Format app data usage using IEC unit, not SI unit." into qt-dev
am: 805ba40194

Change-Id: Icf637e54bcd598805dea60a7d4a72af8c49bb045
2019-05-04 03:33:16 -07:00
TreeHugger Robot
805ba40194 Merge "Format app data usage using IEC unit, not SI unit." into qt-dev 2019-05-04 10:25:26 +00:00
Andrew Sapperstein
178d76b4bd Mark broken tests @Ignore. am: 7af5a9e0c3
am: 66704ecd9b

Change-Id: I46fc6e3b066ed77c420622f33c7fd617b76211a6
2019-05-03 23:33:24 -07:00
Amin Shaikh
24b41f52d3 Merge "Fix themed settings icons." into qt-dev am: 1c3d7aa1f9
am: 4f0d017808

Change-Id: I0d52c9cce9724e64621f919215402639f2323a9e
2019-05-03 23:22:01 -07:00
Beth Thibodeau
6007065213 Merge "Add setting suggestion for style" into qt-dev am: 1d1f1b321e
am: 2c773e578e

Change-Id: Ieba65805d03fe3aca3151b4325a21061bb107c4f
2019-05-03 22:08:33 -07:00
Fan Zhang
e00c504758 Merge "Delete dead tests." into qt-dev am: 157f2f095f
am: 3252944654

Change-Id: I9aee95e1bb076cb4b4fa6f218510ea3af3e94d26
2019-05-03 19:19:38 -07:00
Andrew Sapperstein
66704ecd9b Mark broken tests @Ignore.
am: 7af5a9e0c3

Change-Id: I638935d88091bf7a10ed08c22467f0a8d577ffce
2019-05-03 18:13:34 -07:00
Amin Shaikh
4f0d017808 Merge "Fix themed settings icons." into qt-dev
am: 1c3d7aa1f9

Change-Id: I79de8a93ff1b912525f760c6269f52f1b8897868
2019-05-03 17:29:13 -07:00
Fan Zhang
71d793cc2a Format app data usage using IEC unit, not SI unit.
Fixes: 131924586
Test: visual
Change-Id: Iedbd15fb9c98a5c93089708e40175cbf5572eeda
2019-05-03 16:53:11 -07:00
Salvador Martinez
7c4d2a2de2 Merge "Update battery saver footer to have learn more link" into qt-dev am: a5bc389c9d
am: 75c9a817f0

Change-Id: I3073dff6f7e12ce5cb54197b8614c5b8bf743494
2019-05-03 16:19:23 -07:00
Beth Thibodeau
2c773e578e Merge "Add setting suggestion for style" into qt-dev
am: 1d1f1b321e

Change-Id: Ib7c8225c1887b239faf6a3952ddec383d266389f
2019-05-03 15:53:43 -07:00
Andrew Sapperstein
7af5a9e0c3 Mark broken tests @Ignore.
Bug: 131921277
Test: robotests
Change-Id: I2dc1a4ecc41e07284710fbffc2a980aee805e745
2019-05-03 14:43:47 -07:00
TreeHugger Robot
1c3d7aa1f9 Merge "Fix themed settings icons." into qt-dev 2019-05-03 21:04:36 +00:00