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

Commit 2423a531 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Refresh the buttons CDM dialogs" into tm-dev am: 8fe507ea 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17114328

Change-Id: I1a1f3adb5bfa5efe1c8f2f783581b362a66c3046
parents 2f696b61 8fe507ea

packages/CompanionDeviceManager/res/drawable/btn_negative_multiple_devices.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2022 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<shape xmlns:android="http://schemas.android.com/apk/res/android"

       android:shape="rectangle">

    <solid android:color="@android:color/transparent" />

    <corners android:topLeftRadius="16dp" android:topRightRadius="16dp"

             android:bottomLeftRadius="16dp" android:bottomRightRadius="16dp"/>

    <stroke

        android:width="2dp"

        android:color="@android:color/system_accent1_600" />

</shape>
 
 No newline at end of file

packages/CompanionDeviceManager/res/drawable/btn_negative_top.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2022 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



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

</shape>

packages/CompanionDeviceManager/res/drawable/btn_positive_bottom.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2022 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



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

</shape>

packages/CompanionDeviceManager/res/layout/activity_confirmation.xml

+36 −32
Original line number Diff line number Diff line
@@ -61,26 +61,30 @@ 
    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:gravity="end">

        android:orientation="vertical"

        android:layout_marginTop="24dp">



        <!-- Do NOT change the IDs of the buttons: they are referenced in CTS tests. -->



        <Button

            android:id="@+id/btn_negative"

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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/consent_no"

                android:textColor="?android:attr/textColorSecondary" />

            style="@style/NegativeButton"

            android:text="@string/consent_no" />



        <Button

            android:id="@+id/btn_positive"

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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

            style="@style/PositiveButton"

            android:text="@string/consent_yes" />



        <Button

            android:id="@+id/btn_negative_multiple_devices"

            android:layout_marginLeft="170dp"

            android:layout_marginBottom="10dp"

            style="@style/NegativeButtonMultipleDevices"

            android:textColor = "?android:textColorPrimary"

            android:visibility="gone"

            android:text="@string/consent_no" />



    </LinearLayout>



</LinearLayout>
 
 No newline at end of file

packages/CompanionDeviceManager/res/layout/data_transfer_confirmation.xml

+24 −29
Original line number Diff line number Diff line
@@ -48,24 +48,19 @@ 
    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:gravity="end">

        android:orientation="vertical"

        android:layout_marginTop="24dp">



        <!-- Do NOT change the IDs of the buttons: they are referenced in CTS tests. -->



        <Button

            android:id="@+id/btn_negative"

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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/consent_no"

                android:textColor="?android:attr/textColorSecondary" />

            style="@style/NegativeButton"

            android:text="@string/consent_no" />



        <Button

            android:id="@+id/btn_positive"

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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

            style="@style/PositiveButton"

            android:text="@string/consent_yes" />



    </LinearLayout>