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
Alex Salo
fe0d647917
Merge "Finalize the adaptive sleep icon" into qt-dev
...
am: 8ca49b5764
Change-Id: Ic741170c9ddb56e1fdf21a89d7b3fb627be7b8ef
2019-04-18 12:23:50 -07:00
TreeHugger Robot
670bf45b50
Merge "Add Settings keywords for Styles & Wallpaper." into qt-dev
2019-04-18 18:43:35 +00:00
TreeHugger Robot
8ca49b5764
Merge "Finalize the adaptive sleep icon" into qt-dev
2019-04-18 18:42:46 +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
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
Sunny Shao
d1d9cc59b0
Merge "Let NGA item display above advanced item in the App & Notifications" into qt-dev
...
am: 57da877dde
Change-Id: I53ff246a5614c1dc57717b94c84261cdbcaf8f5a
2019-04-18 10:07:36 -07:00
Sunny Shao
2fea81c628
Merge "Remove the duplicated search item" into qt-dev
...
am: 1282390768
Change-Id: Ic855545cab08d8a27fd82ea753b5481cfb3f5dce
2019-04-18 10:06:41 -07: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
pastychang
19b6972384
Set description textview to fixed id
...
am: f8409db196
Change-Id: I5f67c31f13e6d2b9bc029905e90f02caf6043a4f
2019-04-18 10:03:42 -07:00
TreeHugger Robot
57da877dde
Merge "Let NGA item display above advanced item in the App & Notifications" into qt-dev
2019-04-18 16:54:58 +00:00
TreeHugger Robot
1282390768
Merge "Remove the duplicated search item" into qt-dev
2019-04-18 16:51:56 +00: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
Sunny Shao
26bd5a9a8f
Remove the duplicated search item
...
Disable the searchable of the "Adaptive battery" item in the smart_battery_detail.xml
Fixes: 130656532
Test: Manual View
Change-Id: I95beb97fc09ff6858f7b4e0e576a598c3520db86
2019-04-18 17:39:09 +08:00
pastychang
f8409db196
Set description textview to fixed id
...
Modify to fixed id for landscape Glif layout and non-glif layout
Test: Manual
Bug: 130707943
Change-Id: I6346817e582c2aac26753b3a985038cb0ca421bc
2019-04-18 07:43:30 +00:00
Sunny Shao
06da9c7df9
Let NGA item display above advanced item in the App & Notifications
...
Change the value of the initialExpandedChildrenCount to 4 and let NGA item to show.
Fixes: 130420794
Test: Manual View
Change-Id: Ic2453944a5eaea0b5fd65e0272bfac64ffbc1eec
2019-04-18 15:24:48 +08:00
Kevin Chyn
8abe1f7c7d
Merge "Tweak enrollment intro layout" into qt-dev
...
am: 3683a688f7
Change-Id: Id76defc6138c9fdddeb3c90343e7b4bb12bf556a
2019-04-17 21:42:34 -07:00
Kevin Chyn
3683a688f7
Merge "Tweak enrollment intro layout" into qt-dev
2019-04-18 04:09:12 +00: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
Selim Cinek
db22260726
Merge "Updated strings for dynamic privacy" into qt-dev
...
am: 9f374307c5
Change-Id: I2de918bb6e5ea7e7c116014d9c4c07e6670d950b
2019-04-17 18:03:42 -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
Selim Cinek
9f374307c5
Merge "Updated strings for dynamic privacy" into qt-dev
2019-04-18 00:42:55 +00: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
Alex Salo
18cc79af29
Finalize the adaptive sleep icon
...
Bug: 129352433
Test: manually
Change-Id: I00cf2e5e7e8a9ebd60d9aa4e9047c9cd04ec16c7
2019-04-17 17:16:00 -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
Colin Cross
6dd52d8112
[automerger skipped] Merge "Update SettingsRoboTests for truth 0.42" am: 1e342c5be6
...
am: 2df12ab3bb -s ours
am skip reason: change_id I32cb2fcf6094675f79d2fc24702ef6298a9691e4 with SHA1 cdf284b732 is in history
Change-Id: I4a0e8480124ad9d96ba3be26faf41cfe80b1c047
2019-04-17 16:35:07 -07:00
Colin Cross
2df12ab3bb
Merge "Update SettingsRoboTests for truth 0.42"
...
am: 1e342c5be6
Change-Id: I76e84b28fc62f50e16fe712eb2da234912473652
2019-04-17 16:23:06 -07:00
Colin Cross
1e342c5be6
Merge "Update SettingsRoboTests for truth 0.42"
2019-04-17 23:16:08 +00:00
Bill Yi
969b7de952
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: ff7f14a966 -s ours
am skip reason: subject contains skip directive
Change-Id: I02f2b404d013d290b02e8df1a41b543e2742ba89
2019-04-17 15:43:10 -07: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
Peiyong Lin
a56c32d23d
[automerger skipped] Merge changes from topic "GameDriver" am: 1d518f422b
...
am: 292904293a -s ours
am skip reason: change_id Ibc0814b6cd1e9bee991624c925456bc330fd93c6 with SHA1 e70d103266 is in history
Change-Id: Id6bbc8eb9bb6d3399c312d97fc6d3ea5fd667025
2019-04-17 14:41:48 -07:00
Colin Cross
56f3f41115
Update SettingsRoboTests for truth 0.42
...
SubjectFactory has been replaced with Subject.Factory.
Subject.getDisplaySubject has been replaced with
actualCustomStringRepresentation.
Bug: 130435731
Test: m checkbuild
Change-Id: I2799badfb79432ec70cb928b77294d6940cfc019
Merged-In: I32cb2fcf6094675f79d2fc24702ef6298a9691e4
2019-04-17 14:37:25 -07:00
TreeHugger Robot
ff7f14a966
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-04-17 21:34:14 +00:00
Peiyong Lin
9f55f7808e
[automerger skipped] Add developer option to opt-in updatable graphics driver. am: 5a92a74f23
...
am: add03324df -s ours
am skip reason: change_id I8c3905fd5c1cbfb3ce12e589b48f57396c7776e3 with SHA1 4a48086728 is in history
Change-Id: I6301f613fd796a1d08ed7f00dc350b3a60fab8fe
2019-04-17 14:20:04 -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
Peiyong Lin
292904293a
Merge changes from topic "GameDriver"
...
am: 1d518f422b
Change-Id: I6e87de41a3ccb3e06dbbca44c797a4a16e123087
2019-04-17 14:05:24 -07:00
Peiyong Lin
add03324df
Add developer option to opt-in updatable graphics driver.
...
am: 5a92a74f23
Change-Id: Ib73af7ac9e9e4e33d8a5eca24a5b76f60af77132
2019-04-17 14:04:05 -07:00