From 9d6f5d6f1d970e0dd3772697f64680bd47d20f61 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Fri, 22 Sep 2017 13:28:29 -0700 Subject: [PATCH] Introduce SelectDebugAppPreferenceController - Create new SelectDebugAppPreferenceController - Update onActivityResult to loop through all controllers - Add new activity request code - Create controller inside the DashboardFragment - Port logic from DevelopmentSettings into the controller Bug: 34203528 Test: make RunSettingsRoboTests -j40 Change-Id: I90b1da2d536389e45d717adffb3b190ec13b9a2a --- .../DevelopmentOptionsActivityRequestCodes.java | 2 + .../DevelopmentSettingsDashboardFragment.java | 18 ++- .../SelectDebugAppPreferenceController.java | 132 +++++++++++++++++++ .../SelectDebugAppPreferenceControllerTest.java | 145 +++++++++++++++++++++ 4 files changed, 290 insertions(+), 7 deletions(-) create mode 100644 src/com/android/settings/development/SelectDebugAppPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java diff --git a/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java b/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java index 54d1fa39d2..667ae3115e 100644 --- a/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java +++ b/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java @@ -21,4 +21,6 @@ package com.android.settings.development; */ public interface DevelopmentOptionsActivityRequestCodes { int REQUEST_CODE_ENABLE_OEM_UNLOCK = 0; + + int REQUEST_CODE_DEBUG_APP = 1; } diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 787ce16c2b..7f99cc2009 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -122,15 +122,19 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { + boolean handledResult = false; for (AbstractPreferenceController controller : mPreferenceControllers) { if (controller instanceof DeveloperOptionsPreferenceController) { - if (((DeveloperOptionsPreferenceController) controller).onActivityResult( - requestCode, resultCode, data)) { - return; - } + // We do not break early because it is possible for multiple controllers to + // handle the same result code. + handledResult |= + ((DeveloperOptionsPreferenceController) controller).onActivityResult( + requestCode, resultCode, data); } } - super.onActivityResult(requestCode, resultCode, data); + if (!handledResult) { + super.onActivityResult(requestCode, resultCode, data); + } } @Override @@ -193,8 +197,8 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra // bug report shortcut // select mock location app controllers.add(new DebugViewAttributesPreferenceController(context)); - // select debug app - // wait for debugger + controllers.add(new SelectDebugAppPreferenceController(context, fragment)); + //controllers.add(new WaitForDebuggerPreferenceController(context)); // verify apps over usb // logger buffer sizes // store logger data persistently on device diff --git a/src/com/android/settings/development/SelectDebugAppPreferenceController.java b/src/com/android/settings/development/SelectDebugAppPreferenceController.java new file mode 100644 index 0000000000..c1f04f2186 --- /dev/null +++ b/src/com/android/settings/development/SelectDebugAppPreferenceController.java @@ -0,0 +1,132 @@ +/* + * 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.settings.development; + +import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes + .REQUEST_CODE_DEBUG_APP; + +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; +import android.provider.Settings; +import android.support.annotation.VisibleForTesting; +import android.support.v7.preference.Preference; +import android.support.v7.preference.PreferenceScreen; + +import com.android.settings.R; +import com.android.settingslib.wrapper.PackageManagerWrapper; + +public class SelectDebugAppPreferenceController extends DeveloperOptionsPreferenceController { + + private static final String DEBUG_APP_KEY = "debug_app"; + + private final DevelopmentSettingsDashboardFragment mFragment; + private final PackageManagerWrapper mPackageManager; + + private Preference mPreference; + + public SelectDebugAppPreferenceController(Context context, + DevelopmentSettingsDashboardFragment fragment) { + super(context); + mFragment = fragment; + mPackageManager = new PackageManagerWrapper(mContext.getPackageManager()); + } + + @Override + public boolean isAvailable() { + return true; + } + + @Override + public String getPreferenceKey() { + return DEBUG_APP_KEY; + } + + @Override + public void displayPreference(PreferenceScreen screen) { + super.displayPreference(screen); + + mPreference = screen.findPreference(getPreferenceKey()); + } + + @Override + public boolean handlePreferenceTreeClick(Preference preference) { + if (DEBUG_APP_KEY.equals(preference.getKey())) { + final Intent intent = getActivityStartIntent(); + intent.putExtra(AppPicker.EXTRA_DEBUGGABLE, true /* value */); + mFragment.startActivityForResult(intent, REQUEST_CODE_DEBUG_APP); + return true; + } + return false; + } + + @Override + public void updateState(Preference preference) { + updatePreferenceSummary(); + } + + @Override + public boolean onActivityResult(int requestCode, int resultCode, Intent data) { + if (requestCode != REQUEST_CODE_DEBUG_APP || resultCode != Activity.RESULT_OK) { + return false; + } + Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP, + data.getAction()); + updatePreferenceSummary(); + return true; + } + + @Override + protected void onDeveloperOptionsSwitchEnabled() { + mPreference.setEnabled(true); + } + + @Override + protected void onDeveloperOptionsSwitchDisabled() { + mPreference.setEnabled(false); + mPreference.setSummary(mContext.getResources().getString(R.string.debug_app_not_set)); + } + + @VisibleForTesting + Intent getActivityStartIntent() { + return new Intent(mContext, AppPicker.class); + } + + private void updatePreferenceSummary() { + final String debugApp = Settings.Global.getString( + mContext.getContentResolver(), Settings.Global.DEBUG_APP); + if (debugApp != null && debugApp.length() > 0) { + mPreference.setSummary(mContext.getResources().getString(R.string.debug_app_set, + getAppLabel(debugApp))); + } else { + mPreference.setSummary(mContext.getResources().getString(R.string.debug_app_not_set)); + } + } + + private String getAppLabel(String debugApp) { + try { + final ApplicationInfo ai = mPackageManager.getApplicationInfo(debugApp, + PackageManager.GET_DISABLED_COMPONENTS); + final CharSequence lab = mPackageManager.getApplicationLabel(ai); + return lab != null ? lab.toString() : debugApp; + } catch (PackageManager.NameNotFoundException e) { + return debugApp; + } + } +} diff --git a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java new file mode 100644 index 0000000000..03f4972b06 --- /dev/null +++ b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java @@ -0,0 +1,145 @@ +/* + * 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.settings.development; + +import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes + .REQUEST_CODE_DEBUG_APP; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.provider.Settings; +import android.support.v7.preference.Preference; +import android.support.v7.preference.PreferenceScreen; + +import com.android.settings.R; +import com.android.settings.TestConfig; +import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settingslib.wrapper.PackageManagerWrapper; + +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; +import org.robolectric.util.ReflectionHelpers; + +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class SelectDebugAppPreferenceControllerTest { + + @Mock + private Preference mPreference; + @Mock + private PreferenceScreen mPreferenceScreen; + @Mock + private DevelopmentSettingsDashboardFragment mFragment; + @Mock + private PackageManagerWrapper mPackageManagerWrapper; + + private Context mContext; + private SelectDebugAppPreferenceController mController; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; + mController = spy(new SelectDebugAppPreferenceController(mContext, mFragment)); + ReflectionHelpers.setField(mController, "mPackageManager" /* field name */, + mPackageManagerWrapper); + when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( + mPreference); + mController.displayPreference(mPreferenceScreen); + } + + @Test + public void handlePreferenceTreeClick_preferenceClicked_launchActivity() { + final Intent activityStartIntent = new Intent(mContext, AppPicker.class); + final String preferenceKey = mController.getPreferenceKey(); + doReturn(activityStartIntent).when(mController).getActivityStartIntent(); + when(mPreference.getKey()).thenReturn(preferenceKey); + mController.handlePreferenceTreeClick(mPreference); + + verify(mFragment).startActivityForResult(activityStartIntent, REQUEST_CODE_DEBUG_APP); + } + + @Test + public void updateState_foobarAppSelected_shouldUpdateSummaryWithDebugAppLabel() { + final String debugApp = "foobar"; + Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP, + debugApp); + mController.updateState(mPreference); + + verify(mPreference).setSummary( + mContext.getResources().getString(R.string.debug_app_set, debugApp)); + } + + @Test + public void updateState_noAppSelected_shouldUpdateSummaryWithNoAppSelected() { + final String debugApp = null; + Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP, + debugApp); + mController.updateState(mPreference); + + verify(mPreference).setSummary( + mContext.getResources().getString(R.string.debug_app_not_set)); + } + + @Test + public void onActivityResult_foobarAppSelected_shouldUpdateSummaryWithDebugLabel() { + Intent activityResultIntent = new Intent(mContext, AppPicker.class); + final String appLabel = "foobar"; + activityResultIntent.setAction(appLabel); + final boolean result = mController.onActivityResult(REQUEST_CODE_DEBUG_APP, + Activity.RESULT_OK, activityResultIntent); + + assertThat(result).isTrue(); + verify(mPreference).setSummary( + mContext.getResources().getString(R.string.debug_app_set, appLabel)); + } + + @Test + public void onActivityResult_badRequestCode_shouldReturnFalse() { + assertThat(mController.onActivityResult( + -1 /* requestCode */, -1 /* resultCode */, null /* intent */)).isFalse(); + } + + @Test + public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() { + mController.onDeveloperOptionsSwitchEnabled(); + + verify(mPreference).setEnabled(true); + } + + @Test + public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() { + mController.onDeveloperOptionsSwitchDisabled(); + + verify(mPreference).setEnabled(false); + verify(mPreference).setSummary( + mContext.getResources().getString(R.string.debug_app_not_set)); + } +} -- 2.11.0