Commit Graph

3918 Commits

Author SHA1 Message Date
TreeHugger Robot
21fc59464b Merge "Bluetooth string changes" 2017-06-01 19:04:07 +00:00
Antony Sargent
e90f29bacf Bluetooth string changes
This includes:
-Title string for device details page
-MAC address string for device details page

Bug: 35876580
Test: make RunSettingsRoboTests
Change-Id: I360996915d1dfa59bbb12f33f42afc4aa0bde64b
2017-06-01 10:28:29 -07:00
TreeHugger Robot
181ea4509a Merge "Update bluetooth strings" 2017-06-01 07:25:59 +00:00
TreeHugger Robot
8306791889 Merge "Remove night display headers and change strings" 2017-06-01 06:45:14 +00:00
Daniel Sheng
b01bf85a15 Merge "Added strings for gesture suggestions" 2017-06-01 05:39:02 +00:00
jackqdyulei
ab1df0bbd3 Update bluetooth strings
Update based on new change in doc:
1. revert "visible as" string
2. change "device mac" string

Bug: 35876580
Test: RunSettingsRoboTests
Change-Id: I8950ed3e2e9c000ab25ea0a3d0d15f69fc075fda
2017-05-31 16:41:33 -07:00
Matthew Fritze
3c666f0b27 Merge "Remove dynamic summary from Security Patch info" into oc-dev am: 564d90faf0
am: 6a50c4555c

Change-Id: Iaf810111f5c4d5e820a0d336eb3029b9474757f3
2017-05-31 22:52:58 +00:00
Doris Ling
a72775a47a Merge "Add new strings to highlight gestures in settings." 2017-05-31 22:47:55 +00:00
TreeHugger Robot
564d90faf0 Merge "Remove dynamic summary from Security Patch info" into oc-dev 2017-05-31 22:41:28 +00:00
TreeHugger Robot
23eca9a2c4 Merge "Update user string for battery" 2017-05-31 21:39:43 +00:00
TreeHugger Robot
10534456ed Merge "Update bluetooth strings in settings" 2017-05-31 21:14:31 +00:00
Daniel Sheng
f12376dda8 Added strings for gesture suggestions
Bug: 62225100
Test: N/A
Change-Id: I77a328746782a02df7a33c720b4d8f2a193419b3
2017-05-31 14:10:19 -07:00
Doris Ling
d3ba08d957 Add new strings to highlight gestures in settings.
- add new title and summary strings for language & input settings.

Bug: 62219660
Test: build
Change-Id: I52a62dad73e2468e7acd3ef47b241cfea6046ad8
2017-05-31 12:59:17 -07:00
jackqdyulei
58575a9803 Update bluetooth strings in settings
This cl contains strings used in bluetooth main page and
pairing page

Bug: 35876580
Test: RunSettingsRoboTests
Change-Id: Ied514e50fc2dcf4b5d9ece49159c9e13def1b0f3
2017-05-31 12:19:58 -07:00
TreeHugger Robot
6af679a4bf Merge "Update summary for Hotspot & Tethering." 2017-05-31 19:09:36 +00:00
Christine Franks
2935f3eb6d Remove night display headers and change strings
Bug: 38362741
Test: manual - looks like what was expected
Change-Id: Ied5ebd2b13a23e799488a476cc08d8f5db4c9ff5
2017-05-31 12:00:29 -07:00
Matthew Fritze
2b562f84b6 Remove dynamic summary from Security Patch info
Change-Id: I96b2e32a101077c58efd56115e70b63e4eb25049
Fixes: 36101902
Test: builds :)
2017-05-31 09:53:07 -07:00
TreeHugger Robot
edf845dc58 Merge "Add related assist-gesture keywords" 2017-05-31 14:55:32 +00:00
Adrian Roos
0e60489bf2 Merge "AOD: Ambient display settings to dedicated settings screen" 2017-05-31 04:25:39 +00:00
Doris Ling
1e914eb875 Update summary for Hotspot & Tethering.
- change summary for Bluetooth tethering and USB tethering to static
text.
- add strings for Wi-Fi hotspot settings page.

