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

Commit eb5ceb94 authored by Eric Schwarzenbach's avatar Eric Schwarzenbach
Browse files

Change wifi detail buttons to match App buttons. 

Matches color, size and padding.

Bug: 37252029
Test: manual
Change-Id: Ib0d73d8971eef1ecb234f61fc1bfcf294832e594
parent cbedc3f0

res/layout/wifi_network_details_two_buttons_panel.xml

+12 −17
Original line number Diff line number Diff line
@@ -23,28 +23,23 @@ 
        xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="bottom"

        android:paddingTop="4dip"

        android:orientation="horizontal">

        android:paddingTop="4dp"

        android:paddingStart="8dp"

        android:paddingEnd="8dp">

        <Button

            style="@android:style/@Widget.Material.Button.Colored"

            android:id="@+id/forget_button"

            android:layout_width="120dip"

            android:layout_weight="0.4"

            android:text="@string/forget"

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"/>

        <!-- Spacer -->

        <View

            android:id="@+id/buttons_spacer_left"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:visibility="invisible"

            android:layout_weight="0.2" />

            android:layout_gravity="center"/>

        <Button

            style="@android:style/Widget.Material.Button.Colored"

            android:id="@+id/signin_button"

            android:layout_width="120dip"

            android:text="@string/cancel"

            android:layout_weight="0.4"

            android:text="@string/support_sign_in_button_text"

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"/>

            android:layout_gravity="center"/>

</LinearLayout>

src/com/android/settings/wifi/details/WifiDetailPreferenceController.java

+0 −2
Original line number Diff line number Diff line
@@ -245,7 +245,6 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController 


        mButtonsPref = (LayoutPreference) screen.findPreference(KEY_BUTTONS_PREF);

        mSignInButton = mButtonsPref.findViewById(R.id.signin_button);

        mSignInButton.setText(R.string.support_sign_in_button_text);

        mSignInButton.setOnClickListener(view -> signIntoNetwork());



        mSignalStrengthPref =
@@ -265,7 +264,6 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController 


        mSecurityPref.setDetailText(mAccessPoint.getSecurityString(false /* concise */));

        mForgetButton = mButtonsPref.findViewById(R.id.forget_button);

        mForgetButton.setText(R.string.forget);

        mForgetButton.setOnClickListener(view -> forgetNetwork());

    }