Move the summary for the toggled features to a footer. Make the settings appear as a preference. Bug: 36780887 Test: Start settings and observe the new UI looks a lot like the mocks referenced in the bug. Also added unit test to verify that summary text shows up. Change-Id: I1d002b194991d0901ecb27198ba5de73bd23a5a9
80 lines
2.8 KiB
Java
80 lines
2.8 KiB
Java
/*
|
|
* 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.accessibility;
|
|
|
|
import static android.support.test.espresso.Espresso.onView;
|
|
import static android.support.test.espresso.assertion.ViewAssertions.matches;
|
|
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
|
|
import static android.support.test.espresso.matcher.ViewMatchers.withText;
|
|
|
|
import android.app.Instrumentation;
|
|
import android.os.Bundle;
|
|
import android.os.Looper;
|
|
import android.support.test.InstrumentationRegistry;
|
|
import android.support.test.rule.ActivityTestRule;
|
|
import android.support.test.runner.AndroidJUnit4;
|
|
|
|
import com.android.settings.Settings.AccessibilitySettingsActivity;
|
|
import org.junit.Before;
|
|
import org.junit.BeforeClass;
|
|
import org.junit.Rule;
|
|
import org.junit.Test;
|
|
import org.junit.runner.RunWith;
|
|
|
|
@RunWith(AndroidJUnit4.class)
|
|
public class ToggleFeaturePreferenceFragmentTest {
|
|
private static final String SUMMARY_TEXT = "Here's some summary text";
|
|
|
|
@Rule
|
|
public final ActivityTestRule<AccessibilitySettingsActivity> mActivityRule =
|
|
new ActivityTestRule<>(AccessibilitySettingsActivity.class, true);
|
|
|
|
private final Instrumentation mInstrumentation = InstrumentationRegistry.getInstrumentation();
|
|
|
|
@BeforeClass
|
|
public static void oneTimeSetup() {
|
|
if (Looper.myLooper() == null) {
|
|
Looper.prepare();
|
|
}
|
|
}
|
|
|
|
@Before
|
|
public void setUp() {
|
|
mInstrumentation.runOnMainSync(() -> {
|
|
MyToggleFeaturePreferenceFragment fragment = new MyToggleFeaturePreferenceFragment();
|
|
Bundle args = new Bundle();
|
|
args.putString(AccessibilitySettings.EXTRA_SUMMARY, SUMMARY_TEXT);
|
|
fragment.setArguments(args);
|
|
mActivityRule.getActivity().startPreferenceFragment(fragment, false);
|
|
});
|
|
}
|
|
|
|
@Test
|
|
public void testSummaryTestDisplayed() {
|
|
onView(withText(SUMMARY_TEXT)).check(matches(isDisplayed()));
|
|
}
|
|
|
|
public static class MyToggleFeaturePreferenceFragment extends ToggleFeaturePreferenceFragment {
|
|
@Override
|
|
protected void onPreferenceToggled(String preferenceKey, boolean enabled) {}
|
|
|
|
@Override
|
|
public int getMetricsCategory() {
|
|
return 0;
|
|
}
|
|
}
|
|
} |