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

Commit db6c7211 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update style name" into sc-dev

parents 7c3adee2 2b6a081a

res/layout/instant_app_buttons.xml

+3 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 


        <Button

            android:id="@+id/install"

            style="@style/SettingsActionButton"

            style="@style/SettingsLibActionButton"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="20dp"
@@ -40,7 +40,7 @@ 


        <Button

            android:id="@+id/launch"

            style="@style/SettingsActionButton"

            style="@style/SettingsLibActionButton"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="20dp"
@@ -55,7 +55,7 @@ 


    <Button

        android:id="@+id/clear_data"

        style="@style/SettingsActionButton"

        style="@style/SettingsLibActionButton"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class BluetoothDetailsButtonsControllerTest extends BluetoothDetailsContr 
    public void setUp() {

        super.setUp();

        final View buttons = View.inflate(

                RuntimeEnvironment.application, R.layout.settings_action_buttons,

                RuntimeEnvironment.application, R.layout.settingslib_action_buttons,

                null /* parent */);

        mConnectButton = buttons.findViewById(R.id.button2);

        mForgetButton = buttons.findViewById(R.id.button1);