Yiwei Zhang
8970fc0622
[automerger skipped] GUP: Add stub UI am: a2754c515b am: 329a5e938e -s ours
...
am: c82b531871c81a03b60e
2019-04-18 18:13:39 -07:00
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
c9f56810ea
Merge "Non-blockable whitelist should only control importance fields" into qt-dev am: 8bfc277f7d
...
am: 6d0c551706
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
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
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
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
Alex Salo
70c9b89aac
Merge "Add correct animation" into qt-dev am: 7ad8c7bc2f
...
am: 4eeacd5e14
2019-04-18 14:56:23 -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
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
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
Maurice Lam
05c0a2d4e9
Merge "Make fingerprint illustrations single color" into qt-dev am: f63bdb8b6b
...
am: b857e83e75
2019-04-18 14:34:04 -07:00
Amin Shaikh
d279f02f1d
Merge "Add Settings keywords for Styles & Wallpaper." into qt-dev am: 670bf45b50
...
am: 01c3f8105f
2019-04-18 13:40:08 -07: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
Alex Salo
18b3385d5f
Merge "Finalize the adaptive sleep icon" into qt-dev am: 8ca49b5764
...
am: fe0d647917
2019-04-18 13:25:48 -07: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
Fan Zhang
87695a5d87
Merge "Move "Build Number" slice to a different controller." into qt-dev am: 95073738ea
...
am: 06321b5568
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
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
134728abf9
Merge "Prevent bad apps from getting Setting Slices" into qt-dev am: 7f9a86d869
...
am: 83eeb1f8d8
2019-04-18 11:04:13 -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
c92708647b
Merge "Let NGA item display above advanced item in the App & Notifications" into qt-dev am: 57da877dde
...
am: d1d9cc59b0
2019-04-18 10:19:43 -07:00
Sunny Shao
3a1b207a39
Merge "Remove the duplicated search item" into qt-dev am: 1282390768
...
am: 2fea81c628
2019-04-18 10:18:50 -07:00
cosmohsieh
bfcff77f70
Merge "[Network Connection] Show full SSID on list item" into qt-dev am: 6e115e4fda
...
am: a33aadd214
2019-04-18 10:17:55 -07:00
pastychang
dc7afc9f0c
Set description textview to fixed id am: f8409db196
...
am: 19b6972384
2019-04-18 10:14:11 -07: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
