Commit Graph

3129 Commits

Author SHA1 Message Date
Svetoslav Ganov
0c9f05fe26 Merge "Add Bluetooth toggle prompts - settings" 2016-07-25 18:43:40 +00:00
Makoto Onuki
a6a4dc70d2 Improve string comment am: 8e8bcb6900
am: 282e662b4e

Change-Id: I91ca85dba7dc1aba8645d66f0db7c49aa8fbb122
2016-07-25 18:36:22 +00:00
Robin Lee
e68d957777 Include wifi certificates in settings
Deleting wifi certificates isn't supported yet since cascading the
removal back into wifi configs will need some easy way of enumerating
wifi configs first.

Bug: 29208062
Change-Id: I2d9d1ea7e0974701009bfa6ea162b8bc80806639
2016-07-25 15:35:08 +01:00
Svetoslav Ganov
b06766f129 Add Bluetooth toggle prompts - settings
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749

Change-Id: I5ae0c532c92b2c05a91f0d769ca6744002747fca
2016-07-22 20:08:44 -07:00
Makoto Onuki
8e8bcb6900 Improve string comment
Bug 30210359
Bug 30207992

Change-Id: I27f8166b4fbd8f3b3e01c71e1fcc114c2a713231
2016-07-21 10:35:47 -07:00
Daniel Nishi
2b2ffa2dd6 Merge \\"Add a help item for the Help & Feedback for the Storage Manager.\\" into nyc-mr1-dev am: dd1c51a3e4
am: c354537c37

Change-Id: I76473c677d5b1be97ec78ac084325a6939b02e2e
2016-07-20 19:51:17 +00:00
Daniel Nishi
dd1c51a3e4 Merge "Add a help item for the Help & Feedback for the Storage Manager." into nyc-mr1-dev 2016-07-20 17:33:40 +00:00
André Lago
91c03c0962 Merge "Improved always_on_vpn disabled text" 2016-07-20 11:31:19 +00:00
Andre Lago
f22679abbc Improved always_on_vpn disabled text
When the admin disallowed config vpn, always-on vpn description was
"Disabled by admin", so it was changed to "Controlled by admin" which
suits it better.

Bug: 29265180
Change-Id: If0da6b9ef3ce7179adeda53203c6caf4e3e9a995
2016-07-20 10:51:30 +01:00
Justin Klaassen
3e2ddff8f7 Merge \\"Add Night display settings conditional\\" into nyc-mr1-dev am: b57ee0e02f
am: 5d8b1ca588

Change-Id: I64c13bb813f12cff6786a1021647b65bc226e384
2016-07-20 02:55:05 +00:00
Daniel Nishi
f21465e14f Add a help item for the Help & Feedback for the Storage Manager.
Bug: 29793176
Change-Id: Ic4104525961e7f173212df54f19857a06c0fac05
2016-07-19 15:47:10 -07:00
Justin Klaassen
d60f09edaf Add Night display settings conditional
Bug: 30043281
Change-Id: I2464cd90f1f7f379aabf123f602e6150a87120cf
2016-07-19 14:31:46 -07:00
Fan Zhang
b4cdc90ec7 Merge \\"Clarify string translation.\\" into nyc-mr1-dev am: 677cf28f6d
am: f465a1b635

Change-Id: I85e0dcbc16915bfe3f2480078576113c31ac0626
2016-07-19 19:37:51 +00:00
Fan Zhang
9b95b3fc3d Clarify string translation.
Bug: 30196308

Clarify ringtong volume string format and add an example.

Change-Id: I52769d5d274c7502f73ac25e8e1ce9ae6d0b87a5
2016-07-19 09:40:31 -07:00
Jeff Sharkey
99d9a1d34d Merge \\"Preemptively add string for direct boot dialogs.\\" into nyc-mr1-dev am: 93cbd71610
am: 1a16dd8e0f

Change-Id: I9d8b91d4328a081a82402c85a3a911a32263496b
2016-07-14 04:36:09 +00:00
Jeff Sharkey
93cbd71610 Merge "Preemptively add string for direct boot dialogs." into nyc-mr1-dev 2016-07-14 04:31:36 +00:00
Jeff Sharkey
10b6d4d220 Preemptively add string for direct boot dialogs.
Bug: 27196876
Change-Id: Ieb65b4b7b4e075c1de2e502d0272f8f113c1c34b
2016-07-14 04:31:08 +00:00
Fan Zhang
810a21843e Merge \\"Add content description to escalation card title.\\" into nyc-mr1-dev am: 31e5d5bb4b
am: 458024f52e

