Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cd645a4 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

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

am: 9069181c

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

Change-Id: Ie822df10d4a0c64727f46a29fbb6e07e366de702
parents fb43d8d1 9069181c

res/values/ids.xml

+6 −0
Original line number Diff line number Diff line
@@ -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>

src/com/android/settings/ChooseLockGeneric.java

+5 −0
Original line number Diff line number Diff line
@@ -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() {

src/com/android/settings/EncryptionInterstitial.java

+4 −0
Original line number Diff line number Diff line
@@ -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(