Merge "Request focus when EditTextPreference opens" (4c5367a1) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/CustomEditTextPreference.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.app.Dialog;
		import android.content.Context;
		import android.content.DialogInterface;
		import android.os.Bundle;
		import android.support.annotation.CallSuper;
		import android.support.v14.preference.EditTextPreferenceDialogFragment;
		import android.support.v7.preference.EditTextPreference;
		import android.util.AttributeSet;
		@@ -30,7 +31,8 @@ public class CustomEditTextPreference extends EditTextPreference {

		private CustomPreferenceDialogFragment mFragment;

		public CustomEditTextPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
		public CustomEditTextPreference(Context context, AttributeSet attrs, int defStyleAttr,
		int defStyleRes) {
		super(context, attrs, defStyleAttr, defStyleRes);
		}

		@@ -69,7 +71,12 @@ public class CustomEditTextPreference extends EditTextPreference {
		protected void onClick(DialogInterface dialog, int which) {
		}

		@CallSuper
		protected void onBindDialogView(View view) {
		final EditText editText = view.findViewById(android.R.id.edit);
		if (editText != null) {
		editText.requestFocus();
		}
		}

		private void setFragment(CustomPreferenceDialogFragment fragment) {

packages/SettingsLib/tests/robotests/src/com/android/settingslib/CustomEditTextPreferenceTest.java

0 → 100644

+67 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settingslib;

		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;

		import android.content.Context;
		import android.view.View;
		import android.widget.EditText;

		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;
		import org.robolectric.RuntimeEnvironment;
		import org.robolectric.annotation.Config;

		@RunWith(SettingsLibRobolectricTestRunner.class)
		@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
		public class CustomEditTextPreferenceTest {

		@Mock
		private View mView;

		private TestPreference mPreference;

		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		mPreference = new TestPreference(RuntimeEnvironment.application);
		}

		@Test
		public void bindDialogView_shouldRequestFocus() {
		final String testText = "";
		final EditText editText = spy(new EditText(RuntimeEnvironment.application));
		editText.setText(testText);
		when(mView.findViewById(android.R.id.edit)).thenReturn(editText);

		mPreference.onBindDialogView(mView);

		verify(editText).requestFocus();
		}

		private static class TestPreference extends CustomEditTextPreference {
		public TestPreference(Context context) {
		super(context);
		}
		}
		}