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

Commit d2fbecdf authored by Evan Chen's avatar Evan Chen
Browse files

Make the Allow button at the top 

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
parent ff5b1369

packages/CompanionDeviceManager/res/drawable/btn_negative_top.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

packages/CompanionDeviceManager/res/drawable/btn_positive_bottom.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

packages/CompanionDeviceManager/res/layout/activity_confirmation.xml

+5 −5
Original line number Diff line number Diff line
@@ -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"

packages/CompanionDeviceManager/res/values/styles.xml

+4 −4
Original line number Diff line number Diff line
@@ -35,17 +35,17 @@ 
        <item name="android:background">@drawable/helper_ok_button</item>

    </style>



    <style name="NegativeButton"

    <style name="PositiveButton"

           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>

        <item name="android:background">@drawable/btn_positive_bottom</item>

    </style>



    <style name="PositiveButton"

    <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>
@@ -53,7 +53,7 @@ 
        <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>

        <item name="android:background">@drawable/btn_negative_top</item>

    </style>



    <style name="NegativeButtonMultipleDevices"