Commit Graph

7620 Commits

Author SHA1 Message Date
Badhri Jagan Sridharan
f4cc1b5e79 Merge "Help URI for USB contaminant dialog" into qt-dev
am: 83c4ce4a48

Change-Id: I4e504e303edb8fab9c48aed458886dce709b0eab
2019-05-21 09:48:53 -07:00
Kevin Chyn
b03f2e5183 Merge "Update strings" into qt-r1-dev
am: 9f17f84a10

Change-Id: I5f063a2fd4f069f616da022f65e5bac416296b55
2019-05-21 09:35:46 -07: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
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
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
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
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
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
Mill Chen
77259dc9bb Revert "Update dialog background color for dark theme"
This reverts commit 3032628269.

Reason for revert: This will also change the background color of other components within dialog.

Bug: 132753127
Bug: 132623454
Test: visual
Change-Id: I59d4731e84e8d516a01780c4cce70b2d86208098
2019-05-16 14:46:52 +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
Fan Zhang
d32e9b5229 Merge "Revert "Revert "Make subsettings display edge-to-edge""" into qt-dev
am: 17521d0ac7

Change-Id: Id702a72ce6adc1dbb20c4f00c0b16cf1ff5ef603
2019-05-14 17:41:06 -07:00
TreeHugger Robot
17521d0ac7 Merge "Revert "Revert "Make subsettings display edge-to-edge""" into qt-dev 2019-05-15 00:01:30 +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
Fan Zhang
b4b7725937 Revert "Revert "Make subsettings display edge-to-edge""
This reverts commit 9e98b8cf0f.

We have to set clipToPadding false on scrollView to make it extend below
navbar. But the side effect is it stops clipping to padding. So it
overlaps with sibling views. In this case anything pinned on top of
screen (switchbar, pinned header for most UIs, and preview indicator for
font size page).

To fix them:
1. in preview pages, just revert back to clipTo*. Their UI doesn't scroll
   so it they don't need to special clip flag to begin with.
2. For pinned to top headers, we need to change the "z-order" by setting
   elevation and make sure background is not transparent.

Fixes: 132182711
Fixes: 132672399
Test: visually on normal screen, font size scree, wifi main setting UI,
      wifi data usage screen

Reason for revert: Rollforward with fix.

Change-Id: Ib6f7c4167b9a680a336f2a7310d82340094d3aac
2019-05-14 13:48:12 -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
Fan Zhang
7db72f0ef1 Merge "Revert "Make subsettings display edge-to-edge"" into qt-dev
am: 9a51ede665

Change-Id: I1c152ddacaf43fa035ebf04159b9cf151cc11292
2019-05-14 11:10:40 -07:00
Fan Zhang
9a51ede665 Merge "Revert "Make subsettings display edge-to-edge"" into qt-dev 2019-05-14 17:17:26 +00:00
Fan Zhang
9e98b8cf0f Revert "Make subsettings display edge-to-edge"
This reverts commit c2a85a374d.

Bug: 132672399
Bug: 132182711
Test: n/a

Reason for revert: b/132672399

Change-Id: Icb34ae5b16b7a32215fe2c1a5f0d0d028c91b2ca
2019-05-14 16:31:08 +00:00
Cn Chen
b5b3699f4c Merge "Font size page support light theme in deferred setup" into qt-dev
am: 421a05a6a9

Change-Id: I3646918b1c52d2962ef736699c2198be0f42613f
2019-05-14 00:32:35 -07:00
Cn Chen
421a05a6a9 Merge "Font size page support light theme in deferred setup" into qt-dev 2019-05-14 07:18:03 +00:00