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

Merge "Update style name" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-18 11:28:56 +00:00
committed by Android (Google) Code Review
parent 7c3adee295 2b6a081a0b
commit db6c7211e4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout/instant_app_buttons.xml
View File

@@ -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"

2
tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
View File

@@ -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);