Steve Elliott
a818dd47ca
Merge "Remove info footer in global actions panel settings" into qt-dev am: b731f4d5b9
am: fba21ebbd2
...
am: f3a074d3b4
Change-Id: I523c8051375fcbaaf545e51f0feeab8548c83e62
2019-05-24 16:37:15 -07:00
Julia Reynolds
642f5aeee8
Merge "Config notifs page updates" into qt-dev am: 1c83c08289
am: 4679c46a8a
...
am: 7528ab396e
Change-Id: Iecf21ae784fcf82b31a7ccbf4fe52e8950709996
2019-05-24 06:38:22 -07:00
Mill Chen
2321b1037f
Merge "Revert "Revert "Update dialog background color for dark theme""" into qt-dev am: ef0f8a4dab
am: 388cca892a
...
am: fa23fcc795
Change-Id: Ic888037f538b15935e69149d01cfd8fa2eb31dbc
2019-05-24 06:30:15 -07:00
Mill Chen
30298cdd63
Merge "Revert "Update dialog background color for dark theme"" into qt-dev am: 69faee7358
am: ab98f12e68
...
am: ba572939ba
Change-Id: I87e4da36ac286e8bfeb3c494075909f0e01a9776
2019-05-24 06:29:02 -07:00
Steve Elliott
f3a074d3b4
Merge "Remove info footer in global actions panel settings" into qt-dev am: b731f4d5b9
...
am: fba21ebbd2
Change-Id: I2706d002c8af41c411643fe851ef844c5f9d935a
2019-05-23 08:52:45 -07:00
Steve Elliott
fba21ebbd2
Merge "Remove info footer in global actions panel settings" into qt-dev
...
am: b731f4d5b9
Change-Id: I7890695180fb191d58e5754e5baab032c82964b0
2019-05-23 08:39:46 -07:00
Steve Elliott
b731f4d5b9
Merge "Remove info footer in global actions panel settings" into qt-dev
2019-05-23 15:25:40 +00:00
Julia Reynolds
7528ab396e
Merge "Config notifs page updates" into qt-dev am: 1c83c08289
...
am: 4679c46a8a
Change-Id: Iad70e94b3fa7bc65826c755ece8772b6a4c7e0d2
2019-05-22 15:13:32 -07:00
Steve Elliott
2c293a2455
Remove info footer in global actions panel settings
...
Bug: 133332405
Test: manual
Change-Id: I8b7eed5ce3b4b585b0940888ef7c7413617e90dd
2019-05-22 15:38:00 -04:00
Julia Reynolds
4679c46a8a
Merge "Config notifs page updates" into qt-dev
...
am: 1c83c08289
Change-Id: I81339b13cb9cb222e324be4ff55214fc07966376
2019-05-22 11:05:38 -07:00
TreeHugger Robot
1c83c08289
Merge "Config notifs page updates" into qt-dev
2019-05-22 17:30:30 +00:00
Julia Reynolds
4fe79c266e
Config notifs page updates
...
- Remove unused settings
- Regroup and combine lockscreen settings. The original
lockscreen controller is used in other places (SUW and privacy)
and so it's left untouched for those uses for now.
Test: atest
Bug: 132971502
Change-Id: Ic82817ff98cab27ca35b9488ae2e0eb6922a18e8
2019-05-22 12:00:49 -04:00
Mill Chen
fa23fcc795
Merge "Revert "Revert "Update dialog background color for dark theme""" into qt-dev am: ef0f8a4dab
...
am: 388cca892a
Change-Id: I81afb0ca38b57e72fa1f7690ef654b3d69dc790f
2019-05-22 07:24:48 -07:00
Mill Chen
ba572939ba
Merge "Revert "Update dialog background color for dark theme"" into qt-dev am: 69faee7358
...
am: ab98f12e68
Change-Id: Ia7916a416bb207e3741f5198ab110fb0de3f724c
2019-05-22 07:21:06 -07:00
Mill Chen
388cca892a
Merge "Revert "Revert "Update dialog background color for dark theme""" into qt-dev
...
am: ef0f8a4dab
Change-Id: I4b0c4999433203dfc76f42d12ae0b47bf6a0d0a8
2019-05-22 00:46:16 -07:00
Mill Chen
ab98f12e68
Merge "Revert "Update dialog background color for dark theme"" into qt-dev
...
am: 69faee7358
Change-Id: Ib6439a8a85383b6171a98474be18e30d56ea2b88
2019-05-22 00:39:46 -07:00
Mill Chen
ef0f8a4dab
Merge "Revert "Revert "Update dialog background color for dark theme""" into qt-dev
2019-05-22 05:21:21 +00:00
TreeHugger Robot
69faee7358
Merge "Revert "Update dialog background color for dark theme"" into qt-dev
2019-05-22 04:43:09 +00:00
Badhri Jagan Sridharan
0f058e362e
Merge "Help URI for USB contaminant dialog" into qt-dev am: 83c4ce4a48
am: 50ad7da280
...
am: b6962d022d
Change-Id: Id91d6e2692122f2773f4fb7cc55d3f0ddecea698
2019-05-21 12:43:41 -07:00
Kevin Chyn
b907ffa7ed
Merge "Update strings" into qt-r1-dev am: 9f17f84a10
...
am: b03f2e5183
Change-Id: Id131b1518ded7aa652c749f3094d4ddab629dec4
2019-05-21 11:19:00 -07:00
Badhri Jagan Sridharan
b6962d022d
Merge "Help URI for USB contaminant dialog" into qt-dev am: 83c4ce4a48
...
am: 50ad7da280
Change-Id: Iff3652636ed7d61ceacec63d7261cf90bacaf8e6
2019-05-21 10:21:19 -07:00
TreeHugger Robot
75867441a1
Merge "Update string"
2019-05-21 17:14:24 +00:00
Kevin Chyn
b03f2e5183
Merge "Update strings" into qt-r1-dev
...
am: 9f17f84a10
Change-Id: I5f063a2fd4f069f616da022f65e5bac416296b55
2019-05-21 09:35:46 -07:00
timhypeng
c82962b432
Update string
...
- merge title into body text
Bug: 131914743
Test: make -j50 RunSettingsRoboTests
Change-Id: I5298dbcc28f8ecb97f714c948cda12e040bfd391
2019-05-21 07:10:19 +00:00
Arc Wang
8e3c49123d
[Wi-Fi DPP] Refine Wi-Fi DPP UI layouts with SUW library
...
1. Use GlifLayout in all fragments
2. Fragments use 32dp icon instead of 48 dp
3. Replace ScrollView & ProgressBar & Header & Footer of original layout with GlifLayout design
4. Remove ActionBar (no more back button on screen top)
Bug: 129021867
Test: manual
Change-Id: I2fda48cb7f7819b2c8dd85c10d39e1f187463bd8
2019-05-21 13:59:39 +08:00
Badhri Jagan Sridharan
50ad7da280
Merge "Help URI for USB contaminant dialog" into qt-dev
...
am: 83c4ce4a48
Change-Id: I57fd9c464ccf72f0002c58466b58f5c3884980eb
2019-05-20 19:51:58 -07:00
Badhri Jagan Sridharan
83c4ce4a48
Merge "Help URI for USB contaminant dialog" into qt-dev
2019-05-21 00:31:45 +00:00
Kevin Chyn
26306c7498
Update strings
...
Bug: 132787143
Test: Builds
Change-Id: I382c84fbeb6ca2c151d6a4fa2f7a3d29d7c72505
2019-05-20 14:54:42 -07:00
Kevin Chang
cf2f505b7d
Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev am: f508ece42d
am: f8baacfe7f
...
am: d77b10c7de
Change-Id: I203137b6481999ca75be10996dac8a9e0fd4a71a
2019-05-18 05:21:30 -07:00
Kevin Chang
d77b10c7de
Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev am: f508ece42d
...
am: f8baacfe7f
Change-Id: Ib84258c2340009a9569e526308fc8114bdd71dea
2019-05-18 01:28:06 -07:00
Kevin Chang
f8baacfe7f
Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev
...
am: f508ece42d
Change-Id: I1c01a995f3cacdd80f5f97bce342dd0ce0907fe2
2019-05-18 01:24:02 -07:00
Kevin Chang
56c4f9f254
Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev
...
am: f508ece42d
Change-Id: I2ea9c4d2afc7c6aaef134159c86ccb50a4467316
2019-05-18 01:24:00 -07:00
Kevin Chang
f508ece42d
Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev
2019-05-18 08:09:43 +00:00
Fan Zhang
9842725a23
Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b
am: bc58c1f129
...
am: b8ac55aec0
Change-Id: I1594f80c15fd663c706164384c463633eedea264
2019-05-17 21:57:36 -07:00
Fan Zhang
b8ac55aec0
Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b
...
am: bc58c1f129
Change-Id: I324f3e67e41646fd673afdacc7ee9e59ec5772ae
2019-05-17 17:11:18 -07:00
Fan Zhang
909b2192cb
Merge changes I06c1bc14,I5415b8ed into qt-dev
...
am: a83638788b
Change-Id: Ied606e581e3c63e9f6fa4f455959caf4b2870edf
2019-05-17 16:43:01 -07:00
Fan Zhang
bc58c1f129
Merge changes I06c1bc14,I5415b8ed into qt-dev
...
am: a83638788b
Change-Id: If774abf9364a66eca020f65a5f2122c1faf5401a
2019-05-17 16:32:11 -07:00
TreeHugger Robot
a83638788b
Merge changes I06c1bc14,I5415b8ed into qt-dev
...
* changes:
Clean up a STOPSHIP string
Fix view overlap in wifi dpp enrollment.
2019-05-17 22:41:26 +00:00
Fan Zhang
1f8cc8f96d
Clean up a STOPSHIP string
...
Bug: 110557011
Test: rebuild
Change-Id: I06c1bc1460cbb47feb6152298151477549a9e411
2019-05-17 13:44:01 -07:00
Joshua Mccloskey
084f457ab8
Merge "Modified string" into qt-r1-dev am: 4a6d3f6403
...
am: a396a8c1ba
Change-Id: I191cc36f99334b4fa9f53aecc905ba68d066b366
2019-05-17 11:50:59 -07:00
joshmccloskey
7a8b7698fd
Added information icon am: 8fd6269f40
...
am: f5cbb30b04
Change-Id: I46d1ee2922e6c3f92b91c74e785ad63584c4e7f6
2019-05-17 11:49:59 -07:00
Kevin Chang
d8927cbabf
Revert "Change string of switchbar and installed service category title"
...
This reverts commit 7eddb0e4dc
.
Reason for revert: There's some side effects with string.
Create a new CL in master branch to fix it.
Bug: 132840332
Change-Id: I17526a06474d25bdb32beda96f5bb6371f0e5ade
2019-05-17 08:38:54 +00:00
Mill Chen
9862f8632a
Revert "Revert "Update dialog background color for dark theme""
...
This reverts commit 77259dc9bb
.
Previously, using a general attribute to change the background color
for alert dialog. It will also impact on the background of other
components. To fix it, we used another attribute to change the dialog
background.
Bug: 132753127
Bug: 132623454
Bug: 129993336
Test: visual
Change-Id: I09091ee8fb45238d0ea94760f2fca5c206299a57
2019-05-17 16:26:10 +08:00
Leon Liao
3d7d5a4c66
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev am: 764b8491e1
am: dfae7fe0e0
...
am: 9eda4b017e
Change-Id: I4e54d9ea6438c44a217faa92988602238f39b5ec
2019-05-17 00:38:05 -07:00
Joshua Mccloskey
a396a8c1ba
Merge "Modified string" into qt-r1-dev
...
am: 4a6d3f6403
Change-Id: I7b16f828ec9618181bbb4c0a178f22b5db592a52
2019-05-16 19:16:15 -07:00
joshmccloskey
f5cbb30b04
Added information icon
...
am: 8fd6269f40
Change-Id: Ic1de71704ff41a7916eb5cd9f87f93b7983f15fe
2019-05-16 19:15:28 -07:00
Joshua Mccloskey
4a6d3f6403
Merge "Modified string" into qt-r1-dev
2019-05-17 02:10:24 +00:00
Badhri Jagan Sridharan
bf5686e5f5
Help URI for USB contaminant dialog
...
Bug: 132737150
Test: build test.
Change-Id: If6ac3b086edaee18cd982ef12220b480d12f5228
2019-05-16 18:08:37 -07:00
joshmccloskey
8fd6269f40
Added information icon
...
Bug: 132820419
Test: Manual.
Change-Id: If67a0ab96e9991f117e0a93c70a77266473b1df8
2019-05-16 19:10:15 +00:00
joshmccloskey
6513beb966
Modified string
...
Fixes: 132650058
Test: Builds.
Change-Id: I41e3b52570ec7e789692a179aaad96320de3db3a
2019-05-16 19:09:28 +00:00