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
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
Sunny Shao
c92708647b
Merge "Let NGA item display above advanced item in the App & Notifications" into qt-dev am: 57da877dde
...
am: d1d9cc59b0
Change-Id: Ifb1d3a21a30a6d08e5f3b94fa9cb38b7d616ec24
2019-04-18 10:19:43 -07:00
Sunny Shao
3a1b207a39
Merge "Remove the duplicated search item" into qt-dev am: 1282390768
...
am: 2fea81c628
Change-Id: I697d1f406f51db9dd35e2cfff966150e43d5fbc0
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
Change-Id: I240e211aac33c64e37bcc8dbcf466143f517663d
2019-04-18 10:17:55 -07:00
pastychang
dc7afc9f0c
Set description textview to fixed id am: f8409db196
...
am: 19b6972384
Change-Id: Ic676c773fb7315dfb68fde2547d6e9d8324cfa1c
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
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