Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6c8a42d authored by Andrew Chiang's avatar Andrew Chiang
Browse files

Update toggle text for Data Saver 

Update Data Saver toggle to say "Use Data Saver" instead of "On"/"Off"

Bug: 75983536
Test: Robotest, manual test and atest DataSaverSummaryUITest
Change-Id: Icf690638570278fb869515931943ac486adbfc7c
parent 4ed1ed24

src/com/android/settings/datausage/DataSaverSummary.java

+3 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ public class DataSaverSummary extends SettingsPreferenceFragment 
    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);

        mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar();

        mSwitchBar.setSwitchBarText(

                R.string.data_saver_switch_title,

                R.string.data_saver_switch_title);

        mSwitchBar.show();

        mSwitchBar.addOnSwitchChangeListener(this);

    }

tests/uitests/src/com/android/settings/ui/inputmethods/DataSaverSummaryUITest.java

0 → 100644
+69 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 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.ui.inputmethods;



import static com.android.settings.ui.testutils.SettingsTestUtils.TIMEOUT;

import static com.google.common.truth.Truth.assertThat;



import android.app.Instrumentation;

import android.content.Intent;

import android.support.test.InstrumentationRegistry;

import android.support.test.runner.AndroidJUnit4;

import android.support.test.uiautomator.By;

import android.support.test.uiautomator.UiDevice;

import android.support.test.uiautomator.UiObject2;

import android.support.test.uiautomator.Until;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;



@RunWith(AndroidJUnit4.class)

public class DataSaverSummaryUITest {



    private Instrumentation mInstrumentation;

    private Intent mIntent;

    private UiDevice mUiDevice;



    @Before

    public void setUp() {

        mInstrumentation = InstrumentationRegistry.getInstrumentation();

        mUiDevice = UiDevice.getInstance(mInstrumentation);

        mIntent = new Intent().setClassName("com.android.settings",

                "com.android.settings.Settings$DataUsageSummaryLegacyActivity")

                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

    }



    @Test

    public void launchSettings_hasSwitchBar() throws Exception {

        launchDataSaverSettings();

        final UiObject2 switchBar =

                mUiDevice.wait(Until.findObject(By.text("Use Data Saver")), TIMEOUT);



        assertThat(switchBar).isNotNull();

    }



    private void launchDataSaverSettings() throws InterruptedException {

        mInstrumentation.getContext().startActivity(mIntent);

        final UiObject2 prefDataSaver =

                mUiDevice.wait(Until.findObject(By.text("Data Saver")), TIMEOUT);



        assertThat(prefDataSaver).isNotNull();

        prefDataSaver.click();

        Thread.sleep(TIMEOUT * 2);

    }

}