diff options
| author | 2016-08-04 02:15:51 +0000 | |
|---|---|---|
| committer | 2016-08-04 02:15:53 +0000 | |
| commit | 5f48b026f0eaffbb8c0e1e2cddd293658242fdfb (patch) | |
| tree | 2e28bc751e20089af3820feb9d08bbc4fdf9190c /packages/Shell | |
| parent | fa69f7802f0e37b4a5463fd13e0d5bf200357a85 (diff) | |
| parent | da1fbdd6f27534edd458b682409592da8415abd6 (diff) | |
Merge "Enable name text field when re-using the details dialog."
Diffstat (limited to 'packages/Shell')
| -rw-r--r-- | packages/Shell/src/com/android/shell/BugreportProgressService.java | 1 | ||||
| -rw-r--r-- | packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java index a677ba54c05e..5d23b07b8e28 100644 --- a/packages/Shell/src/com/android/shell/BugreportProgressService.java +++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java @@ -1483,6 +1483,7 @@ public class BugreportProgressService extends Service { // Re-use view, but reset fields first. mDialog.setTitle(dialogTitle); mInfoName.setText(null); + mInfoName.setEnabled(true); mInfoTitle.setText(null); mInfoDescription.setText(null); } diff --git a/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java b/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java index 0b590c0f39b1..c7c7fc5e7491 100644 --- a/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java +++ b/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java @@ -419,6 +419,7 @@ public class BugreportReceiverTest extends InstrumentationTestCase { detailsUi.assertName(NAME); detailsUi.assertTitle(""); detailsUi.assertDescription(""); + assertTrue("didn't enable name on UI", detailsUi.nameField.isEnabled()); detailsUi.nameField.setText(NEW_NAME); detailsUi.titleField.setText(TITLE); detailsUi.descField.setText(DESCRIPTION); @@ -433,6 +434,7 @@ public class BugreportReceiverTest extends InstrumentationTestCase { detailsUi.assertName(NAME2); detailsUi.assertTitle(""); detailsUi.assertDescription(""); + assertTrue("didn't enable name on UI", detailsUi.nameField.isEnabled()); detailsUi.nameField.setText(NEW_NAME2); detailsUi.titleField.setText(TITLE2); detailsUi.descField.setText(DESCRIPTION2); |