Commit Graph

5598 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Leon Liao
9eda4b017e Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev am: 764b8491e1
am: dfae7fe0e0

Change-Id: I14b955b57ebafbc99a656270c967cd3a7c5417e9
2019-05-16 07:50:37 -07:00
Leon Liao
e51e69284c Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev
am: 764b8491e1

Change-Id: I8074cfd21490785952d180819c34dd383dff6ed3
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

Change-Id: I5ab6c5ddd6246af3e29610a234e58e460bd96a61
2019-05-15 23:24:28 -07:00
Kevin Chyn
4310498646 Merge "Update enroll to match mocks" into qt-dev am: dbe4384909
am: a4edd2b9a2

Change-Id: I50e01bc3a5169a840db2af3c7e836e1a039a0b52
2019-05-15 22:51:37 -07:00
Kevin Chyn
931b2dbf09 Merge "Update footer buttons depending on entry point" into qt-dev
am: 7411ce155d

Change-Id: I70f6b8d6551af985d36b628fbab4218cec1f34c9
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

Change-Id: I8c561725aa3cac2d4d6fd624c8f7be57faa9036f
2019-05-15 17:27:51 -07:00
Kevin Chang
a4a1055d7c Merge "Change string of switchbar and installed service category title" into qt-dev
am: d0c5f2d443

Change-Id: I48c62d62e2b4902adb800e5b62528b13f56ebccf
2019-05-15 17:27:22 -07:00
Kevin Chyn
ceb5aa4514 Update enroll to match mocks
Test: manual
Fixes: 132803438
Change-Id: I99a10e60833a31b71abf8fdbf7e426e9867a1cf5
2019-05-15 12:51:13 -07:00
Kevin Chang
bfed5d1ca1 Merge "Change string of switchbar and installed service category title" into qt-dev
am: d0c5f2d443

Change-Id: I4e8f59bd9c5d0a9b906b4b0bbc05446dc24156ad
2019-05-14 19:50:05 -07:00
Kevin Chang
d0c5f2d443 Merge "Change string of switchbar and installed service category title" into qt-dev 2019-05-15 02:13:09 +00:00
Salvador Martinez
db30782bbf Merge "Fix dark theme and battery saver interaction" into qt-dev
am: ba5964d99d

Change-Id: I83ee0c60e08af8f2166eb3f01a30baa975a86600
2019-05-14 19:12:12 -07:00
Salvador Martinez
ba5964d99d Merge "Fix dark theme and battery saver interaction" into qt-dev 2019-05-15 01:33:08 +00:00
Salvador Martinez
ee5f79edbd Fix dark theme and battery saver interaction
In settings we weren't properly taking into account battery saver
enabled dark theme. This CL makes it so that when battery saver
on we disable the toggle until battery saver is off since
you can't change dark theme in battery saver. Additionally it
adds a message indicating why the toggle was disabled so the
user doesn't get confused.

Test: robotests
Bug: 131913864
Change-Id: I855e429a666098c837650852d1e1355477afa13d
2019-05-14 14:08:24 -07:00
Joshua Mccloskey
1e84e431d8 Merge "Increased char limit for translations" into qt-dev
am: 5513a9bdd1

Change-Id: I4ccf9f83431c4a450d05b9118bb8d35cd6f08328
2019-05-14 12:23:21 -07:00
Joshua Mccloskey
5513a9bdd1 Merge "Increased char limit for translations" into qt-dev 2019-05-14 19:13:11 +00:00
Kevin Chyn
815e1912bf Merge "Update button string to "Start"" into qt-dev
am: 9a252aa6b5

