Commit Graph

17200 Commits

Author SHA1 Message Date
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
Julia Reynolds
540e40abef Merge "Updates to main notification page" into qt-dev am: 51d16f2368
am: ef5d654d53

Change-Id: I4a22ccba2c4d7e348ca481319dc180adc1adf9f2
2019-04-18 18:36:08 -07:00
Julia Reynolds
ef5d654d53 Merge "Updates to main notification page" into qt-dev
am: 51d16f2368

Change-Id: Ie7ca2cf7ed6ee0144820e360903345cb48c0a4b4
2019-04-18 18:11:47 -07:00
TreeHugger Robot
51d16f2368 Merge "Updates to main notification page" into qt-dev 2019-04-19 00:57:32 +00: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
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
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
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
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
f63bdb8b6b Merge "Make fingerprint illustrations single color" into qt-dev 2019-04-18 19:38:34 +00: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
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
Julia Reynolds
e51128f151 Updates to main notification page
String updates, images, reordering

Test: manual
Bug: 123899489
Change-Id: Ib7658e427c4868d954dd4cce3779588baaf5a02e
2019-04-18 14:46:55 -04:00
TreeHugger Robot
8ca49b5764 Merge "Finalize the adaptive sleep icon" into qt-dev 2019-04-18 18:42:46 +00: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
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
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
Jonathan Scott
ed701572d7 Don't show policy transparency UI for cross-profile setting.
Also removes the switch if cross-profile calendar is disabled by admin.

Test: atest ManagedProfileSettingsTest
Fixes: 123930863
Change-Id: Ieeb9266e8833d7ca730fedb5e947b03ec7d18d3c
2019-04-18 11:31:50 +00: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
c45b514054 Merge "Tweak enrollment intro layout" into qt-dev am: 3683a688f7
am: 8abe1f7c7d

Change-Id: I5e44da3cdcf7294c04c8e780620957b91f33b590
2019-04-17 23:52:43 -07:00
cosmohsieh
df7f0ac0f6 Merge "[PasspointV2] Set summary of saved networks preference" into qt-dev am: bb00e4c028
am: bef62366a9

Change-Id: I6aab90a1d3f4b911553c998fd272d5b20d984381
2019-04-17 23:29:26 -07:00
Selim Cinek
3491c61e2c Merge "Updated strings for dynamic privacy" into qt-dev am: 9f374307c5
am: db22260726

Change-Id: I4331fdbf4018d225f1deb2df1f94d99174dd88d9
2019-04-17 22:15:34 -07:00
Fan Zhang
ea06424be0 Merge "Remove on/off subtext from gesture preferencecontrollers" into qt-dev am: f6f4ae6e1c
am: 62b8d64bbc

Change-Id: Ia871ec5f8bd0df2990339d41d73b8f28c92e5f58
2019-04-17 22:13:47 -07:00
Kevin Chyn
8abe1f7c7d Merge "Tweak enrollment intro layout" into qt-dev
am: 3683a688f7

Change-Id: Id76defc6138c9fdddeb3c90343e7b4bb12bf556a
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
joshmccloskey
089e8e5a30 Merge "Updated ConfirmDeviceCredential strings" into qt-dev am: f90c24d194
am: 9c5669b802

Change-Id: Ia6021a40c91217b7bdb0ec95cb5d5a2f2badd9bb
2019-04-17 20:55:36 -07:00
cosmohsieh
bef62366a9 Merge "[PasspointV2] Set summary of saved networks preference" into qt-dev
am: bb00e4c028

Change-Id: I537acf599d704a1aa1a5ae21e5cbd4aba15728e4
2019-04-17 18:27:22 -07:00
Selim Cinek
db22260726 Merge "Updated strings for dynamic privacy" into qt-dev
am: 9f374307c5

Change-Id: I2de918bb6e5ea7e7c116014d9c4c07e6670d950b
2019-04-17 18:03:42 -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

Change-Id: I3961ec0da3fb934d581e26c34ef4136d26b28417
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
f6f4ae6e1c Merge "Remove on/off subtext from gesture preferencecontrollers" into qt-dev 2019-04-18 00:29:33 +00:00
Alex Salo
18cc79af29 Finalize the adaptive sleep icon
Bug: 129352433
Test: manually

Change-Id: I00cf2e5e7e8a9ebd60d9aa4e9047c9cd04ec16c7
2019-04-17 17:16:00 -07:00
Fan Zhang
57f18af554 Remove on/off subtext from gesture preferencecontrollers
The toggle switch next to the subtitle already shows on/off clearly.

Fixes: 130652619
Fixes: 130652843
Fixes: 130653459
Fixes: 130653297
Test: robo
Change-Id: Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5
2019-04-17 23:49:25 +00:00
joshmccloskey
9c5669b802 Merge "Updated ConfirmDeviceCredential strings" into qt-dev
am: f90c24d194

Change-Id: I37c1da95d23cb91127ccaf7e9f3b792737457124
2019-04-17 15:25:57 -07:00
TreeHugger Robot
ff7f14a966 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-04-17 21:34:14 +00:00
TreeHugger Robot
f90c24d194 Merge "Updated ConfirmDeviceCredential strings" into qt-dev 2019-04-17 21:13:41 +00:00