Change-Id: Iddab902a2077e4aece42c3536f2dbb537febdd4c
2016-07-14 00:01:21 +00:00
Mike Tsao
3191dbe334 Merge \\"Change \\"ringer volume\\" to \\"ring volume\\"\\" into nyc-mr1-dev am: bb15f3d14f
am: 0311342bc8

Change-Id: I23928c43b7fd8a74f8bfc049958fed54658fc24e
2016-07-14 00:01:20 +00:00
Mike Tsao
e572577acf Merge \\"Rename Night display to Night Light\\" into nyc-mr1-dev am: 6d0ed88746
am: 28ca7419c9

Change-Id: I3b473ec764e35fa248ae21a0996272a5b1556522
2016-07-14 00:01:19 +00:00
TreeHugger Robot
31e5d5bb4b Merge "Add content description to escalation card title." into nyc-mr1-dev 2016-07-13 23:29:46 +00:00
TreeHugger Robot
bb15f3d14f Merge "Change "ringer volume" to "ring volume"" into nyc-mr1-dev 2016-07-13 22:13:27 +00:00
TreeHugger Robot
6d0ed88746 Merge "Rename Night display to Night Light" into nyc-mr1-dev 2016-07-13 22:01:19 +00:00
Matthew Fritze
40b1de8f52 Merge \\"Update summary and title strings for Settings Suggestions\\" into nyc-mr1-dev am: 5d8b432137
am: a2f07b0475

Change-Id: I1e5b49528839a66ba9c1f9c52553f6a579cf61e5
2016-07-13 21:24:45 +00:00
Matthew Fritze
5d8b432137 Merge "Update summary and title strings for Settings Suggestions" into nyc-mr1-dev 2016-07-13 21:03:34 +00:00
Matthew Fritze
d50ff42d86 Merge \\"Update Safety & Regulatory Information link text\\" into nyc-mr1-dev am: 38415ff361
am: 989a536667

Change-Id: I907c7f5aa7519aab4e8f6b1030ca7d24929ff90f
2016-07-13 20:59:35 +00:00
Matthew Fritze
38415ff361 Merge "Update Safety & Regulatory Information link text" into nyc-mr1-dev 2016-07-13 20:52:45 +00:00
Fan Zhang
0bd87d71b8 Add content description to escalation card title.
Bug: 30079904

In strings like "We're here for you 24/7", to avoid talkback read 24/7
as 24/7ths, we need to provide a custom content description.

Change-Id: If51586d97a376e7a859658d7a6dc48108094ddc2
2016-07-13 13:47:04 -07:00
Mike Tsao
a49178a487 Change "ringer volume" to "ring volume"
Bug: 29565896

Changes all occurrences of "ringer volume" to "ring volume" in
Settings string file, including in comments.

Change-Id: Iad197dbbbbec16120fcd3ac835c1647a7f4c0c32
2016-07-13 12:52:32 -07:00
Mike Tsao
36dc6a8b28 Rename Night display to Night Light
Bug: 30069874
Bug: 29584858

Renames generic "Night display" to "Night Light." Also changes feature
description to emphasize suitability for reading at night.

Change-Id: Ib54a22d7683853d7aadf4fe48795aaaa990b0333
2016-07-13 12:31:38 -07:00
TreeHugger Robot
a4e3c14848 Update summary and title strings for Settings Suggestions
Setting Suggestion messages have new strings for NDR.

Change-Id: I5e76e669fac91b61a2207bb2937c107c952768c0
Fixes: 30067406
2016-07-12 18:39:19 -07:00
Doris Ling
336d5bfaa4 Merge \\"Update preference ordering in Gestures settings.\\" into nyc-mr1-dev am: 22176641b2
am: cd82ff3092

Change-Id: I605de86a2a218a40598e29c0ae050274e0ed1278
2016-07-12 23:51:03 +00:00
Doris Ling
e95c01705c Merge \\"Update resource string for gestures settings.\\" into nyc-mr1-dev am: 4410b6b663
am: 0a86720e19

