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

Commit 5cfeaa46 authored by Evan Chen's avatar Evan Chen Committed by Automerger Merge Worker
Browse files

Merge "Resize vendorIcon to 24x24 and increase touching area for... 

Merge "Resize vendorIcon to 24x24 and increase touching area for accessibility" into tm-qpr-dev am: d3b0c199 am: 5d4b3ed9

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



Change-Id: I3d7c9a1ee50cd0bc6bd297d2f0288c64970cdc7f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 21d8b0c7 5d4b3ed9

packages/CompanionDeviceManager/res/drawable-night/ic_info.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24"

        android:tint="@android:color/system_accent1_200">

        android:tint="@android:color/system_neutral1_200">

    <path android:fillColor="@android:color/white"

          android:pathData="M11,17H13V11H11ZM12,9Q12.425,9 12.713,8.712Q13,8.425 13,8Q13,7.575 12.713,7.287Q12.425,7 12,7Q11.575,7 11.288,7.287Q11,7.575 11,8Q11,8.425 11.288,8.712Q11.575,9 12,9ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM12,20Q15.325,20 17.663,17.663Q20,15.325 20,12Q20,8.675 17.663,6.337Q15.325,4 12,4Q8.675,4 6.338,6.337Q4,8.675 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20Z"/>

</vector>
 
 No newline at end of file

packages/CompanionDeviceManager/res/drawable/ic_info.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24"

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

        android:tint="@android:color/system_neutral1_700">

    <path android:fillColor="@android:color/white"

          android:pathData="M11,17H13V11H11ZM12,9Q12.425,9 12.713,8.712Q13,8.425 13,8Q13,7.575 12.713,7.287Q12.425,7 12,7Q11.575,7 11.288,7.287Q11,7.575 11,8Q11,8.425 11.288,8.712Q11.575,9 12,9ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM12,20Q15.325,20 17.663,17.663Q20,15.325 20,12Q20,8.675 17.663,6.337Q15.325,4 12,4Q8.675,4 6.338,6.337Q4,8.675 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20Z"/>

</vector>
 
 No newline at end of file

packages/CompanionDeviceManager/res/layout/helper_confirmation.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
            <ImageView

                android:id="@+id/app_icon"

                android:layout_width="match_parent"

                android:layout_height="48dp"

                android:layout_height="32dp"

                android:gravity="center"

                android:layout_marginTop="12dp"

                android:layout_marginBottom="12dp"/>

packages/CompanionDeviceManager/res/layout/vendor_header.xml

+7 −5
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:layout_height="wrap_content"

    android:orientation="horizontal"

    android:layout_gravity="center"

    android:paddingTop="24dp"

    android:paddingTop="12dp"

    android:paddingBottom="4dp"

    android:paddingStart="24dp"

    android:paddingEnd="24dp"
@@ -32,24 +32,26 @@ 
        android:id="@+id/vendor_header_image"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:padding="12dp"

        android:contentDescription="@string/vendor_icon_description" />



    <TextView

        android:id="@+id/vendor_header_name"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="12dp"

        android:layout_marginTop="12dp"

        android:textSize="16sp"

        android:textSize="14sp"

        android:layout_toEndOf="@+id/vendor_header_image"

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



    <ImageButton

        android:id="@+id/vendor_header_button"

        android:background="@drawable/ic_info"

        android:src="@drawable/ic_info"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:padding="12dp"

        android:contentDescription="@string/vendor_header_button_description"

        android:layout_alignParentEnd="true" />

        android:layout_alignParentEnd="true"

        android:background="@android:color/transparent" />



</RelativeLayout>
 
 No newline at end of file