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

Clean up choose lock intent creation

Browse Source 
Consolidated the many variants of ChooseLock*.createIntent, so that
it will take the same set of arguments.

Also modified SetupChooseLock*.createIntent to modifyIntentForSetup,
which will take the intent created by ChooseLock* and modify it for
use with setup.

Test: cd tests/robotests && mma
Change-Id: I5ff033f459c33ec9980872a536b3996d89f2bbbb
This commit is contained in:
Maurice Lam
2017-04-28 16:18:47 -07:00
parent 1949776c59
commit 2eb170cd6f
55 changed files with 510 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/app/src/com/android/settings/ChooseLockGenericTest.java → tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings;
package com.android.settings.password;
import static android.support.test.InstrumentationRegistry.getInstrumentation;
import static android.support.test.InstrumentationRegistry.getTargetContext;
@@ -56,7 +56,7 @@ import java.util.List;
* m SettingsTests &&
* adb install \
* -r -g ${ANDROID_PRODUCT_OUT}/data/app/SettingsTests/SettingsTests.apk &&
* adb shell am instrument -e class com.android.settings.ChooseLockGenericTest \
* adb shell am instrument -e class com.android.settings.password.ChooseLockGenericTest \
* -w com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner
*/
@RunWith(AndroidJUnit4.class)

4
tests/app/src/com/android/settings/ConfirmLockPasswordTest.java → tests/app/src/com/android/settings/password/ConfirmLockPasswordTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License
*/
package com.android.settings;
package com.android.settings.password;
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.pressKey;
@@ -30,6 +30,8 @@ import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import android.view.KeyEvent;
import com.android.settings.R;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;