Commit Graph

12345 Commits

Author SHA1 Message Date
Matthew Fritze
53c8d6c2b2 Merge "Location summary is no longer indexed" into oc-dev
am: fed6e817a5

Change-Id: Id776317a3925920652677ec884be7b9bf73e90d3
2017-05-30 20:38:57 +00:00
Daniel Sheng
64c3677169 Merge "Tweaked camera lift trigger suggestion summary." 2017-05-30 20:36:31 +00:00
TreeHugger Robot
fed6e817a5 Merge "Location summary is no longer indexed" into oc-dev 2017-05-30 20:24:23 +00:00
Matthew Fritze
36653892d4 Add related assist-gesture keywords
Wake squeeze and alarm gestures are for settings under
development.

Bug: 62191990
Test: string changes
Change-Id: Iac22a9ab9e63f1e3d97f62d3c470cf07b5da3636
2017-05-30 13:11:51 -07:00
TreeHugger Robot
5d2377f66a Merge "Disallow adding/editing dun APNs unless allowed by carrier." 2017-05-30 19:38:30 +00:00
Fan Zhang
d35f90c289 Extend single line summary preference to multi line.
also updated some strings char limit.

Change-Id: Ie068ecc410bb8211b4cd5e32a5539c824c48040f
Fix: 36413664
Fix: 62079108
Test: make RunSettingsRoboTests
2017-05-30 11:48:20 -07:00
Daniel Sheng
501963640a Tweaked camera lift trigger suggestion summary.
Bug: 62190621
Test: manual

Updating camera lift trigger strings based on dogfood feedback.

Change-Id: I27fe0f35db4f979c3bc5580f03d2c3c55dc54e67
2017-05-30 10:59:31 -07:00
Matthew Fritze
a223355c8f Location summary is no longer indexed
Change-Id: I794e52b2f18e6e79033fbdaf2643209714b88025
Fixes: 38254258
Test: Search "mode" -> no summary text
2017-05-30 09:58:55 -07:00
Hugo Benichi
484140ba6e Wifi details page: sign-in uses primary color
Test: tested with nearby captive portals
Bug: 36203355
Bug: 36656914
Change-Id: I726f1226862150ba6875c20f919df91ca8043335
2017-05-29 22:22:27 +09:00
TreeHugger Robot
61eb68dae9 Merge "Update recently opened app string and "see all" summary" 2017-05-27 00:13:02 +00:00
Fan Zhang
83365ec6ea Update recently opened app string and "see all" summary
Change-Id: I84a01f01ac1c685db87970c3137f30ba58c800b3
Fix: 62040104
Test: make RunSettingsRoboTests
2017-05-26 15:30:57 -07:00
Christine Franks
94be10a820 Merge "Align settings seekbar to match other preferences" into oc-dev am: 532a88dcd0
am: f51db28428

Change-Id: Ia800103ddfe332c1e1cc2fe50df98d90122fda8a
2017-05-26 20:24:42 +00:00
Christine Franks
f51db28428 Merge "Align settings seekbar to match other preferences" into oc-dev
am: 532a88dcd0

Change-Id: I32e55dbc14a1da1237d7cee061b832524954c56f
2017-05-26 20:18:28 +00:00
Christine Franks
e85452fc7f Align settings seekbar to match other preferences
Change preference_widget_seekbar_settings start padding to 56dp
to match the updated standard.

Bug: 62104638
Test: manual - verify layout of night display intensity and a11y
TTS sliders.

Change-Id: I3eba7e04f7e6a2a4484e89cac3526dd23275b299
2017-05-26 10:50:06 -07:00
Suprabh Shukla
f0d95eaa56 Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev am: 136a3da4a3
am: 7f550afc37

Change-Id: I9bf4a1d951a8ee6a71fb9f8067d35f5f6877e2e6
2017-05-26 01:31:47 +00:00
Suprabh Shukla
7f550afc37 Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev
am: 136a3da4a3

