Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the Allow button at the top

Browse Source 
Allow button should be at the top
of Don't Allow button

Test: atest CtsCompanionDeviceManagerCoreTestCases
      atest CtsCompanionDeviceManagerUiAutomationTestCases
      atest CtsOsTestCases:CompanionDeviceManagerTest

Fix: 224427592
Change-Id: I9d02eb822b4afc4693c4374b619204949d71e87d
This commit is contained in:
Evan Chen
2022-03-15 17:35:12 +00:00
parent ff5b1369dd
commit d2fbecdfda
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/CompanionDeviceManager/res/drawable/btn_negative_top.xml
View File

@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@android:color/system_accent1_100"/>
<corners android:topLeftRadius="12dp" android:topRightRadius="12dp"
android:bottomLeftRadius="4dp" android:bottomRightRadius="4dp"/>
<corners android:topLeftRadius="4dp" android:topRightRadius="4dp"
android:bottomLeftRadius="12dp" android:bottomRightRadius="12dp"/>
</shape>

4
packages/CompanionDeviceManager/res/drawable/btn_positive_bottom.xml
View File

@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@android:color/system_accent1_100"/>
<corners android:topLeftRadius="4dp" android:topRightRadius="4dp"
android:bottomLeftRadius="12dp" android:bottomRightRadius="12dp"/>
<corners android:topLeftRadius="12dp" android:topRightRadius="12dp"
android:bottomLeftRadius="4dp" android:bottomRightRadius="4dp"/>
</shape>

10
packages/CompanionDeviceManager/res/layout/activity_confirmation.xml
View File

@@ -94,16 +94,16 @@
<!-- Do NOT change the IDs of the buttons: they are referenced in CTS tests. -->
<Button
android:id="@+id/btn_negative"
style="@style/NegativeButton"
android:text="@string/consent_no" />
<Button
android:id="@+id/btn_positive"
style="@style/PositiveButton"
android:text="@string/consent_yes" />
<Button
android:id="@+id/btn_negative"
style="@style/NegativeButton"
android:text="@string/consent_no" />
<Button
android:id="@+id/btn_negative_multiple_devices"
android:layout_marginLeft="170dp"

22
packages/CompanionDeviceManager/res/values/styles.xml
View File

@@ -35,16 +35,6 @@
<item name="android:background">@drawable/helper_ok_button</item>
</style>
<style name="NegativeButton"
parent="@android:style/Widget.Material.Button.Borderless.Colored">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textAllCaps">false</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">@android:color/system_neutral1_900</item>
<item name="android:background">@drawable/btn_negative_top</item>
</style>
<style name="PositiveButton"
parent="@android:style/Widget.Material.Button.Borderless.Colored">
<item name="android:layout_width">match_parent</item>
@@ -52,10 +42,20 @@
<item name="android:textAllCaps">false</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">@android:color/system_neutral1_900</item>
<item name="android:layout_marginTop">4dp</item>
<item name="android:background">@drawable/btn_positive_bottom</item>
</style>
<style name="NegativeButton"
parent="@android:style/Widget.Material.Button.Borderless.Colored">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textAllCaps">false</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">@android:color/system_neutral1_900</item>
<item name="android:layout_marginTop">4dp</item>
<item name="android:background">@drawable/btn_negative_top</item>
</style>
<style name="NegativeButtonMultipleDevices"
parent="@android:style/Widget.Material.Button.Colored">
<item name="android:layout_width">100dp</item>