OSDN Git Service

Remove duplicates in Security Settings
authorMatthew Fritze <mfritze@google.com>
Thu, 11 May 2017 18:56:27 +0000 (11:56 -0700)
committerMatthew Fritze <mfritze@google.com>
Tue, 23 May 2017 17:43:14 +0000 (10:43 -0700)
commit2e34a64a55665e40bea7b23b075be103afde7e4f
tree9fd58ad90bbc81376cca9fec01ae0aa9c0db11e9
parent78c89c4d509b194f71a7f0711829ea0c5b9914ba
Remove duplicates in Security Settings

Duplicates:
- Location
- Scanning
- Encryption and Credentials
- Screen Pinning
- Device Admin Apps

Merge for ag/2247508

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I91566b8fb7fdb3b39c8833a6fa8e52bbbf6507b6
res/xml/encryption_and_credential.xml
res/xml/location_scanning.xml
src/com/android/settings/SecuritySettings.java
tests/robotests/src/com/android/settings/SecuritySettingsTest.java
tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java [new file with mode: 0644]