Change-Id: I82ce91a75cc84ef02ae6beead23195bfdec0234f
2017-05-26 01:18:05 +00:00
Maurice Lam
8df7173043 Change header in choose lock password
Instead of a separate headerText view, change the header in the
GlifLayout directly.

Test: Manual. Existing tests pass
Bug: 38180862
Change-Id: I02d692870f5e2230ccae87a5ac2aee4def8f61af
2017-05-26 01:00:41 +00:00
TreeHugger Robot
136a3da4a3 Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev 2017-05-25 23:18:01 +00:00
Fan Zhang
e8e23081fa Merge "Show setting for work profile lock screen notification" into oc-dev
am: 5bb87f9f34

Change-Id: Ie351c759cd700dc6d4ad28cee65d9106f491a59d
2017-05-25 23:16:54 +00:00
TreeHugger Robot
5bb87f9f34 Merge "Show setting for work profile lock screen notification" into oc-dev 2017-05-25 22:41:07 +00:00
TreeHugger Robot
5c4b1f095e Merge "Show setting for work profile lock screen notification" 2017-05-25 20:37:50 +00:00
Alison Cichowlas
de01ab40a5 Merge "Update notification settings to match Notification Dot branding." into oc-dev am: ed8b39fe60
am: a974b8c595

Change-Id: Ie61557590cdc15e2d03b1e71bbc78def2c60046a
2017-05-25 20:21:48 +00:00
Alison Cichowlas
a974b8c595 Merge "Update notification settings to match Notification Dot branding." into oc-dev
am: ed8b39fe60

Change-Id: I51475f91a6e2de11c909169ebc5280b1c0e768b5
2017-05-25 20:09:22 +00:00
TreeHugger Robot
ed8b39fe60 Merge "Update notification settings to match Notification Dot branding." into oc-dev 2017-05-25 20:06:28 +00:00
Fan Zhang
879f079e04 Show setting for work profile lock screen notification
- Add work profile notification setting to security_lockscreen_setting
- Modify the preference controller to stop hardcode preference keys.

Merged-In: I779590e34c1eca2dab5b62dda473cfa4371fc064
Change-Id: I5966d82f6373b3bf784385423b87fb4d26aecf0e
Fix: 62051309
Fix: 62045663
Test: make RunSettingsRoboTests
2017-05-25 11:49:56 -07:00
Fan Zhang
33c493777b Show setting for work profile lock screen notification
- Add work profile notification setting to security_lockscreen_setting
- Modify the preference controller to stop hardcode preference keys.

cherry-pick of: ag/2315314

Bug: 62051309
Bug: 62045663
Test: make RunSettingsRoboTests
Change-Id: I779590e34c1eca2dab5b62dda473cfa4371fc064
2017-05-25 11:49:10 -07:00
Alison Cichowlas
5fe7b7985c Update notification settings to match Notification Dot branding.
Bug: 38387970
Test: string changes only, manually verified

Change-Id: If4086c9c89bef07a6ce0bb1d2ea4259c6369e93b
2017-05-25 09:38:14 -04:00
Charles He
0b7dfb03c2 Merge "Make failed ConfirmCredential attempts count towards wipe" 2017-05-25 12:35:43 +00:00
TreeHugger Robot
2e283ab634 Merge "Add icons to choose lock dialog" 2017-05-25 04:43:28 +00:00
TreeHugger Robot
939362671b Merge "UI Cleanup on supported links dialog in app info page." 2017-05-25 02:04:36 +00:00
Maurice Lam
35c9abd4af Add icons to choose lock dialog
- Add icons to items in choose lock dialog
- Add title to the dialog
- Update the font size and color to match specs

Test: Manual. Existing tests pass
Bug: 38394440
Change-Id: Ie7ed9944b71fa5ca408ec6898f49cbd36865a1dd
2017-05-24 18:57:48 -07:00
Fan Zhang
0b6f8fad03 UI Cleanup on supported links dialog in app info page.
- Simplify layout file
- Increase paddings

