372099560c1f82e9302173f342d057a42e1a4ba2 - platform/cts

commit	372099560c1f82e9302173f342d057a42e1a4ba2	[log] [tgz]
author	Aurimas Liutikas <aurimas@google.com>	Mon Feb 11 11:09:52 2019 -0800
committer	Aurimas Liutikas <aurimas@google.com>	Mon Feb 11 13:52:19 2019 -0800
tree	c22a4bbdb031b190e4d26e9d3d7cdba586498eb2
parent	0ad5f1d97b533514a6276075d86474515f01fd0f [diff]

Merge the two separate preference test targets

Also fix up all the style isues in the tests.

Test: atest CtsPreferenceTestCases
Change-Id: I8e3ad30e3b0a6a34621403631134cec2832bc22a

PREUPLOAD.cfg[diff]
tests/tests/preference/Android.bp[diff]
tests/tests/preference/AndroidManifest.xml[diff]
tests/tests/preference/res/drawable-hdpi/ic_launcher.png[Renamed from tests/tests/preference2/res/drawable-hdpi/ic_launcher.png - diff]
tests/tests/preference/res/drawable-ldpi/ic_launcher.png[Renamed from tests/tests/preference2/res/drawable-ldpi/ic_launcher.png - diff]
tests/tests/preference/res/drawable-mdpi/ic_launcher.png[Renamed from tests/tests/preference2/res/drawable-mdpi/ic_launcher.png - diff]
tests/tests/preference/res/drawable-mdpi/ic_settings_applications.png[Renamed from tests/tests/preference2/res/drawable-mdpi/ic_settings_applications.png - diff]
tests/tests/preference/res/drawable-mdpi/ic_settings_display.png[Renamed from tests/tests/preference2/res/drawable-mdpi/ic_settings_display.png - diff]
tests/tests/preference/res/layout/main.xml[Renamed from tests/tests/preference2/res/layout/main.xml - diff]
tests/tests/preference/res/values/arrays.xml[Renamed from tests/tests/preference2/res/values/arrays.xml - diff]
tests/tests/preference/res/values/attrs.xml[Renamed from tests/tests/preference2/res/values/attrs.xml - diff]
tests/tests/preference/res/values/colors.xml[Renamed from tests/tests/preference2/res/values/colors.xml - diff]
tests/tests/preference/res/values/strings.xml[Renamed from tests/tests/preference2/res/values/strings.xml - diff]
tests/tests/preference/res/xml/fragmented_preferences.xml[Renamed from tests/tests/preference2/res/xml/fragmented_preferences.xml - diff]
tests/tests/preference/res/xml/fragmented_preferences_inner.xml[Renamed from tests/tests/preference2/res/xml/fragmented_preferences_inner.xml - diff]
tests/tests/preference/res/xml/pref_cb.xml[Renamed from tests/tests/preference2/res/xml/pref_cb.xml - diff]
tests/tests/preference/res/xml/pref_nested.xml[Renamed from tests/tests/preference2/res/xml/pref_nested.xml - diff]
tests/tests/preference/res/xml/pref_recycle.xml[Renamed from tests/tests/preference2/res/xml/pref_recycle.xml - diff]
tests/tests/preference/res/xml/preference_dependencies.xml[Renamed from tests/tests/preference2/res/xml/preference_dependencies.xml - diff]
tests/tests/preference/res/xml/preference_headers.xml[Renamed from tests/tests/preference2/res/xml/preference_headers.xml - diff]
tests/tests/preference/res/xml/preferences.xml[Renamed from tests/tests/preference2/res/xml/preferences.xml - diff]
tests/tests/preference/res/xml/preferences2.xml[Renamed from tests/tests/preference2/res/xml/preferences2.xml - diff]
tests/tests/preference/src/android/preference/cts/CheckBoxPreferenceTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/CheckBoxPreferenceTest.java - diff]
tests/tests/preference/src/android/preference/cts/CustomCheckBoxPreference.java[Renamed from tests/tests/preference2/src/android/preference2/cts/CustomCheckBoxPreference.java - diff]
tests/tests/preference/src/android/preference/cts/CustomCheckBoxPreferenceTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/CustomCheckBoxPreferenceTest.java - diff]
tests/tests/preference/src/android/preference/cts/CustomDialogPreference.java[Renamed from tests/tests/preference2/src/android/preference2/cts/CustomDialogPreference.java - diff]
tests/tests/preference/src/android/preference/cts/CustomDialogPreferenceTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/CustomDialogPreferenceTest.java - diff]
tests/tests/preference/src/android/preference/cts/CustomEditTextPreference.java[Renamed from tests/tests/preference2/src/android/preference2/cts/CustomEditTextPreference.java - diff]
tests/tests/preference/src/android/preference/cts/CustomEditTextPreferenceTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/CustomEditTextPreferenceTest.java - diff]
tests/tests/preference/src/android/preference/cts/CustomPreference.java[Renamed from tests/tests/preference2/src/android/preference2/cts/CustomPreference.java - diff]
tests/tests/preference/src/android/preference/cts/CustomPreferenceGroup.java[Renamed from tests/tests/preference2/src/android/preference2/cts/CustomPreferenceGroup.java - diff]
tests/tests/preference/src/android/preference/cts/CustomSwitchPreference.java[Renamed from tests/tests/preference2/src/android/preference2/cts/CustomSwitchPreference.java - diff]
tests/tests/preference/src/android/preference/cts/CustomSwitchPreferenceTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/CustomSwitchPreferenceTest.java - diff]
tests/tests/preference/src/android/preference/cts/DialogPreferenceTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/DialogPreferenceTest.java - diff]
tests/tests/preference/src/android/preference/cts/EditTextPreferenceTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/EditTextPreferenceTest.java - diff]
tests/tests/preference/src/android/preference/cts/FragmentPreferences.java[Renamed from tests/tests/preference2/src/android/preference2/cts/FragmentPreferences.java - diff]
tests/tests/preference/src/android/preference/cts/FragmentPreferencesTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/FragmentPreferencesTest.java - diff]
tests/tests/preference/src/android/preference/cts/ListPreferenceTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/ListPreferenceTest.java - diff]
tests/tests/preference/src/android/preference/cts/PreferenceActivityFlowLandscapeTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/PreferenceActivityFlowLandscapeTest.java - diff]
tests/tests/preference/src/android/preference/cts/PreferenceActivityFlowPortraitTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/PreferenceActivityFlowPortraitTest.java - diff]
tests/tests/preference/src/android/preference/cts/PreferenceActivityFlowTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/PreferenceActivityFlowTest.java - diff]
tests/tests/preference/src/android/preference/cts/PreferenceActivityLegacyFlowTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/PreferenceActivityLegacyFlowTest.java - diff]
tests/tests/preference/src/android/preference/cts/PreferenceActivityTest.java[diff]
tests/tests/preference/src/android/preference/cts/PreferenceCategoryTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/PreferenceCategoryTest.java - diff]
tests/tests/preference/src/android/preference/cts/PreferenceDataStoreTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/PreferenceDataStoreTest.java - diff]
tests/tests/preference/src/android/preference/cts/PreferenceFragmentActivity.java[Renamed from tests/tests/preference2/src/android/preference2/cts/PreferenceFragmentActivity.java - diff]
tests/tests/preference/src/android/preference/cts/PreferenceFragmentTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/PreferenceFragmentTest.java - diff]
tests/tests/preference/src/android/preference/cts/PreferenceFromCodeActivity.java[Renamed from tests/tests/preference2/src/android/preference2/cts/PreferenceFromCodeActivity.java - diff]
tests/tests/preference/src/android/preference/cts/PreferenceGroupTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/PreferenceGroupTest.java - diff]
tests/tests/preference/src/android/preference/cts/PreferenceParentGroupTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/PreferenceParentGroupTest.java - diff]
tests/tests/preference/src/android/preference/cts/PreferenceRecycleTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/PreferenceRecycleTest.java - diff]
tests/tests/preference/src/android/preference/cts/PreferenceTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/PreferenceTest.java - diff]
tests/tests/preference/src/android/preference/cts/PreferenceWithHeaders.java[Renamed from tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeaders.java - diff]
tests/tests/preference/src/android/preference/cts/PreferenceWithHeadersLandscape.java[Renamed from tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeadersLandscape.java - diff]
tests/tests/preference/src/android/preference/cts/PreferenceWithHeadersPortrait.java[Renamed from tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeadersPortrait.java - diff]
tests/tests/preference/src/android/preference/cts/PreferenceWithHeadersTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeadersTest.java - diff]
tests/tests/preference/src/android/preference/cts/PreferencesFromXml.java[Renamed from tests/tests/preference2/src/android/preference2/cts/PreferencesFromXml.java - diff]
tests/tests/preference/src/android/preference/cts/PreferencesFromXmlNested.java[Renamed from tests/tests/preference2/src/android/preference2/cts/PreferencesFromXmlNested.java - diff]
tests/tests/preference/src/android/preference/cts/PreferencesFromXmlRecycle.java[Renamed from tests/tests/preference2/src/android/preference2/cts/PreferencesFromXmlRecycle.java - diff]
tests/tests/preference/src/android/preference/cts/RecycleCheckPreference.java[Renamed from tests/tests/preference2/src/android/preference2/cts/RecycleCheckPreference.java - diff]
tests/tests/preference/src/android/preference/cts/SwitchPreferenceTest.java[Renamed from tests/tests/preference2/src/android/preference2/cts/SwitchPreferenceTest.java - diff]
tests/tests/preference/src/android/preference/cts/TestUtils.java[Renamed from tests/tests/preference2/src/android/preference2/cts/TestUtils.java - diff]
tests/tests/preference2/Android.bp[Deleted - diff]
tests/tests/preference2/AndroidManifest.xml[Deleted - diff]
tests/tests/preference2/AndroidTest.xml[Deleted - diff]
tests/tests/preference2/OWNERS[Deleted - diff]

66 files changed

tree: c22a4bbdb031b190e4d26e9d3d7cdba586498eb2