PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Mark UI components for tests to find." into nyc-dev

Browse Source 
am: 9069181

* commit '9069181c847168896c6fac97e8869944c97f0f2e':
  Mark UI components for tests to find.

Change-Id: Ie822df10d4a0c64727f46a29fbb6e07e366de702
This commit is contained in:
Jeff Sharkey
2016-04-03 04:09:00 +00:00
committed by android-build-merger
parent fb43d8d100 9069181c84
commit 6cd645a487
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/ids.xml
View File

@@ -18,4 +18,10 @@
-->
<resources>
<item type="id" name="preference_highlight_key" />
<item type="id" name="lock_none" />
<item type="id" name="lock_pin" />
<item type="id" name="lock_password" />
<item type="id" name="encrypt_dont_require_password" />
</resources>

5
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -350,6 +350,11 @@ public class ChooseLockGeneric extends SettingsActivity {
protected void addPreferences() {
addPreferencesFromResource(R.xml.security_settings_picker);
// Used for testing purposes
findPreference(KEY_UNLOCK_SET_NONE).setViewId(R.id.lock_none);
findPreference(KEY_UNLOCK_SET_PIN).setViewId(R.id.lock_pin);
findPreference(KEY_UNLOCK_SET_PASSWORD).setViewId(R.id.lock_password);
}
private void updatePreferenceText() {

4
src/com/android/settings/EncryptionInterstitial.java
View File

@@ -90,6 +90,10 @@ public class EncryptionInterstitial extends SettingsActivity {
addPreferencesFromResource(R.xml.security_settings_encryption_interstitial);
// Used for testing purposes
findPreference(KEY_ENCRYPT_DONT_REQUIRE_PASSWORD)
.setViewId(R.id.encrypt_dont_require_password);
mRequirePasswordToDecrypt = findPreference(KEY_ENCRYPT_REQUIRE_PASSWORD);
mDontRequirePasswordToDecrypt = findPreference(KEY_ENCRYPT_DONT_REQUIRE_PASSWORD);
boolean forFingerprint = getActivity().getIntent().getBooleanExtra(