Change-Id: I790175513041954dad3583ca1f1d40566e617ebc
2016-07-12 23:51:02 +00:00
Doris Ling
22176641b2 Merge "Update preference ordering in Gestures settings." into nyc-mr1-dev 2016-07-12 23:38:02 +00:00
Doris Ling
4410b6b663 Merge "Update resource string for gestures settings." into nyc-mr1-dev 2016-07-12 23:37:38 +00:00
Doris Ling
1093b24c1b Update preference ordering in Gestures settings.
Swapped the fingerprint swipe and ambient display preference in
Settings->Gestures, and updated the summary text in Display->Ambient
display

Bug: 30073941
Change-Id: Ifc386b4ab9b0e7317f1ee0e477f9670e8a49b0f9
2016-07-12 11:25:47 -07:00
Matthew Fritze
d21e0e914c Update Safety & Regulatory Information link text
The link to Safety & Regulatory Information now reads:
Safety & regulatory manual

Bug: 30037999
Change-Id: Ib72efba96b8a9a9f38bcf9686e2563d1877620a8
2016-07-12 09:47:33 -07:00
Tony Mak
872933b55b Visualize password requirements and their fulfillment am: 0bbcdccdbf
am: 83f3117749

Change-Id: Ifbebb87d524899d35a69de538920b46c324dc86f
2016-07-12 13:55:55 +00:00
Tony Mak
0bbcdccdbf Visualize password requirements and their fulfillment
1. Aggregate policies and generate the requirements
2. When user modifies the password, check is each requirement fulfilled
   Update the view accordingly.

Change-Id: I962ed3b81ce844006be1024a493e94ce52a3fdec
Fix: 24900754
2016-07-12 11:19:45 +01:00
Tony Mak
13ad7d4078 Update work challenge strings am: 9a8e5a7f25
am: df0dffe527

Change-Id: I6cd3f076c95e4f5548cb46b10ce06408cbd754bd
2016-07-12 07:07:45 +00:00
Tony Mak
9a8e5a7f25 Update work challenge strings
Change-Id: I9c938c9a9547ec92d7ba7b452861db174e421068
Fix: 29358023
2016-07-12 06:59:11 +00:00
Makoto Onuki
8fd3c226e0 Merge \\"Restore \\"reset ShortcutManager rate limiting\\" dev option\\" into nyc-mr1-dev am: ed9aed1878
am: 5922902ab3

Change-Id: I6452514f23d954db0d965b8b71cc03f710c30791
2016-07-12 02:44:18 +00:00
Doris Ling
a2946481c9 Update resource string for gestures settings.
Update the summary text for the gestures settings.

Bug: 30074265
Change-Id: I5e4313f2764aa64af8bd7b984189f2d0782a0a70
2016-07-11 18:38:08 -07:00
Makoto Onuki
ed9aed1878 Merge "Restore "reset ShortcutManager rate limiting" dev option" into nyc-mr1-dev 2016-07-11 17:54:27 +00:00
Doris Ling
96167c75c5 Merge \\"Change gesture settings for Ambient Display from nudge to double tap.\\" into nyc-mr1-dev am: 8ba6e6a792
am: 67d4b38cc1

Change-Id: I7e7a0833e8cf9dfc5c2727c65a57d29e48d3974c
2016-07-08 23:42:15 +00:00
Doris Ling
8ba6e6a792 Merge "Change gesture settings for Ambient Display from nudge to double tap." into nyc-mr1-dev 2016-07-08 23:16:36 +00:00
Doris Ling
37d247b1af Merge \\"Add summary for Settings->Gestures.\\" into nyc-mr1-dev am: f46dabcf0f
am: 4dd0373203

Change-Id: Ib0a7afc22ef73bb3cec8f8bb44da73b9487256eb
2016-07-08 23:11:51 +00:00
Doris Ling
f46dabcf0f Merge "Add summary for Settings->Gestures." into nyc-mr1-dev 2016-07-08 22:56:45 +00:00
Justin Klaassen
1863ffc982 resolve merge conflicts of 67b3a94 to master
Change-Id: I8fabdf019fea12793c54745390ed4669118548d0
2016-07-08 14:40:55 -07:00
Doris Ling
6607d49202 Change gesture settings for Ambient Display from nudge to double tap.
Change the description text and animation video to double tap the device
instead of nudge movement. Also update the summary text in
Display->Ambient Display to match the gesture description.

Bug: 30034987
Change-Id: If95e7a417b472dd677174a8187a83594e06e0eee
2016-07-08 14:24:42 -07:00