Julia Reynolds
c9f56810ea
Merge "Non-blockable whitelist should only control importance fields" into qt-dev am: 8bfc277f7d
...
am: 6d0c551706
Change-Id: Id178579d07e371bd78e4790b3fd28fca1e1f66ad
2019-04-18 16:21:49 -07:00
Mill Chen
451f1a2697
Merge "Revert "Add robotest modules for Settings"" into qt-dev am: d0dd6d8885
...
am: 97afe10730
Change-Id: I12f58d61303ecd5e7306675d36171c146b36f20a
2019-04-18 16:13:30 -07:00
Julia Reynolds
2306305d47
Merge "Redesign channel listing and channel page" into qt-dev am: 9496bce441
...
am: 1053e4a798
Change-Id: I863f230c5fc9e4b03a5a88b4d52b3395ea07f20c
2019-04-18 15:38:55 -07:00
Julia Reynolds
6d0c551706
Merge "Non-blockable whitelist should only control importance fields" into qt-dev
...
am: 8bfc277f7d
Change-Id: If5499e8bdb1c60f7e70c5393ee6428cbb08f608d
2019-04-18 15:20:17 -07:00
Mill Chen
97afe10730
Merge "Revert "Add robotest modules for Settings"" into qt-dev
...
am: d0dd6d8885
Change-Id: I92acba8f32bc1bbb8ae8dff21637c9b0f0db02bd
2019-04-18 15:18:51 -07:00
Julia Reynolds
1053e4a798
Merge "Redesign channel listing and channel page" into qt-dev
...
am: 9496bce441
Change-Id: I7616f9164b8178f31423e0c048700391a667f192
2019-04-18 15:05:37 -07:00
TreeHugger Robot
8bfc277f7d
Merge "Non-blockable whitelist should only control importance fields" into qt-dev
2019-04-18 21:56:02 +00:00
lindatseng
2c501d917a
Merge "Fix regression of wrong min value on night display slice" into qt-dev am: 93aee0d99d
...
am: 35b17ed655
Change-Id: I50f210cdfec286335e9363cf7fcc235ecf8e9816
2019-04-18 14:52:46 -07:00
Mill Chen
d0dd6d8885
Merge "Revert "Add robotest modules for Settings"" into qt-dev
2019-04-18 21:49:51 +00:00
Mill Chen
db9f07850f
Revert "Add robotest modules for Settings"
...
This reverts commit ce09f58360
.
Reason for revert: will build break on run_host_tests
Bug: 130774632
Change-Id: Id2ee52ffb0689059da9cbdadd5bdae5b6a04a589
2019-04-18 21:48:42 +00:00
Julia Reynolds
9496bce441
Merge "Redesign channel listing and channel page" into qt-dev
2019-04-18 21:34:36 +00:00
Amin Shaikh
d279f02f1d
Merge "Add Settings keywords for Styles & Wallpaper." into qt-dev am: 670bf45b50
...
am: 01c3f8105f
Change-Id: Ia7eb2a0b5a26045215012d216cf93403e70a5db7
2019-04-18 13:40:08 -07:00
lindatseng
35b17ed655
Merge "Fix regression of wrong min value on night display slice" into qt-dev
...
am: 93aee0d99d
Change-Id: I153d69e5cc07ab5a2aec7972150a80f706ccdb87
2019-04-18 13:24:12 -07:00
TreeHugger Robot
93aee0d99d
Merge "Fix regression of wrong min value on night display slice" into qt-dev
2019-04-18 19:44:43 +00:00
Amin Shaikh
01c3f8105f
Merge "Add Settings keywords for Styles & Wallpaper." into qt-dev
...
am: 670bf45b50
Change-Id: I4a5e50cf64660601bc8864be4c8fcf04f5ae1c83
2019-04-18 12:32:55 -07:00
Julia Reynolds
73c647513b
Non-blockable whitelist should only control importance fields
...
Sounds, etc. should still be modifiable
Test: robotests
Fixes: 130086523
Change-Id: I1a95a73b299bb3afd169b249a3dabae3583a448a
2019-04-18 18:58:12 +00:00
Julia Reynolds
5c097c6d3c
Redesign channel listing and channel page
...
Test: atest
Bug: 127796543
Fixes: 129452112
Fixes: 129453207
Change-Id: I1d520c9e35860303235b7ffbb18a76cbc4f4b8bc
2019-04-18 18:51:23 +00:00
Fan Zhang
87695a5d87
Merge "Move "Build Number" slice to a different controller." into qt-dev am: 95073738ea
...
am: 06321b5568
Change-Id: Ib1c3248883edb692f36a75ead269abc7598e4941
2019-04-18 11:44:11 -07:00
TreeHugger Robot
670bf45b50
Merge "Add Settings keywords for Styles & Wallpaper." into qt-dev
2019-04-18 18:43:35 +00:00
Fan Zhang
06321b5568
Merge "Move "Build Number" slice to a different controller." into qt-dev
...
am: 95073738ea
Change-Id: Ia40218af84ded88e80e422c6f7551f5b9315febb
2019-04-18 11:34:10 -07:00
TreeHugger Robot
95073738ea
Merge "Move "Build Number" slice to a different controller." into qt-dev
2019-04-18 18:16:19 +00:00
lindatseng
55f66a9177
Fix regression of wrong min value on night display slice
...
The min value of NightDisplayIntensityPreferenceController
should always be 0 (which is the old value we used before
ag/7062353). The range is cacluated from the relative value
to MinimumColorTemperature, which means the min value should
always be 0.
Test: atest NightDisplayIntensityPreferenceControllerTest
Fixes:130758028
Change-Id: Ica75672dda6a9ee0c6013f1c903611263b7d133f
2019-04-18 11:11:12 -07:00
Matthew Fritze
134728abf9
Merge "Prevent bad apps from getting Setting Slices" into qt-dev am: 7f9a86d869
...
am: 83eeb1f8d8
Change-Id: I79cc4dceffaa03c76d4af64c085fbc61cdfdf1d1
2019-04-18 11:04:13 -07:00
Matthew Fritze
83eeb1f8d8
Merge "Prevent bad apps from getting Setting Slices" into qt-dev
...
am: 7f9a86d869
Change-Id: I915a1ed62d0f92cfb3be0c9cea4aeac416328936
2019-04-18 10:53:51 -07:00
TreeHugger Robot
7f9a86d869
Merge "Prevent bad apps from getting Setting Slices" into qt-dev
2019-04-18 17:38:28 +00:00
Amin Shaikh
87ef55ea90
Add Settings keywords for Styles & Wallpaper.
...
Reusing existing strings since this is coming in after string freeze.
TODO: create a new keyword string for this preference.
Fixes: 130759285
Test: m RunSettingsRoboTests and searching keywords on device
Change-Id: Ice1bc34b381302745cb55056377cc94ea74e8d50
2019-04-18 13:29:15 -04:00
Fan Zhang
6dade8e430
Move "Build Number" slice to a different controller.
...
There are 2 build number tiles in settings: Android version -> Build
number and About phone -> build number.
The way we index breadcrumb for each slice is making some client
confused. So this change moves the slice capability from Androi
version>BuildNumber to About phone.
Fixes: 130652710
Test: reindex, robotest
Change-Id: I9054d0db124b706e7984cd3d19774bb604bd7fd3
2019-04-18 09:37:15 -07:00
Matthew Fritze
2bdea1d922
Prevent bad apps from getting Setting Slices
...
SettingsSliceProvider no longer allows apps to request permission
from the user for Settings Slices. Instead, the PrimaryAction on the
permission slice will be an intent into Settings.
This is because the dialog for granting apps Settings Slices would act
as a replacement for regular permission dialogs, which we want to avoid.
Fixes: 130795282
Test: robolectrico
Change-Id: I6848215bab2bf10ee5e53814b765d04f04f53f4e
2019-04-18 08:51:17 -07:00
cosmohsieh
df7f0ac0f6
Merge "[PasspointV2] Set summary of saved networks preference" into qt-dev am: bb00e4c028
...
am: bef62366a9
Change-Id: I6aab90a1d3f4b911553c998fd272d5b20d984381
2019-04-17 23:29:26 -07:00
Fan Zhang
ea06424be0
Merge "Remove on/off subtext from gesture preferencecontrollers" into qt-dev am: f6f4ae6e1c
...
am: 62b8d64bbc
Change-Id: Ia871ec5f8bd0df2990339d41d73b8f28c92e5f58
2019-04-17 22:13:47 -07:00
Mill Chen
20c270df33
Merge "Add robotest modules for Settings" into qt-dev am: 0e38f902c5
...
am: 1278c6b560
Change-Id: Ide83c5cf68f11ec5ba8932d54d42f4c6bb076585
2019-04-17 22:13:01 -07:00
cosmohsieh
bef62366a9
Merge "[PasspointV2] Set summary of saved networks preference" into qt-dev
...
am: bb00e4c028
Change-Id: I537acf599d704a1aa1a5ae21e5cbd4aba15728e4
2019-04-17 18:27:22 -07:00
cosmohsieh
d76317486e
Merge "Implement context menu for ConnectedAccessPointPreference" into qt-dev
...
am: f590d5c617
Change-Id: Id59d97f64f5a36e5ecfb7cc95836b65c04334082
2019-04-17 18:02:34 -07:00
TreeHugger Robot
bb00e4c028
Merge "[PasspointV2] Set summary of saved networks preference" into qt-dev
2019-04-18 00:58:22 +00:00
Fan Zhang
62b8d64bbc
Merge "Remove on/off subtext from gesture preferencecontrollers" into qt-dev
...
am: f6f4ae6e1c
Change-Id: I3961ec0da3fb934d581e26c34ef4136d26b28417
2019-04-17 17:54:37 -07:00
TreeHugger Robot
f590d5c617
Merge "Implement context menu for ConnectedAccessPointPreference" into qt-dev
2019-04-18 00:33:41 +00:00
TreeHugger Robot
f6f4ae6e1c
Merge "Remove on/off subtext from gesture preferencecontrollers" into qt-dev
2019-04-18 00:29:33 +00:00
Mill Chen
1278c6b560
Merge "Add robotest modules for Settings" into qt-dev
...
am: 0e38f902c5
Change-Id: Iaea9e89f0d9b64c5e88234308d379d09cb170ff2
2019-04-17 17:25:08 -07:00
Fan Zhang
57f18af554
Remove on/off subtext from gesture preferencecontrollers
...
The toggle switch next to the subtitle already shows on/off clearly.
Fixes: 130652619
Fixes: 130652843
Fixes: 130653459
Fixes: 130653297
Test: robo
Change-Id: Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5
2019-04-17 23:49:25 +00:00
Mill Chen
0e38f902c5
Merge "Add robotest modules for Settings" into qt-dev
2019-04-17 23:42:52 +00:00
Mill Chen
ce09f58360
Add robotest modules for Settings
...
Use ROBOTEST_FILTER to divide RunSettingsRoboTests into several smaller
parts.
Bug: 130511490
Test: make -j RunSettingsRoboTests-applications && make -j
RunSettingsRoboTests-wifi
Change-Id: I16ea575877df7a495de9344971421d221e197b89
2019-04-17 16:37:16 -07:00
Mill Chen
afbc2c1fd0
Merge "Default to enable oem-unlocking preference" into qt-dev am: c82a225c6f
...
am: 36c5e429fb
Change-Id: I2a9515be227a45aa683709fdfb8393dad81c1dcd
2019-04-17 10:36:14 -07:00
Mill Chen
36c5e429fb
Merge "Default to enable oem-unlocking preference" into qt-dev
...
am: c82a225c6f
Change-Id: Iabcddecee0b0b7d36e3868c617c46ec85867b7d4
2019-04-17 10:24:05 -07:00
TreeHugger Robot
c82a225c6f
Merge "Default to enable oem-unlocking preference" into qt-dev
2019-04-17 16:54:19 +00:00
cosmohsieh
e6e4b4d78d
[PasspointV2] Set summary of saved networks preference
...
Summary text of "saved networks" preference has number of both normal
networks and subscriptions
Bug: 130259573
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.WifiSettingsTest
Change-Id: I8bdf41c1a85165298a2ccd9e688c30b0bd593bfa
2019-04-17 18:21:09 +08:00
Clown SHEN
f72895a709
Merge "Retrieve WiFi detail test cases" into qt-dev am: 5466ef6da5
...
am: cdd6a30de7
Change-Id: Ibb8436de8daa93eea0bc113df4abef5c9a7652a0
2019-04-16 22:44:10 -07:00
Alex Salo
77b5cf96cb
Merge "Check for attention permissions" into qt-dev am: e991b05b29
...
am: 7e3a9da21b
Change-Id: Ie7cbdd50745b6d915de4f468d3aabe6de0abbaa5
2019-04-16 21:27:29 -07:00
Clown SHEN
cdd6a30de7
Merge "Retrieve WiFi detail test cases" into qt-dev
...
am: 5466ef6da5
Change-Id: I1adb241fe6a59dc067d9c02a094422474b479dc9
2019-04-16 20:34:34 -07:00
Clown SHEN
5466ef6da5
Merge "Retrieve WiFi detail test cases" into qt-dev
2019-04-17 02:48:24 +00:00
Alex Salo
7e3a9da21b
Merge "Check for attention permissions" into qt-dev
...
am: e991b05b29
Change-Id: I52b699901bda983ebe7ec5f571443868ed0c083f
2019-04-16 18:42:44 -07:00