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

Commit 7e820b1d authored by linyuh's avatar linyuh Committed by android-build-merger
Browse files

Merge "Finishing touches for accessibility in the new call log and the new...

Merge "Finishing touches for accessibility in the new call log and the new voicemail fragment" am: d9d4b060 am: 94bafb6d
am: 12b4540e

Change-Id: Iaba1332f0847bf55d5ec8bb2fbc235049b0a1929
parents e6beed0d 12b4540e
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:orientation="vertical"
    android:background="@color/background_dialer_light">
    android:background="@color/background_dialer_light"
    android:orientation="vertical">

  <LinearLayout
      android:layout_width="match_parent"
@@ -35,7 +35,8 @@
        android:id="@+id/new_call_log_duo_disclosure_card_logo"
        android:layout_width="40dp"
        android:layout_height="40dp"
        android:layout_marginEnd="16dp"/>
        android:layout_marginEnd="16dp"
        android:importantForAccessibility="no"/>

    <LinearLayout
        android:layout_width="match_parent"
+9 −4
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@
          android:layout_width="wrap_content"
          android:layout_height="18dp"
          android:layout_gravity="center_vertical"
          android:importantForAccessibility="no"
          android:src="@drawable/quantum_ic_hd_vd_theme_24"/>

      <ImageView
@@ -82,6 +83,7 @@
          android:layout_width="wrap_content"
          android:layout_height="18dp"
          android:layout_gravity="center_vertical"
          android:importantForAccessibility="no"
          android:src="@drawable/quantum_ic_signal_wifi_4_bar_vd_theme_24"/>

      <ImageView
@@ -89,6 +91,7 @@
          android:layout_width="wrap_content"
          android:layout_height="18dp"
          android:layout_gravity="center_vertical"
          android:importantForAccessibility="no"
          android:src="@drawable/quantum_ic_language_vd_theme_24"/>

      <TextView
@@ -105,13 +108,15 @@
    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:orientation="horizontal">
        android:orientation="horizontal"
        tools:ignore="UseCompoundDrawables">

      <ImageView
          android:id="@+id/call_type_icon"
          android:layout_width="wrap_content"
          android:layout_height="18dp"
          android:layout_gravity="center_vertical"/>
          android:layout_gravity="center_vertical"
          android:importantForAccessibility="no"/>

      <TextView
          android:id="@+id/secondary_text"
@@ -142,8 +147,8 @@
      android:layout_alignParentEnd="true"
      android:layout_centerVertical="true"
      android:background="?android:attr/selectableItemBackgroundBorderless"
      android:contentDescription="@string/a11y_new_call_log_expand_menu_for_entry"
      android:scaleType="center"
      android:src="@drawable/quantum_ic_more_vert_vd_theme_24"
      android:tint="@color/dialer_secondary_text_color"
      android:contentDescription="@string/a11y_new_call_log_expand_menu_for_entry"/>
      android:tint="@color/dialer_secondary_text_color"/>
</RelativeLayout>
+1 −3
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@
-->
<android.support.v7.widget.CardView
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/error_card"
    style="@style/CallLogCardStyle"
    android:gravity="center_vertical"
@@ -43,8 +42,7 @@
          android:layout_height="@dimen/voicemail_promo_card_icon_size"
          android:layout_gravity="top"
          android:importantForAccessibility="no"
          android:src="@drawable/ic_voicemail_error_24px"
          tools:ignore="ContentDescription"/>
          android:src="@drawable/ic_voicemail_error_24px"/>

      <LinearLayout
          android:layout_width="match_parent"
+1 −2
Original line number Diff line number Diff line
@@ -61,8 +61,7 @@
          android:importantForAccessibility="no"
          android:src="@drawable/quantum_ic_voicemail_vd_theme_24"
          android:tint="@color/dialtacts_theme_color"
          android:tintMode="multiply"
          tools:ignore="ContentDescription"/>
          android:tintMode="multiply"/>

      <TextView
          android:id="@+id/secondary_text"
+1 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@
<!-- TODO(uabdullah): Use a relative layout instead of nested linear layouts.-->
<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/voicemail_alert_content"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
@@ -40,8 +39,7 @@
        android:layout_height="@dimen/voicemail_promo_card_icon_size"
        android:layout_gravity="top"
        android:importantForAccessibility="no"
        android:src="@drawable/ic_voicemail_error_24px"
        tools:ignore="ContentDescription"/>
        android:src="@drawable/ic_voicemail_error_24px"/>

    <LinearLayout
        android:layout_width="match_parent"