Change-Id: I61b7d9315f74172aeb036ef835de73e268329de5
Fix: 62065754
Test: visual
2017-05-24 16:33:08 -07:00
Fan Zhang
a6f821c015 Tether screen cleanup
am: 20ae31e87c

Change-Id: I5294531666526a05d07db15ff208eedec3504970
2017-05-24 22:48:55 +00:00
Fan Zhang
20ae31e87c Tether screen cleanup
- Add a summary placeholder reserving 2 lines for wifi tether pref
- Replace DividerPreference with regular Preference

Change-Id: I2e0c36f27abe2c17625d00d80c816b526f59a6fd
Fix: 37518463
Test: visual
(cherry picked from commit d80117dcea)
2017-05-24 19:59:15 +00:00
Phil Weaver
be39d57762 Merge "Follow O patterns for a11y settings" 2017-05-24 19:37:41 +00:00
TreeHugger Robot
ba7230e3be Merge "Import translations. DO NOT MERGE" 2017-05-24 19:08:49 +00:00
Phil Weaver
ed5f0951f8 Follow O patterns for a11y settings
Move the summary for the toggled features to a footer.
Make the settings appear as a preference.

Bug: 36780887
Test: Start settings and observe the new UI looks a lot
like the mocks referenced in the bug. Also added unit
test to verify that summary text shows up.

Change-Id: I1d002b194991d0901ecb27198ba5de73bd23a5a9
2017-05-24 10:35:20 -07:00
Matthew Fritze
1dd31158a8 Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev am: ae0886c9f7
am: 934a04509f

Change-Id: Iff239e99df07cf425f650fbdb9cfb72a3fc40182
2017-05-24 17:18:58 +00:00
Matthew Fritze
934a04509f Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev
am: ae0886c9f7

Change-Id: I29ca4bdf7ad579699283fe4adde2ad22439d7ce9
2017-05-24 17:16:01 +00:00
TreeHugger Robot
ae0886c9f7 Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev 2017-05-24 17:12:35 +00:00
TreeHugger Robot
2cd55c1255 Merge "Misc fixes to search and UI." 2017-05-24 01:25:16 +00:00
jackqdyulei
07894014d5 Merge "Update the strings for "show all apps"" into oc-dev am: 4e0f69c10c
am: 6870de6772

Change-Id: I184acec76978463b3d62a6eedadd456ee6fa7a89
2017-05-24 01:01:41 +00:00
jackqdyulei
6870de6772 Merge "Update the strings for "show all apps"" into oc-dev
am: 4e0f69c10c

Change-Id: I86150368f09801e90263fc099d4e0a703029dac2
2017-05-24 00:54:40 +00:00
TreeHugger Robot
4e0f69c10c Merge "Update the strings for "show all apps"" into oc-dev 2017-05-24 00:49:50 +00:00
Suprabh Shukla
21bb9b8c4a Revert "Adding SecureTouchListener to DeviceAdminAdd"
This reverts commit c1f10cb9c6.

Bug: 35056974,
     38306660
Change-Id: I42b8e60f05f57aad1d8851268a6b40dd295d219b
2017-05-24 00:26:05 +00:00
TreeHugger Robot
20748da300 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-24 00:10:59 +00:00
TreeHugger Robot
5a1af58fa0 Merge "Center icons in Settings homepage and search result page." 2017-05-23 23:29:27 +00:00
Matthew Fritze
c9f9961d8d Merge "Remove duplicates in Security Settings" into oc-dev
am: 96a8dffafb

Change-Id: I1e987af06d086fd971e2865d5fa854b58ce0e409
2017-05-23 22:21:18 +00:00
jackqdyulei
3b1a964629 Update the strings for "show all apps"
Bug: 38328724
Test: Screenshot
Change-Id: If48ff26f691795dcf206346af6a9a0be62bbf733
2017-05-23 15:17:41 -07:00
TreeHugger Robot
96a8dffafb Merge "Remove duplicates in Security Settings" into oc-dev 2017-05-23 22:13:38 +00:00