Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,154 Commits 1 Branch 0 Tags
0da520c161bd62af9be884ce6ebdd0cb675ffcfa
Commit Graph

5648 Commits

Author SHA1 Message Date
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
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
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
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
Kevin Chyn
3ba458c567 Merge "Update footer buttons depending on entry point" into qt-dev am: 7411ce155d am: 71f07614b9 
am: be969e7d6b

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

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

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
556422915d Merge "Change string of switchbar and installed service category title" into qt-dev am: d0c5f2d443 
am: bfed5d1ca1

Change-Id: Ic897066e6b9989ff68b5e6b3b2cb2f5ffe56cea9
 2019-05-14 20:24:53 -07:00
Salvador Martinez
1e1b7fb99c Merge "Fix dark theme and battery saver interaction" into qt-dev am: ba5964d99d 
am: db30782bbf

Change-Id: I5d379c04ac030f60fb6dff117adca529661cd9c2
 2019-05-14 19:52:22 -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