Yiwei Zhang
c82b531871
[automerger skipped] GUP: Add stub UI am: a2754c515b
...
am: 329a5e938ec81a03b60e
2019-04-18 17:53:34 -07:00
Yiwei Zhang
329a5e938e
GUP: Add stub UI
...
am: a2754c515b
2019-04-18 17:28:33 -07:00
Julia Reynolds
6d0c551706
Merge "Non-blockable whitelist should only control importance fields" into qt-dev
...
am: 8bfc277f7d
2019-04-18 15:20:17 -07:00
Mill Chen
97afe10730
Merge "Revert "Add robotest modules for Settings"" into qt-dev
...
am: d0dd6d8885
2019-04-18 15:18:51 -07:00
Julia Reynolds
1053e4a798
Merge "Redesign channel listing and channel page" into qt-dev
...
am: 9496bce441
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
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
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
Alex Salo
4eeacd5e14
Merge "Add correct animation" into qt-dev
...
am: 7ad8c7bc2f
2019-04-18 13:39:57 -07:00
TreeHugger Robot
7ad8c7bc2f
Merge "Add correct animation" into qt-dev
2019-04-18 20:26:17 +00:00
lindatseng
35b17ed655
Merge "Fix regression of wrong min value on night display slice" into qt-dev
...
am: 93aee0d99d
2019-04-18 13:24:12 -07:00
Maurice Lam
b857e83e75
Merge "Make fingerprint illustrations single color" into qt-dev
...
am: f63bdb8b6b
2019-04-18 13:16:52 -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
TreeHugger Robot
f63bdb8b6b
Merge "Make fingerprint illustrations single color" into qt-dev
2019-04-18 19:38:34 +00:00
Amin Shaikh
01c3f8105f
Merge "Add Settings keywords for Styles & Wallpaper." into qt-dev
...
am: 670bf45b50
2019-04-18 12:32:55 -07:00
Alex Salo
fe0d647917
Merge "Finalize the adaptive sleep icon" into qt-dev
...
am: 8ca49b5764
2019-04-18 12:23:50 -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
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
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
83eeb1f8d8
Merge "Prevent bad apps from getting Setting Slices" into qt-dev
...
am: 7f9a86d869
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
2019-04-18 10:07:36 -07:00
Sunny Shao
2fea81c628
Merge "Remove the duplicated search item" into qt-dev
...
am: 1282390768
2019-04-18 10:06:41 -07:00
cosmohsieh
a33aadd214
Merge "[Network Connection] Show full SSID on list item" into qt-dev
...
am: 6e115e4fda
2019-04-18 10:05:44 -07:00
pastychang
19b6972384
Set description textview to fixed id
...
am: f8409db196
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
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
2019-04-17 18:27:22 -07:00
Selim Cinek
db22260726
Merge "Updated strings for dynamic privacy" into qt-dev
...
am: 9f374307c5
2019-04-17 18:03:42 -07:00
cosmohsieh
d76317486e
Merge "Implement context menu for ConnectedAccessPointPreference" into qt-dev
...
am: f590d5c617
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
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
2019-04-17 17:25:08 -07:00
