PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change wifi detail buttons to match App buttons."

Browse Source
This commit is contained in:
Eric Schwarzenbach
2017-07-14 23:09:23 +00:00
committed by Android (Google) Code Review
parent 04b0e48d59 eb5ceb94e4
commit fbc3eee32a
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
res/layout/wifi_network_details_two_buttons_panel.xml
View File

@@ -23,28 +23,23 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="bottom" android:paddingTop="4dp"
android:paddingTop="4dip" android:paddingStart="8dp"
android:orientation="horizontal"> android:paddingEnd="8dp">
<Button <Button
style="@android:style/@Widget.Material.Button.Colored"
android:id="@+id/forget_button" android:id="@+id/forget_button"
android:layout_width="120dip" android:text="@string/forget"
android:layout_weight="0.4" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"/> android:layout_gravity="center"/>
<!-- 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" />
<Button <Button
style="@android:style/Widget.Material.Button.Colored" style="@android:style/Widget.Material.Button.Colored"
android:id="@+id/signin_button" android:id="@+id/signin_button"
android:layout_width="120dip" android:text="@string/support_sign_in_button_text"
android:text="@string/cancel" android:layout_width="0dp"
android:layout_weight="0.4" android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"/> android:layout_gravity="center"/>
</LinearLayout> </LinearLayout>

2
src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
View File

@@ -246,7 +246,6 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
mButtonsPref = (LayoutPreference) screen.findPreference(KEY_BUTTONS_PREF); mButtonsPref = (LayoutPreference) screen.findPreference(KEY_BUTTONS_PREF);
mSignInButton = mButtonsPref.findViewById(R.id.signin_button); mSignInButton = mButtonsPref.findViewById(R.id.signin_button);
mSignInButton.setText(R.string.support_sign_in_button_text);
mSignInButton.setOnClickListener(view -> signIntoNetwork()); mSignInButton.setOnClickListener(view -> signIntoNetwork());
mSignalStrengthPref = mSignalStrengthPref =
@@ -266,7 +265,6 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
mSecurityPref.setDetailText(mAccessPoint.getSecurityString(false /* concise */)); mSecurityPref.setDetailText(mAccessPoint.getSecurityString(false /* concise */));
mForgetButton = mButtonsPref.findViewById(R.id.forget_button); mForgetButton = mButtonsPref.findViewById(R.id.forget_button);
mForgetButton.setText(R.string.forget);
mForgetButton.setOnClickListener(view -> forgetNetwork()); mForgetButton.setOnClickListener(view -> forgetNetwork());
} }