Antony Sargent
26e5f828f7
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1
...
am: db6e747ab9
Change-Id: Ibf7cb8c3c7947dbc8cbf019ab32b872756ed7c63
2017-12-05 17:36:29 +00:00
Antony Sargent
db6e747ab9
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85
...
am: acacd658f1
Change-Id: If9851b0b24c020d3a10b197fc15b6777bd88401c
2017-12-05 17:32:41 +00:00
Antony Sargent
9867a3ef85
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207
...
am: 3d7dbd6407
Change-Id: Ifa4509bbabbb346ce581f17d33e3f48fc7014971
2017-12-05 17:26:51 +00:00
Antony Sargent
3d7dbd6407
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1
...
am: 24f063a207
Change-Id: I44b42f37a638cda455bbeb3ab4bab5c02fc9c7d9
2017-12-05 17:24:48 +00:00
Antony Sargent
24f063a207
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846
...
am: 9cf1fc73f1
Change-Id: I4906dc8f97cfcfeef7bfda0896b39c032ef26ec6
2017-12-05 17:21:14 +00:00
Antony Sargent
9cf1fc73f1
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3
...
am: eee62e1846
Change-Id: Ie6fff7cf9df6827a29c04473ed3a0f1332c08ff2
2017-12-05 17:19:12 +00:00
Antony Sargent
eee62e1846
Reword bluetooth confirmation dialog am: e14d38a383
...
am: b2b401b5f3
Change-Id: I21921d41d35a87a48ad627e9889e4d00219e912b
2017-12-05 17:17:08 +00:00
Antony Sargent
b2b401b5f3
Reword bluetooth confirmation dialog
...
am: e14d38a383
Change-Id: Ibb19504f6a74015a2a4d25d5c268db975da4ebb5
2017-12-05 17:13:36 +00:00
Antony Sargent
e14d38a383
Reword bluetooth confirmation dialog
...
Changing the text near the checkbox allowing contacts/call history
access from "Allow $device_name to access your contacts and call
history" to just "Allow access to your contacts and call history" to
avoid problem where a properly crafted remote device name can make the
"to access your contacts and call history" text get pushed down below
the fold, and mislead users into thinking the checkbox has a different
meaning.
Bug: 62672248
Test: manual (initiate bluetooth pairing with another phone or a
computer, observe pairing dialog text)
Change-Id: I770852739f6791c2b9a36ab45c526bab3f3b9be1
2017-11-15 18:38:43 +00:00
Salvador Martinez
a8e887be86
Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev
2017-06-06 04:29:32 +00:00
Fan Zhang
89dc1d1ee2
Revert "Remove dynamic summary from Security Patch info"
...
The change breaks build
Fix: 62359766
Bug: 36101902
This reverts commit 2b562f84b6 .
Change-Id: Ie712d471f1fa9858b65fd1c0b111405dfb49eb38
2017-06-06 04:13:04 +00:00
Tony Mantler
94c717f239
Move strings to SettingsLib so TV can use them
...
Bug: 38496265
Test: Compiles
Change-Id: Iea90cbcf858cd598af4adc017e673e299a62ed39
Merged-In: Iea90cbcf858cd598af4adc017e673e299a62ed39
2017-06-02 15:10:18 -07:00
Alison Cichowlas
4b29f593f0
Merge "Add group name into channel summary, if applicable." into oc-dev
2017-06-02 15:39:44 +00:00
TreeHugger Robot
564d90faf0
Merge "Remove dynamic summary from Security Patch info" into oc-dev
2017-05-31 22:41:28 +00:00
Alison Cichowlas
2280afc54e
Add group name into channel summary, if applicable.
...
Bug: 36642898
Test: ran integration & robo tests (no new failures); verified manually with apps with channels & without.
Change-Id: I16a255b0e5d929f4485d3725bd18179e6f411c03
2017-05-31 15:12:25 -04: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
136a3da4a3
Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev
2017-05-25 23:18:01 +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
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
Daniel Nishi
c7299663e7
Merge "Make Storage settings title be "Storage"." into oc-dev
2017-05-18 21:57:22 +00:00
Daniel Nishi
0d03b88e91
Make Storage settings title be "Storage".
...
This more closely reflects the idea that the top level setting title
should match the actual screen title.
Change-Id: Ie7ab1756d799c182cad74041995768037bba710f
Fixes: 37923462
Test: Manual
2017-05-18 11:02:10 -07:00
jackqdyulei
7548f1fa77
Add screen usage string for battery settings
...
In advanced battery page we still use "Used for"
Bug: 38328647
Test: Build & Screenshot
Change-Id: Ic194bfed45a76c811c431a13b5554f5bc978bca5
2017-05-17 13:14:45 -07:00
Julia Reynolds
6393e1752f
Merge "Notification settings, importance and pre-O apps" into oc-dev
2017-05-12 12:14:11 +00:00
Chris Wren
485e75e063
add a global control for badging
...
Bug: 36021111
Test: make RunSettingsRoboTests
Change-Id: I7ffd2ade4c927d261e302ddadfae486040d62824
2017-05-11 17:22:32 -04:00
Julia Reynolds
2f0547c783
Notification settings, importance and pre-O apps
...
- Show pre-O settings for the misc channel, should the app still have it
(versus the full channel settings)
- Fix the importance summmary text in various places
- Update the color of the blocked description text
- Fix what fields appear/disappear based on blocked status and importance
Fixes: 38177887
Bug: 38120923
Fixes: 38012300
Fixes: 37923612
Test: manual, with an O app, a pre O app that has channels, and a pre-O
app with no channels
Change-Id: I42965b81b795e8fb427f857c7766fe5480a99f2e
2017-05-11 14:48:17 -04:00
Alison Cichowlas
28543f82f9
Notifications settings updates to match spec:
...
- change badge language & remove summary
- change caps on sound text
Bug: 37479730, 37480708
Test: string changes manually verified
Change-Id: Iae7416cecd2cd6d84c2a05fd707f791bc5fe7ceb
2017-05-10 14:31:01 -04:00
TreeHugger Robot
a3c4339299
Merge "Add summary placeholder to data saver preference." into oc-dev
2017-05-08 20:43:56 +00:00
TreeHugger Robot
43083b4332
Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev
2017-05-05 20:48:50 +00:00
Suprabh Shukla
c1f10cb9c6
Adding SecureTouchListener to DeviceAdminAdd
...
Dropping any touches to the activate admin button if any other
window is partly or wholly obscuring the device admin add window
Test: Cts Verifier -> Device Administration -> Device Admin Tapjacking
Test
Bug: 35056974
Change-Id: I048ecc1944c13fea624eede7861d39df2beeb393
2017-05-04 18:50:33 -07:00
Doris Ling
bab86af55b
Add summary placeholder to data saver preference.
...
- reserve 2 lines for the data saver summary to avoid the preference
beging relayout when the summary text get updates.
Change-Id: Ibced7dc4b9620fe45541ea470d34bf83be66480d
Fix: 37925232
Test: visual
2017-05-04 12:37:52 -07:00
Esteban Talavera
2db8240b87
Show when work profile notifications are blocked for listener
...
Bug: 36657192
Test: m RunSettingsRoboTests
Change-Id: If6a8715b9a5a9ea893728c8ce7708e4c4154fb80
(cherry picked from commit ee349792dd )
2017-05-04 11:41:06 +00:00
Fan Zhang
91a03a9327
Fix string where it says "phone" on a tablet.
...
Change-Id: Id2e8fa1e1fef34e167c7ad25468dcd335baa73c6
Fix: 37833383
Test: visual
2017-05-03 17:03:55 -07:00
Fan Zhang
496fd0ca34
Merge pointer/tts categories into one without heading
...
Change-Id: I75dd6472a6eb4929773222844872d43027122f3c
Fix: 35960300
Test: robotests
2017-04-27 13:47:44 -07:00
Julia Reynolds
38c16a9417
App & channel notification settings updates
...
- change 'block all' to an on/off switch bar
- update channel list summary text when notifications are
toggled on/off on app settings page
- Add 'off state' text
- change style of foot items
- change 'importance' from a dropdown to its own page
Bug: 37538972
Bug: 37479730
Fixes: 37541624
Fixes: 37549732
Test: manual
Change-Id: I0e5cc66ba539ce2b76b4ad6541bf6bfb5b58c373
2017-04-25 13:30:48 -04:00
Lei Yu
8f9f25c541
Merge "Add TtsSpan for formatted time." into oc-dev
2017-04-24 17:01:59 +00:00
TreeHugger Robot
008a9adef9
Merge "Updating strings for Install unknown apps" into oc-dev
2017-04-22 02:23:57 +00:00
jackqdyulei
f4c1cef322
Add TtsSpan for formatted time.
...
Talk back will read "Used for 3m" as "Used for 3 meters", but
it will read "Used for 3h 3m" correctly.
This cl add specific Ttsspan if the time only contains "minute"
Bug: 36379530
Test: Run SettingsRoboTests
Change-Id: I033575938cce24221980dddd9d66be4e18804541
2017-04-21 14:42:42 -07:00
Suprabh Shukla
d9e317809f
Updating strings for Install unknown apps
...
Updating some strings for clarity based on ux review.
Test: Manual
Bug: 37362450
37362065
Change-Id: I26dd191d19ea8f3bd905c2e61ff77c4a2b796b3c
2017-04-21 14:20:56 -07:00
TreeHugger Robot
746eb9e14c
Merge "Change "Cell standby" to "Mobile network standby"" into oc-dev
2017-04-21 00:45:16 +00:00
TreeHugger Robot
b172a9a1d9
Merge "Add connect string for bluetooth page" into oc-dev
2017-04-20 23:47:01 +00:00
jackqdyulei
2532438693
Add connect string for bluetooth page
...
Bug: 37365660
Test: Build
Change-Id: I964b9d25e892666c51dbd98e499be23fe93007ec
2017-04-20 10:30:50 -07:00
jackqdyulei
0a8e081855
Change "Cell standby" to "Mobile network standby"
...
Bug: 37356060
Test: Build
Change-Id: I2c726a7f31ae37cf0a31b76e2a99d9c5735692fe
2017-04-20 10:03:21 -07:00
Adrian Roos
97d3709b25
Merge "Revert "Changed the ambient display setting name"" into oc-dev
2017-04-19 20:50:33 +00:00
Adrian Roos
f33fec4f90
Revert "Changed the ambient display setting name"
...
This reverts commit 8d164e659d .
Fixes: 36516811
Test: Settings > Display > More, observe that it says "Ambient Display" there again.
Change-Id: I2831bc89e430d08f875c05a1441e1b0556df97e5
2017-04-18 16:26:00 -07:00
TreeHugger Robot
b6a0360a92
Merge "Use buttons for EncryptionInterstitial" into oc-dev
2017-04-18 00:32:55 +00:00
Maurice Lam
88df6f4407
Use buttons for EncryptionInterstitial
...
Bug: 30742121
Test: Run EncryptionInterstitialTest via `am instrument`
Change-Id: I04d304da4153ebc7f8809ce9c640bccc5e1f5685
(cherry picked from commit 9be96e06bb )
2017-04-17 15:42:21 -07:00
Sarah Fortune
15d1e2676c
Disable the wifi wakeup preference when wifi scanning is disabled
...
Bug: 36033488
Test: Manual testing on the device, make RunSettingsRoboTests
Change-Id: I0abfe69a8a84dc9c5e78f1debce7748c92b47e04
2017-04-17 11:35:21 -07:00
jackqdyulei
7c7654b401
Update some battery string comments
...
1. battery_detail_foreground
2. battery_detail_background
Fix: 36874567
Test: Build
Change-Id: I955023ff8919b7019d459bd75a8baccf69a46355
2017-04-13 17:54:48 -07:00