Steve Elliott
a818dd47ca
Merge "Remove info footer in global actions panel settings" into qt-dev am: b731f4d5b9 am: fba21ebbd2
...
am: f3a074d3b4
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
2019-05-24 06:38:22 -07:00
Steve Elliott
f3a074d3b4
Merge "Remove info footer in global actions panel settings" into qt-dev am: b731f4d5b9
...
am: fba21ebbd2
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
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
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
2019-05-22 11:05:38 -07: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
Badhri Jagan Sridharan
0f058e362e
Merge "Help URI for USB contaminant dialog" into qt-dev am: 83c4ce4a48 am: 50ad7da280
...
am: b6962d022d
2019-05-21 12:43:41 -07:00
Kevin Chyn
b907ffa7ed
Merge "Update strings" into qt-r1-dev am: 9f17f84a10
...
am: b03f2e5183
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
2019-05-21 10:21:19 -07:00
Kevin Chyn
b03f2e5183
Merge "Update strings" into qt-r1-dev
...
am: 9f17f84a10
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
Badhri Jagan Sridharan
50ad7da280
Merge "Help URI for USB contaminant dialog" into qt-dev
...
am: 83c4ce4a48
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
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
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
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
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
2019-05-17 21:57:36 -07:00
Fan Zhang
b8ac55aec0
Merge changes I06c1bc14,I5415b8ed into qt-dev am: a83638788b
...
am: bc58c1f129
2019-05-17 17:11:18 -07:00
Fan Zhang
909b2192cb
Merge changes I06c1bc14,I5415b8ed into qt-dev
...
am: a83638788b
2019-05-17 16:43:01 -07:00
Fan Zhang
bc58c1f129
Merge changes I06c1bc14,I5415b8ed into qt-dev
...
am: a83638788b
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
2019-05-17 11:50:59 -07:00
joshmccloskey
7a8b7698fd
Added information icon am: 8fd6269f40
...
am: f5cbb30b04
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
2019-05-17 08:38:54 +00:00
Leon Liao
3d7d5a4c66
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev am: 764b8491e1 am: dfae7fe0e0
...
am: 9eda4b017e
2019-05-17 00:38:05 -07:00
Joshua Mccloskey
a396a8c1ba
Merge "Modified string" into qt-r1-dev
...
am: 4a6d3f6403
2019-05-16 19:16:15 -07:00
joshmccloskey
f5cbb30b04
Added information icon
...
am: 8fd6269f40
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
Kevin Chyn
3ba458c567
Merge "Update footer buttons depending on entry point" into qt-dev am: 7411ce155d am: 71f07614b9
...
am: be969e7d6b
2019-05-16 09:32:36 -07:00
Kevin Chyn
75fdf1dc0c
Merge "Update enroll to match mocks" into qt-dev am: dbe4384909 am: a4edd2b9a2
...
am: 4310498646
2019-05-16 09:27:49 -07:00
Leon Liao
9eda4b017e
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev am: 764b8491e1
...
am: dfae7fe0e0
2019-05-16 07:50:37 -07:00
Leon Liao
e51e69284c
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev
...
am: 764b8491e1
2019-05-16 06:11:43 -07:00
Leon Liao
764b8491e1
Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev
2019-05-16 13:02:56 +00:00
Leon Liao
d741850f0c
Modify Accessibility Setting UI for timeout feature
...
Using single timeout setting page instead of current two timeout pages
to keep the user experience simple and reduce confusion.
Current timeout page & API:
'Time to take action'
-- Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS
'Time to read'
-- Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS
New timeout page & API:
'Time to take action(Accessibility timeout)'
-- Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS
-- Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS
Bug: 132247225
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AccessibilityTimeoutControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AccessibilitySettingsTest
Change-Id: I0b69682425324d3b1e0ff3f7b6e2c299b60cd215
2019-05-16 18:58:50 +08:00
Kevin Chyn
be969e7d6b
Merge "Update footer buttons depending on entry point" into qt-dev am: 7411ce155d
...
am: 71f07614b9
2019-05-15 23:24:28 -07:00
Kevin Chyn
4310498646
Merge "Update enroll to match mocks" into qt-dev am: dbe4384909
...
am: a4edd2b9a2
2019-05-15 22:51:37 -07:00
Kevin Chyn
931b2dbf09
Merge "Update footer buttons depending on entry point" into qt-dev
...
am: 7411ce155d
2019-05-15 19:01:31 -07:00
Kevin Chyn
7411ce155d
Merge "Update footer buttons depending on entry point" into qt-dev
2019-05-16 01:24:28 +00:00
Kevin Chyn
2ac89c87c6
Update footer buttons depending on entry point
...
Bug: 130917883
Test: Manual
Change-Id: I8954f782dc26d0ceb6f55a9efe29c3e1b290c6bd
2019-05-15 18:03:26 -07:00
Kevin Chyn
e70836257c
Merge "Update enroll to match mocks" into qt-dev
...
am: dbe4384909
2019-05-15 17:27:51 -07:00