Change-Id: If4db1d8ef03f273641a7afe7869fd85104ddfe45
2019-05-13 22:56:55 -07:00
Kevin Chyn
9a252aa6b5 Merge "Update button string to "Start"" into qt-dev 2019-05-14 05:49:05 +00:00
Kevin Chang
7eddb0e4dc Change string of switchbar and installed service category title
Bug: 122897712
Test: Visual
Change-Id: I4e15ebc8b91c58d24aadb7e665c6692ebcd627a8
2019-05-14 11:47:19 +08:00
joshmccloskey
7e470bf806 Increased char limit for translations
Test: It builds.
Bug: 132638233
Change-Id: Ie7deaf82471c832351af9f25f7b4725b65f3c66a
2019-05-13 19:29:24 -07:00
Kevin Chyn
200dd1b8b3 Update button string to "Start"
Fixes: 132648319

Test: Builds
Change-Id: I05fa1a8d4d24d5ebef95588df64442718bf42c99
2019-05-13 18:23:22 -07:00
Antony Sargent
7e155aa244 Merge "Strings for "Data during calls" preference" into qt-dev
am: 27de8ae098

Change-Id: I25bb3ec44e8e24de51b3b55bb444f2828e05019e
2019-05-13 17:29:28 -07:00
Lifu Tang
cf5deb067f Merge "Revert recent location apps to pre-Q behavior" into qt-dev
am: 3d6bacc731

Change-Id: Iacc48610f25fed5c3598c90c03de58eea26a1135
2019-05-13 17:24:44 -07:00
Mehdi Alizadeh
8ca5e7862a Merge "Update strings for System Navigation settings page" into qt-dev
am: 485b3ad655

Change-Id: I9a6135103076c4ab3cdc815332493f776251fe09
2019-05-13 17:23:29 -07:00
TreeHugger Robot
27de8ae098 Merge "Strings for "Data during calls" preference" into qt-dev 2019-05-14 00:19:07 +00:00
TreeHugger Robot
3d6bacc731 Merge "Revert recent location apps to pre-Q behavior" into qt-dev 2019-05-14 00:07:28 +00:00
Mehdi Alizadeh
485b3ad655 Merge "Update strings for System Navigation settings page" into qt-dev 2019-05-14 00:07:25 +00:00
Lifu Tang
166b54c0f6 Revert recent location apps to pre-Q behavior
- List recent location request instead of location access
- Show in list view instead of app list widget
- Add overflow menu to "see all" page to show/hide system apps

Bug: 124015107
Test: build, flash, and test manually
Change-Id: I78df6d4b13ddf774013e8d819cf343ce012e6b0b
2019-05-13 15:24:09 -07:00
Mehdi Alizadeh
815ed755c3 Update strings for System Navigation settings page
Bug: 130437843
Bug: 128522050
Test: Manual test to verify the right strings in settings app
Change-Id: Id6e589d896be34c98fded3b3fff897840e9d3f4f
2019-05-13 14:31:20 -07:00
Antony Sargent
7d8f015151 Strings for "Data during calls" preference
In some dual-SIM cases, when you have an active voice call using a SIM
that isn't the default one for mobile data, you may not get data
connectivity at all (from any other SIM) due to technical limitations in
the telephony stack. This preference will allow the user to leave data
off for a SIM, but opt in to have data become active only during calls.

Bug: 132114205
Test: n/a
Change-Id: I3e7cdaedd8b685e0fe65221d94f5b426bc95942e
2019-05-13 14:03:48 -07:00
Mady Mellor
34fa757cc9 Merge "Move feature-level Bubble setting into developer options; default to off" into qt-dev
am: 240b227e1f

Change-Id: I899722a6df929c4093a5a74447eb25a610c80308
2019-05-13 11:38:26 -07:00
Mady Mellor
240b227e1f Merge "Move feature-level Bubble setting into developer options; default to off" into qt-dev 2019-05-13 18:18:31 +00:00
Zhi An Ng
3a6d75d7fa Merge "Update string description in SAW unsupported screen" into qt-dev
am: 516bdc20fb

Change-Id: Ie6513a8cb03fa8789ad5d70d9a6d6c14dcb4cf67
2019-05-13 10:13:32 -07:00