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

Merge "Fix reset button being disabled."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-23 20:51:28 +00:00
committed by Android (Google) Code Review
parent b93f6c171c 1f49715466
commit f783267a57
2 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/com/android/settings/MasterClear.java
View File

@@ -73,7 +73,7 @@ import java.util.List;
* *
* This is the initial screen. * This is the initial screen.
*/ */
public class MasterClear extends InstrumentedFragment { public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutListener {
private static final String TAG = "MasterClear"; private static final String TAG = "MasterClear";
@VisibleForTesting static final int KEYGUARD_REQUEST = 55; @VisibleForTesting static final int KEYGUARD_REQUEST = 55;
@@ -86,20 +86,17 @@ public class MasterClear extends InstrumentedFragment {
static final String ERASE_ESIMS_EXTRA = "erase_esim"; static final String ERASE_ESIMS_EXTRA = "erase_esim";
private View mContentView; private View mContentView;
private Button mInitiateButton; @VisibleForTesting Button mInitiateButton;
private View mExternalStorageContainer; private View mExternalStorageContainer;
@VisibleForTesting CheckBox mExternalStorage; @VisibleForTesting CheckBox mExternalStorage;
private View mEsimStorageContainer; private View mEsimStorageContainer;
@VisibleForTesting CheckBox mEsimStorage; @VisibleForTesting CheckBox mEsimStorage;
private ScrollView mScrollView; @VisibleForTesting ScrollView mScrollView;
private final OnGlobalLayoutListener mOnGlobalLayoutListener = new OnGlobalLayoutListener() { @Override
@Override public void onGlobalLayout() {
public void onGlobalLayout() { mInitiateButton.setEnabled(hasReachedBottom(mScrollView));
mScrollView.getViewTreeObserver().removeOnGlobalLayoutListener(mOnGlobalLayoutListener); }
mInitiateButton.setEnabled(hasReachedBottom(mScrollView));
}
};
@Override @Override
public void onCreate(@Nullable Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -259,13 +256,16 @@ public class MasterClear extends InstrumentedFragment {
*/ */
@VisibleForTesting @VisibleForTesting
void establishInitialState() { void establishInitialState() {
mInitiateButton = (Button) mContentView.findViewById(R.id.initiate_master_clear); mInitiateButton = mContentView.findViewById(R.id.initiate_master_clear);
mInitiateButton.setOnClickListener(mInitiateListener); mInitiateButton.setOnClickListener(mInitiateListener);
mExternalStorageContainer = mContentView.findViewById(R.id.erase_external_container); mExternalStorageContainer = mContentView.findViewById(R.id.erase_external_container);
mExternalStorage = (CheckBox) mContentView.findViewById(R.id.erase_external); mExternalStorage = mContentView.findViewById(R.id.erase_external);
mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container); mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
mEsimStorage = (CheckBox) mContentView.findViewById(R.id.erase_esim); mEsimStorage = mContentView.findViewById(R.id.erase_esim);
mScrollView = (ScrollView) mContentView.findViewById(R.id.master_clear_scrollview); if (mScrollView != null) {
mScrollView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
}
mScrollView = mContentView.findViewById(R.id.master_clear_scrollview);
/* /*
* If the external storage is emulated, it will be erased with a factory * If the external storage is emulated, it will be erased with a factory
@@ -322,8 +322,8 @@ public class MasterClear extends InstrumentedFragment {
final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE); final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
loadAccountList(um); loadAccountList(um);
StringBuffer contentDescription = new StringBuffer(); final StringBuffer contentDescription = new StringBuffer();
View masterClearContainer = mContentView.findViewById(R.id.master_clear_container); final View masterClearContainer = mContentView.findViewById(R.id.master_clear_container);
getContentDescription(masterClearContainer, contentDescription); getContentDescription(masterClearContainer, contentDescription);
masterClearContainer.setContentDescription(contentDescription); masterClearContainer.setContentDescription(contentDescription);
@@ -334,12 +334,13 @@ public class MasterClear extends InstrumentedFragment {
int oldScrollY) { int oldScrollY) {
if (v instanceof ScrollView && hasReachedBottom((ScrollView) v)) { if (v instanceof ScrollView && hasReachedBottom((ScrollView) v)) {
mInitiateButton.setEnabled(true); mInitiateButton.setEnabled(true);
mScrollView.setOnScrollChangeListener(null);
} }
} }
}); });
// Set the initial state of the initiateButton // Set the initial state of the initiateButton
mScrollView.getViewTreeObserver().addOnGlobalLayoutListener(mOnGlobalLayoutListener); mScrollView.getViewTreeObserver().addOnGlobalLayoutListener(this);
} }
/** /**

24
tests/robotests/src/com/android/settings/MasterClearTest.java
View File

@@ -24,6 +24,7 @@ import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -33,7 +34,6 @@ import static org.robolectric.Shadows.shadowOf;
import android.accounts.Account; import android.accounts.Account;
import android.accounts.AccountManager; import android.accounts.AccountManager;
import android.app.Activity; import android.app.Activity;
import android.app.Fragment;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
@@ -41,11 +41,11 @@ import android.content.Intent;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.os.Bundle;
import android.provider.Settings; import android.provider.Settings;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.CheckBox; import android.view.ViewTreeObserver;
import android.widget.Button;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.ScrollView; import android.widget.ScrollView;
@@ -61,7 +61,6 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric; import org.robolectric.Robolectric;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowAccountManager;
import org.robolectric.shadows.ShadowActivity; import org.robolectric.shadows.ShadowActivity;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@@ -76,8 +75,6 @@ public class MasterClearTest {
private static final String TEST_CONFIRMATION_CLASS = "android.test.conf.pkg.ConfActivity"; private static final String TEST_CONFIRMATION_CLASS = "android.test.conf.pkg.ConfActivity";
private static final String TEST_ACCOUNT_NAME = "test@example.com"; private static final String TEST_ACCOUNT_NAME = "test@example.com";
@Mock
private MasterClear mMasterClear;
@Mock @Mock
private ScrollView mScrollView; private ScrollView mScrollView;
@Mock @Mock
@@ -95,8 +92,8 @@ public class MasterClearTest {
@Mock @Mock
private Intent mMockIntent; private Intent mMockIntent;
private MasterClear mMasterClear;
private ShadowActivity mShadowActivity; private ShadowActivity mShadowActivity;
private ShadowAccountManager mShadowAccountManager;
private Activity mActivity; private Activity mActivity;
private View mContentView; private View mContentView;
@@ -372,6 +369,19 @@ public class MasterClearTest {
assertThat(mMasterClear.isValidRequestCode(0)).isFalse(); assertThat(mMasterClear.isValidRequestCode(0)).isFalse();
} }
@Test
public void testOnGlobalLayout_shouldNotRemoveListener() {
final ViewTreeObserver viewTreeObserver = mock(ViewTreeObserver.class);
mMasterClear.mScrollView = mScrollView;
mMasterClear.mInitiateButton = mock(Button.class);
doReturn(true).when(mMasterClear).hasReachedBottom(any());
when(mScrollView.getViewTreeObserver()).thenReturn(viewTreeObserver);
mMasterClear.onGlobalLayout();
verify(viewTreeObserver, never()).removeOnGlobalLayoutListener(mMasterClear);
}
private void initScrollView(int height, int scrollY, int childBottom) { private void initScrollView(int height, int scrollY, int childBottom) {
when(mScrollView.getHeight()).thenReturn(height); when(mScrollView.getHeight()).thenReturn(height);
when(mScrollView.getScrollY()).thenReturn(scrollY); when(mScrollView.getScrollY()).thenReturn(scrollY);