Bug: 62069132
Test: manual
Change-Id: Ibc550da33c192c604b65eb75d16c6c15a8b1ff7a
2017-05-30 17:28:06 -07:00
Adrian Roos
e349ec30d8 AOD: Ambient display settings to dedicated settings screen
Bug: 33279975
Test: make RunSettingsRoboTests
Change-Id: I5f3ddf3b3abfc989907293b4a47b78568c01cf9b
2017-05-30 16:42:37 -07:00
TreeHugger Robot
b713d16315 Merge "Add string needed by new device suggestion" 2017-05-30 23:12:19 +00:00
jackqdyulei
f7d07a6296 Update user string for battery
Bug: 37293179
Test: Build
Change-Id: I6589d51e12a59622a8773c808e1c365880921cae
2017-05-30 16:02:33 -07:00
Fan Zhang
66a3d72cf6 Add string needed by new device suggestion
Bug: 62034077
Test: builds
Change-Id: I9059d3507017a1f1ea5b7b0a412834194bffd309
2017-05-30 14:24:10 -07:00
TreeHugger Robot
cf162d1291 Merge "Extend single line summary preference to multi line." 2017-05-30 20:48:18 +00:00
Daniel Sheng
64c3677169 Merge "Tweaked camera lift trigger suggestion summary." 2017-05-30 20:36:31 +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
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
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
TreeHugger Robot
136a3da4a3 Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev 2017-05-25 23:18:01 +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
TreeHugger Robot
ed8b39fe60 Merge "Update notification settings to match Notification Dot branding." into oc-dev 2017-05-25 20:06:28 +00: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
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
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
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
jackqdyulei
3b1a964629 Update the strings for "show all apps"
Bug: 38328724
Test: Screenshot
Change-Id: If48ff26f691795dcf206346af6a9a0be62bbf733
2017-05-23 15:17:41 -07:00
Fan Zhang
82be5f0c3f Misc fixes to search and UI.
- Use prefContext to create preference.
- rename "Gestures" to "Gesture shortcuts"
- Add search keyword to individual gesture settings so when search
  "gesture" they also show up.
- call super() for all getNonIndexableKeys() in search provider

Fix: 38327387
Fix: 36621897
Fix: 36685646
Test: make RunSettingsRoboTests

Change-Id: Ia5ddfeae08cb27c278dfb8d2376594e21d8f283c
2017-05-23 14:55:23 -07:00
Charles He
641c9fc23a Make failed ConfirmCredential attempts count towards wipe
Previously, failed ConfirmDeviceCredential attempts only counted towards the
wipe limit if it is used as a separate work challenge.

In this CL, we additionally make these failed attempts count towards the total
failures in the following scenarios:
  1) when unified work challenge is enabled
  2) for the primary user (e.g. when a wipe limit is set by a DO)
  3) for secondary users

Bug: 27238008
Test: manual, by entering wrong credentials multiple times
Test: make SettingsRoboTests
Change-Id: Ie5a099bb3fd46245c13ccf4c8f91c4d935412a4e
2017-05-23 18:04:52 +01:00
TreeHugger Robot
602a714502 Merge changes Ief9e9690,I1cc1bc2d
* changes:
  Split BluetoothSettings into two pages
  Dupe BluetoothSettings and DeviceListPreferenceFragment
2017-05-23 01:36:22 +00:00
jackqdyulei
52ccb49fbe Split BluetoothSettings into two pages
This cl splits the BluetoothSettings into paired device page and
pairing page, including small changes about:
1. Refactor the pages so they could get as much as static preference
from xml file rather than dynamically add/remove them everytime.
2. Remove creating method in BluetoothDeviceNamePreferenceController
and add it in xml file
3. Create BluetoothPairingDetail page, basically move the logic from
BluetoothSettings.
4. Make pairing preference clickable and jump to BluetoothPairingDetail
5. Add and update bunch of tests

Bug: 35877041
Test: RunSettingsRoboTests
Change-Id: Ief9e9690c612f7b46c58e866e5cecc511af642c8
2017-05-22 16:57:37 -07:00
Amit Mahajan
1eee1f8bbc Disallow adding/editing dun APNs unless allowed by carrier.
Test: WIP
Bug: 38186417
Change-Id: If1cc34ad979659a56a3886da2a02fdbf642739ac
2017-05-22 16:01:46 -07:00
TreeHugger Robot
7983dba5f6 Merge "Show aditional WiFi calling message." 2017-05-22 16:11:13 +00:00
Meng Wang
7cecf2d3ba Show aditional WiFi calling message.
Bug: 37624313
Test: manual - locally apply this setting and verify that the
               additional text is shown.
Change-Id: I8a15a9aeb71a0daab1ae4533f2c3b7d05c57bc5f
2017-05-22 15:46:31 +00:00
Daniel Nishi
838ec5d15b Merge "Make Storage settings title be "Storage"." into oc-dev am: c7299663e7
am: af1a66202f

Change-Id: I71309f8db92a72df913aa30e4664cabb69b2fcbb
2017-05-18 22:11:55 +00:00