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
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
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
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
cosmohsieh
a33aadd214
Merge "[Network Connection] Show full SSID on list item" into qt-dev
...
am: 6e115e4fda
Change-Id: I7a5250221d73d163961f9894f96701d699711c90
2019-04-18 10:05:44 -07:00
TreeHugger Robot
6e115e4fda
Merge "[Network Connection] Show full SSID on list item" into qt-dev
2019-04-18 16:51:37 +00: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
Joel Galenson
391b931218
Merge "Only get apps with permission granted." into qt-dev am: ae50ffbf04
...
am: 7b7b9dd13b
Change-Id: I6631ce8f758718da65a7dc743956cdec6139b161
2019-04-17 21:25:16 -07:00
joshmccloskey
089e8e5a30
Merge "Updated ConfirmDeviceCredential strings" into qt-dev am: f90c24d194
...
am: 9c5669b802
Change-Id: Ia6021a40c91217b7bdb0ec95cb5d5a2f2badd9bb
2019-04-17 20:55:36 -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
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
Joel Galenson
7b7b9dd13b
Merge "Only get apps with permission granted." into qt-dev
...
am: ae50ffbf04
Change-Id: Idd1e27d02dee580c8dc53c5335803face7f3f419
2019-04-17 15:36:15 -07:00
joshmccloskey
9c5669b802
Merge "Updated ConfirmDeviceCredential strings" into qt-dev
...
am: f90c24d194
Change-Id: I37c1da95d23cb91127ccaf7e9f3b792737457124
2019-04-17 15:25:57 -07:00
TreeHugger Robot
ae50ffbf04
Merge "Only get apps with permission granted." into qt-dev
2019-04-17 21:19:52 +00:00
TreeHugger Robot
f90c24d194
Merge "Updated ConfirmDeviceCredential strings" into qt-dev
2019-04-17 21:13:41 +00:00
Quang Luong
cb28fa21d6
Merge "Fixed Passpoint network "Not in range" issue and forget button" into qt-dev am: 7af19fcb86
...
am: 75264b0a28
Change-Id: I2eacea7ae2646770ce40ca29a24bd04446950491
2019-04-17 13:15:02 -07:00
Quang Luong
75264b0a28
Merge "Fixed Passpoint network "Not in range" issue and forget button" into qt-dev
...
am: 7af19fcb86
Change-Id: I2096086e4463279d426896c774f3c4e00945a216
2019-04-17 12:20:44 -07:00
Yanting Yang
339d776acb
Merge "Turn off debug logging flags" into qt-dev am: ed9be192b6
...
am: bdbca3399b
Change-Id: I4810befe72180fae7089577016b7e1011b6ce7cf
2019-04-17 11:39:38 -07:00
Joel Galenson
db516d98c5
Only get apps with permission granted.
...
The subtitle gives the number of apps that can access location, but it
currently collects all apps that request location, including those
that are denied. Ensure that we only count granted apps.
Bug: 129296799
Test: Open Settings, see the count is much lower.
Change-Id: I9a18bbb62be742731205dab9f5b8e9a703ea030c
2019-04-17 11:12:26 -07:00
Quang Luong
7af19fcb86
Merge "Fixed Passpoint network "Not in range" issue and forget button" into qt-dev
2019-04-17 17:57:39 +00:00
Yanting Yang
bdbca3399b
Merge "Turn off debug logging flags" into qt-dev
...
am: ed9be192b6
Change-Id: Ib0b539172fdeff2eabb86033b10af1b811171e7f
2019-04-17 10:45:33 -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
ed9be192b6
Merge "Turn off debug logging flags" into qt-dev
2019-04-17 17:12:39 +00:00
TreeHugger Robot
c82a225c6f
Merge "Default to enable oem-unlocking preference" into qt-dev
2019-04-17 16:54:19 +00:00
Joel Galenson
0d8c7e51c8
Merge "Do not special case the storage permission group." into qt-dev am: 634b56cb17
...
am: 6fd7aa77ea
Change-Id: I5873fdca199bc1a97aa77ad173d9bd92276ff5aa
2019-04-17 08:30:28 -07:00
Joel Galenson
6fd7aa77ea
Merge "Do not special case the storage permission group." into qt-dev
...
am: 634b56cb17
Change-Id: I628009b969d2089151f723c233594cb919fd146d
2019-04-17 07:45:09 -07:00
TreeHugger Robot
634b56cb17
Merge "Do not special case the storage permission group." into qt-dev
2019-04-17 14:21:49 +00:00
Yanting Yang
118e7aee28
Turn off debug logging flags
...
Fixes: 130558346
Test: visual
Change-Id: Ie82bfe503f789435a3474697391fdfdeb94864ee
2019-04-17 19:55:54 +08: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
Mill Chen
5d0f4efcfa
Merge "Add subtitle for Do not disturb" into qt-dev am: cf9b3d2e87
...
am: 8350576f01
Change-Id: I1f62873cb3c07a01399548ed2351ca14c889669b
2019-04-17 02:21:51 -07:00
Mill Chen
992f431b1e
Merge "Remove On/Off string from Night light slice" into qt-dev am: 0ce66b9329
...
am: bc8089527d
Change-Id: I2488ce9d1398198313af8aad01c8ed97f72b0c27
2019-04-17 02:20:46 -07:00
Mill Chen
8350576f01
Merge "Add subtitle for Do not disturb" into qt-dev
...
am: cf9b3d2e87
Change-Id: I60ec7bc78b4cf6a429c6e0ccdb3b092431e0a72b
2019-04-17 02:16:51 -07:00
Mill Chen
bc8089527d
Merge "Remove On/Off string from Night light slice" into qt-dev
...
am: 0ce66b9329
Change-Id: Ie39cc0e3bafe863ae1a200fbde13bca7b9da8961
2019-04-17 02:15:47 -07:00
TreeHugger Robot
cf9b3d2e87
Merge "Add subtitle for Do not disturb" into qt-dev
2019-04-17 09:08:17 +00:00
TreeHugger Robot
0ce66b9329
Merge "Remove On/Off string from Night light slice" into qt-dev
2019-04-17 09:03:07 +00:00