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

Merge "Rename files for consistency."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-25 02:36:36 +00:00
committed by Android (Google) Code Review
parent 63e09f1f8e 9c07451786
commit 2f83dc76b6
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2.java → src/com/android/settings/development/CameraHalHdrplusPreferenceControllerV2.java
View File

@@ -29,7 +29,7 @@ import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class CameraHalHdrPlusPreferenceControllerV2 extends public class CameraHalHdrplusPreferenceControllerV2 extends
DeveloperOptionsPreferenceController implements DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener, PreferenceControllerMixin { Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
@@ -45,7 +45,7 @@ public class CameraHalHdrPlusPreferenceControllerV2 extends
private SwitchPreference mPreference; private SwitchPreference mPreference;
public CameraHalHdrPlusPreferenceControllerV2(Context context) { public CameraHalHdrplusPreferenceControllerV2(Context context) {
super(context); super(context);
} }

2
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -376,7 +376,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllers.add(new LogPersistPreferenceControllerV2(context, fragment, lifecycle)); controllers.add(new LogPersistPreferenceControllerV2(context, fragment, lifecycle));
controllers.add(new ConnectivityMonitorPreferenceControllerV2(context)); controllers.add(new ConnectivityMonitorPreferenceControllerV2(context));
controllers.add(new CameraLaserSensorPreferenceControllerV2(context)); controllers.add(new CameraLaserSensorPreferenceControllerV2(context));
controllers.add(new CameraHalHdrPlusPreferenceControllerV2(context)); controllers.add(new CameraHalHdrplusPreferenceControllerV2(context));
controllers.add(new WifiDisplayCertificationPreferenceController(context)); controllers.add(new WifiDisplayCertificationPreferenceController(context));
controllers.add(new WifiVerboseLoggingPreferenceController(context)); controllers.add(new WifiVerboseLoggingPreferenceController(context));
controllers.add(new WifiAggressiveHandoverPreferenceController(context)); controllers.add(new WifiAggressiveHandoverPreferenceController(context));

42
tests/robotests/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2Test.java → tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerV2Test.java
View File

@@ -42,7 +42,7 @@ import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
shadows = {SettingsShadowSystemProperties.class}) shadows = {SettingsShadowSystemProperties.class})
public class CameraHalHdrPlusPreferenceControllerV2Test { public class CameraHalHdrplusPreferenceControllerV2Test {
@Mock @Mock
private PreferenceScreen mScreen; private PreferenceScreen mScreen;
@@ -50,7 +50,7 @@ public class CameraHalHdrPlusPreferenceControllerV2Test {
private SwitchPreference mPreference; private SwitchPreference mPreference;
private Context mContext; private Context mContext;
private CameraHalHdrPlusPreferenceControllerV2 mController; private CameraHalHdrplusPreferenceControllerV2 mController;
static final String USERDEBUG_BUILD = "userdebug"; static final String USERDEBUG_BUILD = "userdebug";
@@ -58,7 +58,7 @@ public class CameraHalHdrPlusPreferenceControllerV2Test {
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application; mContext = RuntimeEnvironment.application;
mController = new CameraHalHdrPlusPreferenceControllerV2(mContext); mController = new CameraHalHdrplusPreferenceControllerV2(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
when(mPreference.getKey()).thenReturn(mController.getPreferenceKey()); when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
@@ -73,18 +73,18 @@ public class CameraHalHdrPlusPreferenceControllerV2Test {
@Config(qualifiers = "mcc999") @Config(qualifiers = "mcc999")
public void isAvailable_withConfigNoShowAndUserDebugBuild_shouldReturnFalse() { public void isAvailable_withConfigNoShowAndUserDebugBuild_shouldReturnFalse() {
SettingsShadowSystemProperties.set( SettingsShadowSystemProperties.set(
CameraHalHdrPlusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); CameraHalHdrplusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD);
assertThat(mController.isAvailable()).isFalse(); assertThat(mController.isAvailable()).isFalse();
} }
@Test @Test
public void updateState_cameraHalHdrPlusEnabled_shouldCheckedPreference() { public void updateState_cameraHalHdrplusEnabled_shouldCheckedPreference() {
SettingsShadowSystemProperties.set( SettingsShadowSystemProperties.set(
CameraHalHdrPlusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, CameraHalHdrplusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS,
CameraHalHdrPlusPreferenceControllerV2.ENABLED); CameraHalHdrplusPreferenceControllerV2.ENABLED);
SettingsShadowSystemProperties.set( SettingsShadowSystemProperties.set(
CameraHalHdrPlusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); CameraHalHdrplusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD);
mController.updateState(mPreference); mController.updateState(mPreference);
@@ -92,12 +92,12 @@ public class CameraHalHdrPlusPreferenceControllerV2Test {
} }
@Test @Test
public void updateState_cameraHalHdrPlusEnabled_shouldUncheckedPreference() { public void updateState_cameraHalHdrplusEnabled_shouldUncheckedPreference() {
SettingsShadowSystemProperties.set( SettingsShadowSystemProperties.set(
CameraHalHdrPlusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, CameraHalHdrplusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS,
CameraHalHdrPlusPreferenceControllerV2.DISABLED); CameraHalHdrplusPreferenceControllerV2.DISABLED);
SettingsShadowSystemProperties.set( SettingsShadowSystemProperties.set(
CameraHalHdrPlusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); CameraHalHdrplusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD);
mController.updateState(mPreference); mController.updateState(mPreference);
@@ -108,20 +108,20 @@ public class CameraHalHdrPlusPreferenceControllerV2Test {
public void onPreferenceChange_preferenceChecked_shouldEnableCameraHalHdrplus() { public void onPreferenceChange_preferenceChecked_shouldEnableCameraHalHdrplus() {
mController.onPreferenceChange(mPreference, true /* new value */); mController.onPreferenceChange(mPreference, true /* new value */);
assertThat(CameraHalHdrPlusPreferenceControllerV2.ENABLED).isEqualTo( assertThat(CameraHalHdrplusPreferenceControllerV2.ENABLED).isEqualTo(
SystemProperties.get( SystemProperties.get(
CameraHalHdrPlusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, CameraHalHdrplusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS,
CameraHalHdrPlusPreferenceControllerV2.DISABLED)); CameraHalHdrplusPreferenceControllerV2.DISABLED));
} }
@Test @Test
public void handlePreferenceTreeClick_preferenceUnchecked_shouldDisableCameraHalHdrplus() { public void handlePreferenceTreeClick_preferenceUnchecked_shouldDisableCameraHalHdrplus() {
mController.onPreferenceChange(mPreference, false /* new value */); mController.onPreferenceChange(mPreference, false /* new value */);
assertThat(CameraHalHdrPlusPreferenceControllerV2.DISABLED).isEqualTo( assertThat(CameraHalHdrplusPreferenceControllerV2.DISABLED).isEqualTo(
SystemProperties.get( SystemProperties.get(
CameraHalHdrPlusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, CameraHalHdrplusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS,
CameraHalHdrPlusPreferenceControllerV2.DISABLED)); CameraHalHdrplusPreferenceControllerV2.DISABLED));
} }
@Test @Test
@@ -137,9 +137,9 @@ public class CameraHalHdrPlusPreferenceControllerV2Test {
verify(mPreference).setEnabled(false); verify(mPreference).setEnabled(false);
verify(mPreference).setChecked(false); verify(mPreference).setChecked(false);
assertThat(CameraHalHdrPlusPreferenceControllerV2.DISABLED).isEqualTo( assertThat(CameraHalHdrplusPreferenceControllerV2.DISABLED).isEqualTo(
SystemProperties.get( SystemProperties.get(
CameraHalHdrPlusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS, CameraHalHdrplusPreferenceControllerV2.PROPERTY_CAMERA_HAL_HDRPLUS,
CameraHalHdrPlusPreferenceControllerV2.DISABLED)); CameraHalHdrplusPreferenceControllerV2.DISABLED));
} }
} }