Merge "Update preference screen title."

2017-10-25 20:30:31 +00:00
parent 9d31fa4c8f 03a3b518de
commit 2bb74379e5
86 changed files with 838 additions and 93 deletions
--- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java
+++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java
@@ -51,8 +51,8 @@ public class FeatureFlagsDashboardTest {
    }

    @Test
-    public void shouldUsePlaceholderPreferenceLayout() {
+    public void shouldUseFeatureFlagPreferenceLayout() {
        assertThat(mDashboard.getPreferenceScreenResId())
-                .isEqualTo(R.xml.placeholder_prefs);
+                .isEqualTo(R.xml.feature_flags_settings);
    }
 }