OSDN Git Service
Robin Lee [Mon, 27 Mar 2017 16:35:34 +0000 (17:35 +0100)]
resolve merge conflicts of
90f009ebb5 to master
Test: make RunSettingsRoboTests
Change-Id: I7f0eece61918c29d33316fa755eca2e8f4deba46
Robin Lee [Mon, 27 Mar 2017 16:25:24 +0000 (16:25 +0000)]
Merge "[VpnSettings]Crash when activity has been recycled" am:
fb81f50c27
am:
c834ed1e4e
Change-Id: I32ddda40ed4654288eef45dfdb2f53b2f9aba988
Robin Lee [Mon, 27 Mar 2017 16:22:56 +0000 (16:22 +0000)]
Merge "[VpnSettings]Crash when activity has been recycled"
am:
fb81f50c27
Change-Id: I588fc958daacfd0b7859c00c6b5b164e6e02a33d
Robin Lee [Mon, 27 Mar 2017 16:18:19 +0000 (16:18 +0000)]
Merge "[VpnSettings]Crash when activity has been recycled"
TreeHugger Robot [Mon, 27 Mar 2017 15:48:54 +0000 (15:48 +0000)]
Merge "Populate summary for top level wifi picker options"
TreeHugger Robot [Sat, 25 Mar 2017 20:35:02 +0000 (20:35 +0000)]
Merge "Add strings that will be needed for screen saver settings"
TreeHugger Robot [Sat, 25 Mar 2017 18:30:35 +0000 (18:30 +0000)]
Merge "Update Sound settings."
TreeHugger Robot [Sat, 25 Mar 2017 18:21:02 +0000 (18:21 +0000)]
Merge "Update storage summary text."
TreeHugger Robot [Sat, 25 Mar 2017 18:17:14 +0000 (18:17 +0000)]
Merge "Move reset options to one place"
TreeHugger Robot [Sat, 25 Mar 2017 17:54:48 +0000 (17:54 +0000)]
Merge "Change default value for vibrate on touch to 0 (off)."
TreeHugger Robot [Sat, 25 Mar 2017 14:58:45 +0000 (14:58 +0000)]
Merge "Fix Accessibility Settings crash"
Robin Lee [Sat, 25 Mar 2017 11:15:25 +0000 (11:15 +0000)]
Merge "UserCredentialsSettings: that fresh new blank look"
TreeHugger Robot [Sat, 25 Mar 2017 07:40:09 +0000 (07:40 +0000)]
Merge "Add new adaptive brightness strings."
Casey Burkhardt [Sat, 25 Mar 2017 06:26:36 +0000 (23:26 -0700)]
Fix Accessibility Settings crash
Update preference key to reference new magnification preference screen.
Bug:
36606349
Test: Manual
Change-Id: Iefb114bea6a58d6f8939ae863959d4a6922f5a1d
Lei Yu [Sat, 25 Mar 2017 06:18:07 +0000 (06:18 +0000)]
Merge "Update fragment title for usage detail page."
Lei Yu [Sat, 25 Mar 2017 06:17:52 +0000 (06:17 +0000)]
Merge "Revamp the battery usage details page."
TreeHugger Robot [Sat, 25 Mar 2017 06:09:19 +0000 (06:09 +0000)]
Merge "Added Night display strings"
Andrew Sapperstein [Sat, 25 Mar 2017 00:46:11 +0000 (17:46 -0700)]
Add new adaptive brightness strings.
Adds new strings for the revised adaptive brightness settings UX.
Bug:
36475419
Test: is string updates
Change-Id: I4a8e1072577e440488b3f98545be3c323b49be32
TreeHugger Robot [Sat, 25 Mar 2017 04:44:14 +0000 (04:44 +0000)]
Merge "Fix crash in TetherSettings."
Sean Stout [Sat, 25 Mar 2017 04:33:08 +0000 (21:33 -0700)]
Added Night display strings
Bug:
34900174
Test: manual
Change-Id: I9e3b05dc840686bc1d44e0e750576908b2931159
Zhihong Li [Sat, 25 Mar 2017 04:26:06 +0000 (04:26 +0000)]
Merge "Show correct Wi-Fi status when switching to multi window mode" am:
4cc1f72576 am:
a4def43fad
am:
76fb361b9d
Change-Id: Ib19926feb7d3a2da0a8aaa9dc9c5ee3bcae6c2af
Zhihong Li [Sat, 25 Mar 2017 04:23:32 +0000 (04:23 +0000)]
Merge "Show correct Wi-Fi status when switching to multi window mode" am:
4cc1f72576
am:
a4def43fad
Change-Id: If2afcfba3811c1768a16b0f87cdae05bc50b7f31
Zhihong Li [Sat, 25 Mar 2017 04:21:03 +0000 (04:21 +0000)]
Merge "Show correct Wi-Fi status when switching to multi window mode"
am:
4cc1f72576
Change-Id: Id60415285629e6d7a712a9f441e6e7839732bf94
Treehugger Robot [Sat, 25 Mar 2017 04:14:57 +0000 (04:14 +0000)]
Merge "Show correct Wi-Fi status when switching to multi window mode"
TreeHugger Robot [Sat, 25 Mar 2017 04:09:19 +0000 (04:09 +0000)]
Merge "Misc fixes for items under system setting"
TreeHugger Robot [Sat, 25 Mar 2017 04:04:10 +0000 (04:04 +0000)]
Merge changes from topic 'accessibilitybutton-target'
* changes:
Update magnification strings
Settings revisions for Accessibility button
jackqdyulei [Thu, 23 Mar 2017 23:21:47 +0000 (16:21 -0700)]
Update fragment title for usage detail page.
Bug:
36367764
Fix:
36568434
Test: Build
Change-Id: Ib4e76e20b81a6b54efcc34d151dce5098a860c2a
jackqdyulei [Thu, 9 Mar 2017 03:35:02 +0000 (19:35 -0800)]
Revamp the battery usage details page.
This cl adds AdvancedPowerUsageDetail to show the usage details page.
The AdvancedPowerUsageDetail contains all the needed ui components:
1. App Header
2. Two buttons
3. Usage breakdown preference category
4. Power management preference category
This cl also adds preference controller for two buttons but the
detail implementation will be added in the following cl.
Following cl will also remove previous detail page.
Bug:
35810915
Test: RunSettingsRoboTests
Change-Id: I17f95d1288762094671c0f148fa73367e51f175e
Fan Zhang [Thu, 23 Mar 2017 23:42:13 +0000 (16:42 -0700)]
Misc fixes for items under system setting
- Show summary under virtual keyboard: list all avaiable keyboards
- Set about phone subtext to device model string.
- Update DND Suggestion text
Change-Id: I20acffcf691d1354c7636f5851b376099844700f
Fix:
35959817
Fix:
36395109
Test: robotests
Casey Burkhardt [Sat, 25 Mar 2017 02:24:34 +0000 (19:24 -0700)]
Update magnification strings
- Adjusts string for triple-tap instructions
- Adds summary text to Settings > Accessibility > Magnification
Bug:
30960346
Test: Manual
Change-Id: I151eeaa8b08c86ba8f9dec90d14388f1d775fb57
TreeHugger Robot [Sat, 25 Mar 2017 01:15:45 +0000 (01:15 +0000)]
Merge changes Ie7c3cd59,Ieed87d17
* changes:
Update the battery string based on new mock.
Update the string in battery screen
Ajay Panicker [Sat, 25 Mar 2017 01:05:22 +0000 (01:05 +0000)]
Merge "Add default value to Bluetooth AVRCP version property get" am:
84cf0b2a4b am:
0347c57ef5
am:
4d20929038
Change-Id: I5086968b1ecaf0d171f0e85c73ca255636ecb92f
Ajay Panicker [Sat, 25 Mar 2017 01:02:50 +0000 (01:02 +0000)]
Merge "Add default value to Bluetooth AVRCP version property get" am:
84cf0b2a4b
am:
0347c57ef5
Change-Id: I65b5233f4980b4981a58e3b4059999c2edb4232e
Ajay Panicker [Sat, 25 Mar 2017 01:00:51 +0000 (01:00 +0000)]
Merge "Add default value to Bluetooth AVRCP version property get"
am:
84cf0b2a4b
Change-Id: I21a5388ee633edb4f7b59a61390b71ea59df7205
Treehugger Robot [Sat, 25 Mar 2017 00:58:13 +0000 (00:58 +0000)]
Merge "Add default value to Bluetooth AVRCP version property get"
Fan Zhang [Fri, 24 Mar 2017 20:43:11 +0000 (13:43 -0700)]
Move reset options to one place
Change-Id: I419c16cbfc69861e01f28c14abdde137bd78f0bb
Fix:
36458355
Test: make RunSettingsRoboTests
Charles He [Sat, 25 Mar 2017 00:01:18 +0000 (00:01 +0000)]
Merge "VPN settings: update strings for always-on VPN"
Casey Burkhardt [Fri, 24 Mar 2017 17:15:37 +0000 (10:15 -0700)]
Settings revisions for Accessibility button
Populates and displays a warning message when a feature that relies
on the Accessibility button is enabled, but not assigned.
Bug:
34720082
Test: Manual
Change-Id: Ie7031716a91fdf7fc40f32bf4e0ad17af85aa573
TreeHugger Robot [Fri, 24 Mar 2017 23:51:58 +0000 (23:51 +0000)]
Merge "New strings for Storage settings revamp."
TreeHugger Robot [Fri, 24 Mar 2017 23:48:05 +0000 (23:48 +0000)]
Merge "Update WriteWifiConfigToNfcDialog."
jackqdyulei [Fri, 24 Mar 2017 20:44:36 +0000 (13:44 -0700)]
Update the battery string based on new mock.
The mock has been updated, upload the string first before the
string freeze.
Now the screen still uses old string, following cl will update
the screen and remove the old string.
Bug:
36576021
Test: Build
Change-Id: Ie7c3cd59dddd9223bc89c2aedd957a836e52456a
jackqdyulei [Thu, 23 Mar 2017 17:32:49 +0000 (10:32 -0700)]
Update the string in battery screen
Only update the string in battery main screen and advanced screen
Bug:
36367764
Test: Manual
Change-Id: Ieed87d1766cf24d198eabfdc05f14b7653187f0f
TreeHugger Robot [Fri, 24 Mar 2017 23:04:02 +0000 (23:04 +0000)]
Merge "Update FakeUid with new methods"
Saige McVea [Fri, 24 Mar 2017 22:56:03 +0000 (22:56 +0000)]
Merge "Resolved accessibility service preference summary strings to use a common resource."
Doris Ling [Fri, 24 Mar 2017 21:37:07 +0000 (14:37 -0700)]
Update Sound settings.
- change the summary to show the automatic rules info instead.
- removed ringtone preference category
- add dividers above DND and Emergency broadcast
Change-Id: Iee497d194b70af72cfd69b315d639ca62720643b
Fix:
34975939
Test: make RunSettingsRoboTests
TreeHugger Robot [Fri, 24 Mar 2017 22:41:01 +0000 (22:41 +0000)]
Merge "Add new strings for system dashboard."
Jason Monk [Fri, 24 Mar 2017 21:52:40 +0000 (17:52 -0400)]
Add strings that will be needed for screen saver settings
Bug:
35031991
Test: none
Change-Id: I5e088b0669e762eec05cee7a2f1c724c9e526052
Doris Ling [Fri, 24 Mar 2017 21:14:11 +0000 (14:14 -0700)]
Change default value for vibrate on touch to 0 (off).
Change-Id: Ic4f1b3d7c608f5e5501af91a746afea038fd9564
Fix:
36273830
Test: make RunSettingsRoboTests
Fan Zhang [Fri, 24 Mar 2017 20:56:41 +0000 (13:56 -0700)]
Add new strings for system dashboard.
Bug:
35959817
Bug:
36458355
Test: builds
Change-Id: Iad80edff480a53019666f53dc34f52a8a4562094
Daniel Nishi [Fri, 24 Mar 2017 20:56:32 +0000 (13:56 -0700)]
New strings for Storage settings revamp.
Change-Id: Ic893ff8fd0d0c6ae7daae65798c83567782681ce
Fixes:
36197674
Test: None
Doris Ling [Fri, 24 Mar 2017 20:51:48 +0000 (13:51 -0700)]
Update storage summary text.
add the summary text to be used when there is SD card.
Bug:
36375846
Test: builds
Change-Id: I53822c791ef43670626049da9cf7dc048350b4e3
Phil Weaver [Thu, 16 Mar 2017 21:52:31 +0000 (14:52 -0700)]
A11y shortcut settings enhancement
Adding shortcut on/off switch, improving the service picker,
and adding a switch to enable the shortcut on the lock screen.
Also adjusted setting search code to avoid indexing the
accessibility shortcut aside from the main accessibility settings
page.
Bug:
35872328
Bug:
35219988
Test: Ran in a variety of conditions, ran existing settings test.
Also added basic robo test, verified existing robo tests pass.
Change-Id: I4da9bad74caf96d9c8f3640e7db5417b4ee5d602
Doris Ling [Fri, 24 Mar 2017 20:10:09 +0000 (13:10 -0700)]
Fix crash in TetherSettings.
In onCreate(), it checkes whether ui is restricted, and try to show an
empty screen by creating a new preference screen. However, when the
preference is not attached, it failed to get the next preference id.
Instead of replacing the current screen with a new one, remove all the
preferences on the screen.
Change-Id: I085bee025cfeabaf4aefacb717d145e668bd85e1
Fix:
36589767
Test: manual
Lei Yu [Fri, 24 Mar 2017 20:01:22 +0000 (20:01 +0000)]
Merge "Change dialog theme for dialog activity."
Saige McVea [Thu, 23 Mar 2017 22:57:44 +0000 (15:57 -0700)]
Resolved accessibility service preference summary strings to use a common resource.
Test: Manual
Bug:
34682532
Change-Id: Idf617fb5008181a0739689e40fef6b3a86aaf72b
Casey Burkhardt [Fri, 24 Mar 2017 19:35:19 +0000 (19:35 +0000)]
Merge "Updates to Magnification Settings"
TreeHugger Robot [Fri, 24 Mar 2017 19:11:08 +0000 (19:11 +0000)]
Merge "Use DevicePolicyManager#isSecurityLoggingEnabled"
TreeHugger Robot [Fri, 24 Mar 2017 18:50:48 +0000 (18:50 +0000)]
Merge "Set about phone subtext to device model string."
Yohei Yukawa [Fri, 24 Mar 2017 18:50:23 +0000 (18:50 +0000)]
Merge "Deprecate IMM#showSoftInputUnchecked() part 2"
Amin Shaikh [Thu, 23 Mar 2017 23:15:12 +0000 (16:15 -0700)]
Populate summary for top level wifi picker options
Screenshot: https://drive.google.com/file/d/0B8qSkjrtrXEPLTh0ZTRnMWFWX2M/view
Bug:
36532777
Test: make RunSettingsRoboTests
Change-Id: I9b364ecc4d71de484216f848c853db91a2a08fa7
Amin Shaikh [Fri, 24 Mar 2017 00:56:17 +0000 (17:56 -0700)]
Update WriteWifiConfigToNfcDialog.
- Use the new WifiManager API to retrieve the WPS NFC token for the
current network.
- Add WifiManagerWrapper class to support testing because Robolectric
does not yet support testing Android O.
Bug:
35725168
Test: m RunSettingsRoboTests
Change-Id: I7805bdcbe02dc262083bcd371d4ad88d256f8089
TreeHugger Robot [Fri, 24 Mar 2017 16:53:00 +0000 (16:53 +0000)]
Merge "Add strings for default apps"
Sergio Sancho [Fri, 24 Mar 2017 16:43:03 +0000 (16:43 +0000)]
Merge "Adding new strings for the Settings changes on TTS for Android O."
Robin Lee [Fri, 24 Mar 2017 16:24:59 +0000 (16:24 +0000)]
Merge "String for blank security "user credentials" page"
Charles He [Fri, 24 Mar 2017 14:03:55 +0000 (14:03 +0000)]
VPN settings: update strings for always-on VPN
To conform with UX guidelines and conventions, the following changes are
made to the UI of app VPN's PreferenceFragment:
(1. Always-on toggle title stays the same)
2. Always-on toggle subtext changes from "active"/"inactive" to an
explanation of the feature
3. Lockdown toggle title is shortened
4. Lockdown toggle subtext is removed completely
And the following changes are made to the legacy VPN's ConfigDialog:
5. Error message that is displayed below the "Always-on VPN" checkbox
6. Replacing \u2019 with \'
Bug:
36382729
Test: manually navigate through VPN settings
Test: make SettingsRoboTests
Change-Id: If1b4faec8743dfbf6e3f8062b53190ad63700d25
TreeHugger Robot [Fri, 24 Mar 2017 15:26:45 +0000 (15:26 +0000)]
Merge "Hide potentially invisible DO Disclosures by default"
Denis Kuznetsov [Tue, 21 Mar 2017 21:04:13 +0000 (22:04 +0100)]
Add strings for default apps
Bug:
32692748
Test: none
Change-Id: Ie37b70901463e763794bf4882c223623e46cb51a
liurong [Fri, 24 Mar 2017 12:11:48 +0000 (20:11 +0800)]
[VpnSettings]Crash when activity has been recycled
This is a case we found in monkey test, the main thread handles message while the activity has been recycled. It will raise a NullPointerException when we use getActivity() in following lines.
Assumpt the situation is: settings run in background and activity been recycled quickly, but handler still in the process.
Test: NA
Change-Id: I19db4f13e13294618ec8e42e4d9c54ce23504344
Signed-off-by: liurong <liurong@xiaomi.com>
Robin Lee [Fri, 24 Mar 2017 14:50:05 +0000 (14:50 +0000)]
UserCredentialsSettings: that fresh new blank look
Less obviously easy than it looks because we want to make it a
SettingsPreferenceFragment for consistency with the other blank
fragment implementations.
Fix:
30878596
Test: make RunSettingsRoboTests
Test: # open up Settings and have a look, uninstall cert, reinstall cert
Change-Id: Ifbe3132475c3104d76589a50dec3f436b9548585
TreeHugger Robot [Fri, 24 Mar 2017 14:27:50 +0000 (14:27 +0000)]
Merge "Enterprise string clean-up for O"
TreeHugger Robot [Fri, 24 Mar 2017 14:20:41 +0000 (14:20 +0000)]
Merge "Update List of apps on device string, remove "XX apps" string."
Sergio Sancho [Fri, 24 Mar 2017 13:36:21 +0000 (13:36 +0000)]
Adding new strings for the Settings changes on TTS for Android O.
Change-Id: Ic984dfe3c9d1a1f8a308e5250d497f9024619421
Test: mmm -j20 packages/apps/Settings
Change-Id: I0e83c3793797da4488ce767e46f4597b3b66ab9e
Bartosz Fabianowski [Fri, 24 Mar 2017 13:35:49 +0000 (14:35 +0100)]
Use DevicePolicyManager#isSecurityLoggingEnabled
Now that this method has been opened up to callers with system UID,
use it.
Bug:
36584321
Test: Settings runs (it would crash if it had no access to the method)
Change-Id: I30254ab08e434d5e2b58f41ddaf7d85b4dcd96b0
Bartosz Fabianowski [Fri, 24 Mar 2017 10:28:09 +0000 (11:28 +0100)]
Hide potentially invisible DO Disclosures by default
Hiding/unhiding a pref triggers an animation. DO Disclosures that may
not be visible should be hidden by default so that they fade in if
applicable, not fade out if not applicable.
Also, the network and security logging disclosures should only be shown
if logging is currently on or was on in the past and a network log was
retrieved at least once.
Bug:
32692748
Test: m RunSettingsRoboTests
Change-Id: I8c85f2f66ba295f145e5f5e79febb1b1a9bc6ede
Robin Lee [Fri, 24 Mar 2017 13:29:11 +0000 (13:29 +0000)]
String for blank security "user credentials" page
This is shown when the user doesn't have any private keys in TPM yet.
Bug:
30878596
Change-Id: Ic24acf4b5251ec442babfddd4d4212e05c461ec4
Julia Reynolds [Thu, 23 Mar 2017 15:06:26 +0000 (11:06 -0400)]
Notification & DND string changes
Test: make
Change-Id: I4273683184b109d055eb4706a640521a59f6faa1
Fixes:
36539297
Charles He [Thu, 23 Mar 2017 21:50:03 +0000 (21:50 +0000)]
Enterprise string clean-up for O
Bug:
34326838
Test: make
Change-Id: I10fc5c2b377f0c0f0cf68732c2af6e01e270844f
Denis Kuznetsov [Wed, 22 Mar 2017 14:41:38 +0000 (15:41 +0100)]
Update List of apps on device string,
remove "XX apps" string.
Bug:
32692748
Test: m RunSettingsRoboTests
Change-Id: I64f833497b5362f95cfc56a1057d97d9539ff029
Casey Burkhardt [Thu, 23 Mar 2017 01:19:19 +0000 (18:19 -0700)]
Updates to Magnification Settings
Restructures accessibility settings to support multiple
magnification modes.
Removes "preview" behavior within magnification settings
Test: Manual
Bug:
30960346
Bug:
36136580
Change-Id: I9f95b8ef2460f5178336e8cb44b10a2553d28ea9
TreeHugger Robot [Fri, 24 Mar 2017 02:25:47 +0000 (02:25 +0000)]
Merge "Sort saved networks using case insensitive order."
TreeHugger Robot [Fri, 24 Mar 2017 01:26:23 +0000 (01:26 +0000)]
Merge "Update string for Apps & notifications page."
TreeHugger Robot [Fri, 24 Mar 2017 01:16:41 +0000 (01:16 +0000)]
Merge "Update string for battery optimization dialog"
TreeHugger Robot [Fri, 24 Mar 2017 01:12:58 +0000 (01:12 +0000)]
Merge "Set WIFI_IP_SETTINGS as intent for ConfigureWifiSettings."
TreeHugger Robot [Fri, 24 Mar 2017 00:50:33 +0000 (00:50 +0000)]
Merge "Add test for UserSetting's summary provider."
TreeHugger Robot [Fri, 24 Mar 2017 00:47:36 +0000 (00:47 +0000)]
Merge "Change "When in VR mode" to full screen radio button picker"
Amin Shaikh [Fri, 24 Mar 2017 00:43:59 +0000 (17:43 -0700)]
Sort saved networks using case insensitive order.
Bug:
36570745
Test: m RunSettingsRoboTests
Change-Id: Ie2b2d6dc012429f3ac57f24db26720e67e0bac13
Fan Zhang [Thu, 23 Mar 2017 23:42:13 +0000 (16:42 -0700)]
Set about phone subtext to device model string.
Also remove useless custom preference
Fix:
36395109
Test: robotests
Change-Id: I07297e6ade6991a8262473c9f59c21d914300244
TreeHugger Robot [Fri, 24 Mar 2017 00:10:36 +0000 (00:10 +0000)]
Merge "Fix bug: UserPreference's gear icon got accidentally hidden"
TreeHugger Robot [Thu, 23 Mar 2017 23:42:14 +0000 (23:42 +0000)]
Merge "Update string for Connected devices page."
TreeHugger Robot [Thu, 23 Mar 2017 23:36:55 +0000 (23:36 +0000)]
Merge "Update text for security & screen lock page."
Doris Ling [Thu, 23 Mar 2017 23:30:13 +0000 (16:30 -0700)]
Update string for Apps & notifications page.
Bug:
36376411
Test: builds
Change-Id: I3d1d9535f9aed652857f010e3f935f7edf132dd2
Doris Ling [Thu, 23 Mar 2017 23:06:36 +0000 (16:06 -0700)]
Add test for UserSetting's summary provider.
Change-Id: I5197c109f65f4049e27e704552a2206b19919df3
Fix:
36540644
Test: make RunSettingsRoboTests
Fan Zhang [Thu, 23 Mar 2017 22:48:15 +0000 (15:48 -0700)]
Update string for battery optimization dialog
Change-Id: Iea95bec173ac6cdabc10c32ae51604f190f6f42f
Fix:
36569198
Test: builds
Fan Zhang [Thu, 23 Mar 2017 21:38:53 +0000 (14:38 -0700)]
Fix bug: UserPreference's gear icon got accidentally hidden
Change-Id: I9715c3aff20ca8b7a324bd2f8629755690ddc119
Fix:
36545470
Test: make RunSettingsRoboTests
TreeHugger Robot [Thu, 23 Mar 2017 22:24:01 +0000 (22:24 +0000)]
Merge "Update settings homepage summary text."
TreeHugger Robot [Thu, 23 Mar 2017 22:22:24 +0000 (22:22 +0000)]
Merge "Split the plurals strings with zero quantity."
Daniel Nishi [Thu, 23 Mar 2017 22:16:18 +0000 (22:16 +0000)]
Merge "Add icons to the main static storage setting prefs."
TreeHugger Robot [Thu, 23 Mar 2017 21:45:35 +0000 (21:45 +0000)]
Merge "Changed the ambient display setting name"
Doris Ling [Thu, 23 Mar 2017 21:42:01 +0000 (14:42 -0700)]
Update text for security & screen lock page.
Bug:
36540633
Test: builds
Change-Id: I68c5243aaf359a69cdd6632dd8009bbb1357d99a
TreeHugger Robot [Thu, 23 Mar 2017 21:23:52 +0000 (21:23 +0000)]
Merge "Update text for Users & accounts page."