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

Commit f0dcefc2 authored by Evan Chen's avatar Evan Chen Committed by Android (Google) Code Review
Browse files

Merge changes from topics "presubmit-am-1a8adc3a42824e489007f2ef846a0f71",... 

Merge changes from topics "presubmit-am-1a8adc3a42824e489007f2ef846a0f71", "presubmit-am-71bbe918d83d491e8ccb96c26458149c", "presubmit-am-e80e22a9aeb8442eb3b3332c3b2ea804" into tm-dev

* changes:
  CDM UI cleanUp
  Introduce a progessBar for multiple devices
  Make the Allow button at the top
parents 9197321f e4d52246

packages/CompanionDeviceManager/res/color/selector.xml

+1 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2022 The Android Open Source Project

  ~

packages/CompanionDeviceManager/res/drawable/btn_negative_multiple_devices.xml

+1 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2022 The Android Open Source Project

  ~

packages/CompanionDeviceManager/res/drawable/btn_negative_top.xml

+3 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2022 The Android Open Source Project

  ~
@@ -17,6 +18,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

+3 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2022 The Android Open Source Project

  ~
@@ -17,6 +18,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/drawable/helper_ok_button.xml

+1 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2022 The Android Open Source Project

  ~