Commit Graph

7341 Commits

Author SHA1 Message Date
Lei Yu
5fbde81391 Merge "Add SettingsPolicy to control BT feature" into qt-dev am: 125ab50a55
am: 142ca23949

Change-Id: I7f9b2c921651ba9e6163fb7ecc22db370a52196d
2019-04-19 15:55:15 -07:00
Lei Yu
142ca23949 Merge "Add SettingsPolicy to control BT feature" into qt-dev
am: 125ab50a55

Change-Id: I46f37c9a1ac92bd3e77e2a2f8ff185a72436851e
2019-04-19 13:18:15 -07:00
Lei Yu
125ab50a55 Merge "Add SettingsPolicy to control BT feature" into qt-dev 2019-04-19 19:44:53 +00:00
Linda Tseng
7e8d682188 Merge "Set max num of slices allowed in panel view" into qt-dev am: ae344faf4a
am: 67928018b3

Change-Id: Idbab620c65b8dbd65b721caca3e669f89baeed36
2019-04-19 11:07:16 -07:00
Linda Tseng
67928018b3 Merge "Set max num of slices allowed in panel view" into qt-dev
am: ae344faf4a

Change-Id: Id9ffef1fd7a7007a143661b221dd9d82dc9858b5
2019-04-19 10:36:41 -07:00
Linda Tseng
ae344faf4a Merge "Set max num of slices allowed in panel view" into qt-dev 2019-04-19 17:19:59 +00:00
Julia Reynolds
12712a8358 Merge "Fix broken tests" into qt-dev am: 1115d61c0b
am: 4ca871a8bd

Change-Id: Id1599af2007f7127b65ac6d1ddb4f6bd62899976
2019-04-19 10:02:48 -07:00
hughchen
6e148d336d Merge "Remove all device from preference when BT is disabled" into qt-dev am: e69a25caad
am: 8fcce3e5ca

Change-Id: I26ce994197c1b85e23f00f81227f359e4bd4ed29
2019-04-19 10:01:12 -07:00
Julia Reynolds
4ca871a8bd Merge "Fix broken tests" into qt-dev
am: 1115d61c0b

Change-Id: I16026c2a7306fecb02230d1403f31efd50e297e2
2019-04-19 09:51:37 -07:00
hughchen
8fcce3e5ca Merge "Remove all device from preference when BT is disabled" into qt-dev
am: e69a25caad

Change-Id: I84cb23ab372c897121ea239aa8f1f4c337f5d59d
2019-04-19 09:46:50 -07:00
TreeHugger Robot
1115d61c0b Merge "Fix broken tests" into qt-dev 2019-04-19 16:32:15 +00:00
TreeHugger Robot
e69a25caad Merge "Remove all device from preference when BT is disabled" into qt-dev 2019-04-19 16:25:26 +00:00
Julia Reynolds
9c5a19319b Fix broken tests
Test: robo tests
Fixes: 130871450
Change-Id: If7b01147f5680392c7635f3a3b4e558aa56a633e
2019-04-19 10:03:40 -04:00
Stanley Wang
11e6eb756b Merge "Hardware version should should support copy action" into qt-dev am: 7f46c8714e
am: cb525e5fad

Change-Id: I10bcce4a113cc1ba759e9da33606f24073491302
2019-04-19 00:45:47 -07:00
Stanley Wang
cb525e5fad Merge "Hardware version should should support copy action" into qt-dev
am: 7f46c8714e

Change-Id: I1b397e2c12fc0b3a07d5382b70b8e4dd08ede20a
2019-04-19 00:40:46 -07:00
Stanley Wang
7f46c8714e Merge "Hardware version should should support copy action" into qt-dev 2019-04-19 07:35:46 +00:00
Jonathan Scott
a589d0aa6e Merge "Don't show policy transparency UI for cross-profile setting." into qt-dev am: 6e2fce6fdc
am: d760559474

Change-Id: I3fd6add4c45d5617b10512ba5c602f9d5f772945
2019-04-18 23:00:34 -07:00
Jonathan Scott
d760559474 Merge "Don't show policy transparency UI for cross-profile setting." into qt-dev
am: 6e2fce6fdc

Change-Id: Ia1b28b4dce00022ff1dfd57894f8d9b18108a6ad
2019-04-18 22:46:17 -07:00
TreeHugger Robot
6e2fce6fdc Merge "Don't show policy transparency UI for cross-profile setting." into qt-dev 2019-04-19 05:24:24 +00:00
Stanley Wang
0fdf78cff6 Hardware version should should support copy action
Implement isSliceable method in HardwareRevisionPreferenceController

Fixes: 130653205
Test: manual and robotests
Change-Id: Ib872b9625c2c1984ff7b036fef5b3145c7fd8d2a
2019-04-19 11:52:32 +08:00
Cn Chen
7e379b70c6 Merge "Update fingerprint suggestion enable state when back pressed" into qt-dev am: 9588c9003f
am: 7b2f016be8

Change-Id: I3df778d24dfb31ae0eaab29e0e9597c05f675759
2019-04-18 19:34:35 -07:00
Cn Chen
7b2f016be8 Merge "Update fingerprint suggestion enable state when back pressed" into qt-dev
am: 9588c9003f

Change-Id: I37cb68e0df1abb76792122e12c91636ecf24644b
2019-04-18 19:08:01 -07:00
hughchen
d39fbe0f23 Remove all device from preference when BT is disabled
The issue is happened when BT is disabled then navigate to
"Connected devices". BluetoothDeviceUpdater didn't update
UI when BT is disabled. Remove all device from preference when
BT is disabled.

Bug: 80090956
Test: make -j42 RunSettingsRoboTests
Change-Id: Ia1fd8cfbcf95d712a1a702fdf101ff98186b76cd
2019-04-19 09:50:03 +08:00
Cn Chen
9588c9003f Merge "Update fingerprint suggestion enable state when back pressed" into qt-dev 2019-04-19 01:37:13 +00: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
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
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
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
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
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
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
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
Lei Yu
15899e8b0e Add SettingsPolicy to control BT feature
Fixes: 130302238
Test: RunSettingsRoboTests
Change-Id: I7e1bf55c476f8e4d3dec7a7dfc0e8d44e5bd53ae
2019-04-18 11:31:05 -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