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

Commit 3f0812ea authored by Stanley Wang's avatar Stanley Wang Committed by Android (Google) Code Review
Browse files

Merge "Switch control should not be activated after event happens off of the... 

Merge "Switch control should not be activated after event happens off of the target region." into sc-dev
parents 5050fdd9 c2d91b65

packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ 
            android:layout_width="wrap_content"

            android:layout_height="48dp"

            android:layout_gravity="center_vertical"

            android:focusable="false"

            android:clickable="false"

            android:track="@drawable/settingslib_track_selector"

            android:thumb="@drawable/settingslib_thumb_selector"

            android:theme="@style/MainSwitch.Settingslib"/>

packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/MainSwitchBarTest.java

+8 −0
Original line number Diff line number Diff line
@@ -75,6 +75,14 @@ public class MainSwitchBarTest { 
        assertThat(switchObj).isNotNull();

    }



    @Test

    public void getSwitch_shouldNotFocusableAndClickable() {

        final Switch switchObj = mBar.getSwitch();



        assertThat(switchObj.isFocusable()).isFalse();

        assertThat(switchObj.isClickable()).isFalse();

    }



    @Test

    public void show_shouldVisible() {

        mBar.show();