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

Commit 20f8f601 authored by wangqi's avatar wangqi Committed by Copybara-Service
Browse files

Update emergency call map and device number UI. 

Bug: 79878432
Test: manual
PiperOrigin-RevId: 202228927
Change-Id: Ia68d3b1366a36ba5bdde85049b1b23ca98495ed1
parent 23c51ac2

java/com/android/dialer/theme/common/res/values/text_styles.xml

+11 −0
Original line number Diff line number Diff line
@@ -43,6 +43,12 @@ 
    <item name="android:fontFamily">sans-serif-regular</item>

  </style>



  <style name="Dialer.TextAppearance.Primary2" parent="TextAppearance.AppCompat">

    <item name="android:textColor">?android:attr/textColorPrimary</item>

    <item name="android:textSize">16sp</item>

    <item name="android:fontFamily">sans-serif-regular</item>

  </style>



  <style name="Dialer.TextAppearance.Secondary" parent="TextAppearance.AppCompat">

    <item name="android:textColor">?android:attr/textColorSecondary</item>

    <item name="android:textSize">14sp</item>
@@ -81,6 +87,11 @@ 
    <item name="android:maxLines">1</item>

  </style>



  <style name="Dialer.TextAppearance.Primary2.Ellipsize">

    <item name="android:ellipsize">end</item>

    <item name="android:maxLines">1</item>

  </style>



  <style name="Dialer.TextAppearance.Secondary.Ellipsize">

    <item name="android:ellipsize">end</item>

    <item name="android:maxLines">1</item>

java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml

+2 −5
Original line number Diff line number Diff line
@@ -118,9 +118,9 @@ 
          android:layout_marginStart="24dp"

          android:layout_marginEnd="24dp"/>



      <!-- TODO(a bug): textColorPrimary or textColorPrimaryInverse? -->

      <TextView

          android:id="@+id/incall_important_call_badge"

          style="@style/Dialer.TextAppearance.SubHeader"

          android:layout_width="wrap_content"

          android:layout_height="32dp"

          android:layout_marginTop="4dp"
@@ -129,7 +129,6 @@ 
          android:gravity="center"

          android:maxLines="1"

          android:text="@string/call_incoming_important"

          style="@style/Dialer.TextAppearance.SubHeader"

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



      <FrameLayout
@@ -138,9 +137,7 @@ 
          android:layout_height="wrap_content"/>



      <include

          layout="@layout/device_number_row"

          android:layout_width="match_parent"

          android:layout_height="wrap_content"/>

          layout="@layout/device_number_row"/>



      <FrameLayout

          android:id="@+id/incall_data_container"

java/com/android/incallui/calllocation/impl/res/drawable/bg_location_card.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,5 +17,5 @@ 


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

    android:color="@color/ripple_material_light">

  <item android:drawable="@android:color/white"/>

  <item android:drawable="?android:attr/colorBackgroundFloating"/>

</ripple>

java/com/android/incallui/calllocation/impl/res/values/styles.xml

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2018 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

  -->

<resources>



  <style name="LocationAddressTitleTextStyle">

    <item name="android:textSize">14sp</item>

    <item name="android:textColor">#dd000000</item>

    <item name="android:fontFamily">sans-serif-medium</item>

  </style>



  <style name="LocationAddressTextStyle">

    <item name="android:textSize">16sp</item>

    <item name="android:textColor">#dd000000</item>

    <item name="android:fontFamily">sans-serif</item>

  </style>



  <style name="LocationLatLongTextStyle">

    <item name="android:textSize">14sp</item>

    <item name="android:textColor">#88000000</item>

    <item name="android:fontFamily">sans-serif</item>

  </style>



  <style name="LocationLoadingTextStyle">

    <item name="android:textSize">14sp</item>

    <item name="android:textColor">#dd000000</item>

    <item name="android:fontFamily">sans-serif</item>

  </style>



  <style name="LocationErrorTextStyle">

    <item name="android:textSize">14sp</item>

    <item name="android:textColor">#dd000000</item>

    <item name="android:fontFamily">sans-serif</item>

  </style>

</resources>

java/com/android/incallui/contactgrid/res/layout/device_number_row.xml

+4 −6
Original line number Diff line number Diff line
@@ -19,21 +19,19 @@ 
      android:id="@+id/contactgrid_location_divider"

      android:layout_width="match_parent"

      android:layout_height="1dp"

      android:layout_gravity="bottom"

      android:background="#D8D8D8"

      android:background="@color/dialer_divider_line_color"

      android:visibility="gone"/>



  <TextView

      android:id="@+id/contactgrid_device_number_text"

      style="@style/Dialer.TextAppearance.Primary2"

      android:layout_width="match_parent"

      android:layout_height="wrap_content"

      android:layout_marginBottom="16dp"

      android:padding="16dp"

      android:background="@android:color/white"

      android:elevation="2dp"

      android:background="?android:attr/colorBackgroundFloating"

      android:elevation="4dp"

      android:gravity="start"

      android:orientation="vertical"

      android:textColor="#DD000000"

      android:textSize="16sp"

      android:visibility="gone"/>

</merge>
 
 No newline at end of file