Yiwei Zhang
f2a289b8e1
[automerger skipped] GUP: Add global switch for all apps am: 75548c4a33
am: c37c07ba99
-s ours
...
am: 6047cf86a4
-s ours
am skip reason: change_id Iebf6c5eceb323d03332169eeb0a4a0d1f9c2c493 with SHA1 15bb7944a5
is in history
Change-Id: I82f1d71deb2929507ffd829259a7ea65ee2f2397
2019-04-18 18:16:26 -07:00
Yiwei Zhang
a0e4a01a46
[automerger skipped] GUP: Fixed some typos and update some values am: d0bbbfeeea
am: e506f9d7f5
-s ours
...
am: 536542927e
-s ours
am skip reason: change_id I7b1e42cd3a823a72bcd6d61b26c4954c237ff6d0 with SHA1 5735199641
is in history
Change-Id: I63fb2c2acf5aa417b2acd1c251fdf8ed0844f583
2019-04-18 18:15:33 -07:00
Yiwei Zhang
46bb2bf6a6
[automerger skipped] GUP: Display a list of Apps and dialogs am: dc62028e85
am: f0b7bf7cca
-s ours
...
am: 09a45e5cd0
-s ours
am skip reason: change_id Ide4934c0dd3901532723e77e74663e5a7b639026 with SHA1 83c030f1cd
is in history
Change-Id: Ib574f9b0bb08b06143544ea56f2e49122526f98a
2019-04-18 18:14:29 -07:00
Yiwei Zhang
8970fc0622
[automerger skipped] GUP: Add stub UI am: a2754c515b
am: 329a5e938e
-s ours
...
am: c82b531871
-s ours
am skip reason: change_id I1f7cc66790e1d1e1de5113e28a055ec5d1679013 with SHA1 c81a03b60e
is in history
Change-Id: I17416c245a6a93f6c763ccff169761ee023dd790
2019-04-18 18:13:39 -07:00
Yiwei Zhang
6047cf86a4
[automerger skipped] GUP: Add global switch for all apps am: 75548c4a33
...
am: c37c07ba99
-s ours
am skip reason: change_id Iebf6c5eceb323d03332169eeb0a4a0d1f9c2c493 with SHA1 15bb7944a5
is in history
Change-Id: Ib866bd29edf02141b3b9c7db6401fbcd9f2b837c
2019-04-18 17:55:27 -07:00
Yiwei Zhang
536542927e
[automerger skipped] GUP: Fixed some typos and update some values am: d0bbbfeeea
...
am: e506f9d7f5
-s ours
am skip reason: change_id I7b1e42cd3a823a72bcd6d61b26c4954c237ff6d0 with SHA1 5735199641
is in history
Change-Id: I0642e07bed6da847b16738f7e14f7aec2cb0632a
2019-04-18 17:54:49 -07:00
Yiwei Zhang
09a45e5cd0
[automerger skipped] GUP: Display a list of Apps and dialogs am: dc62028e85
...
am: f0b7bf7cca
-s ours
am skip reason: change_id Ide4934c0dd3901532723e77e74663e5a7b639026 with SHA1 83c030f1cd
is in history
Change-Id: I34b7e2c2ef9afba6baee101ddc29ba7b9e022be0
2019-04-18 17:54:12 -07:00
Yiwei Zhang
c82b531871
[automerger skipped] GUP: Add stub UI am: a2754c515b
...
am: 329a5e938e
-s ours
am skip reason: change_id I1f7cc66790e1d1e1de5113e28a055ec5d1679013 with SHA1 c81a03b60e
is in history
Change-Id: I8be0f7ee8f61a455d1503554101e18b7b15c7ce8
2019-04-18 17:53:34 -07:00
Yiwei Zhang
c37c07ba99
GUP: Add global switch for all apps
...
am: 75548c4a33
Change-Id: I12d7ff1e9959eb3e5e88c9f9e9f8bab2d88f7e95
2019-04-18 17:35:09 -07:00
Yiwei Zhang
e506f9d7f5
GUP: Fixed some typos and update some values
...
am: d0bbbfeeea
Change-Id: I0d23b978d62c2c0eaced50c878e874844d7862db
2019-04-18 17:33:07 -07:00
Yiwei Zhang
f0b7bf7cca
GUP: Display a list of Apps and dialogs
...
am: dc62028e85
Change-Id: I3d13512fda47d401444f665636d83dff2fb23882
2019-04-18 17:30:54 -07:00
Yiwei Zhang
329a5e938e
GUP: Add stub UI
...
am: a2754c515b
Change-Id: Ia9d6d44d106b7dc3b54218921039e9ee03967533
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
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
Alex Salo
70c9b89aac
Merge "Add correct animation" into qt-dev am: 7ad8c7bc2f
...
am: 4eeacd5e14
Change-Id: I925150e7a7c008632e9c3b7d65b804fc8c8140ce
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
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
Maurice Lam
05c0a2d4e9
Merge "Make fingerprint illustrations single color" into qt-dev am: f63bdb8b6b
...
am: b857e83e75
Change-Id: I86182922a061cf4d730ba8359913b26b1aad1ab6
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
Change-Id: Ia7eb2a0b5a26045215012d216cf93403e70a5db7
2019-04-18 13:40:08 -07:00
Alex Salo
4eeacd5e14
Merge "Add correct animation" into qt-dev
...
am: 7ad8c7bc2f
Change-Id: I5560dce9ebcce1c853fdcea32922c7645bd789ea
2019-04-18 13:39:57 -07:00
Yiwei Zhang
75548c4a33
GUP: Add global switch for all apps
...
Bug: 119221883
Test: make RunSettingsRoboTests
Change-Id: Iebf6c5eceb323d03332169eeb0a4a0d1f9c2c493
Merged-In: Iebf6c5eceb323d03332169eeb0a4a0d1f9c2c493
2019-04-18 13:38:01 -07:00
Yiwei Zhang
d0bbbfeeea
GUP: Fixed some typos and update some values
...
Bug: 119221883
Test: make RunSettingsRoboTests
Change-Id: I7b1e42cd3a823a72bcd6d61b26c4954c237ff6d0
Merged-In: I7b1e42cd3a823a72bcd6d61b26c4954c237ff6d0
2019-04-18 13:37:56 -07:00
Yiwei Zhang
dc62028e85
GUP: Display a list of Apps and dialogs
...
1) Add preference controller for gup dashboard and add list preferences
for each entry of the apps
2) Add gup dashboard page to search index
3) Add comprehensive tests for GupPreferenceController
Bug: 119221883
Test: make RunSettingsRoboTests
Change-Id: Ide4934c0dd3901532723e77e74663e5a7b639026
Merged-In: Ide4934c0dd3901532723e77e74663e5a7b639026
2019-04-18 13:37:44 -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
Change-Id: I79cbd94575afe6a950da6ad1a258369e39042503
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
Change-Id: I153d69e5cc07ab5a2aec7972150a80f706ccdb87
2019-04-18 13:24:12 -07:00
Maurice Lam
b857e83e75
Merge "Make fingerprint illustrations single color" into qt-dev
...
am: f63bdb8b6b
Change-Id: I3c03d6fbfb71e815840729425c0f1946fdc9cb76
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
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
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
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
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