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

Commit 76c1eb65 authored by Amit Kumar's avatar Amit Kumar 💻
Browse files

Merge branch 'contact-e-theme-pie' into 'v1-pie' 

Remaining Dialer mockup for pie

See merge request e/os/android_packages_apps_Dialer!24
parents 9b806041 f4e727ac

java/com/android/contacts/common/list/ViewPagerTabs.java

+4 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import android.content.Context; 
import android.content.res.ColorStateList;

import android.content.res.TypedArray;

import android.graphics.Outline;

import android.graphics.PorterDuff;

import android.support.v4.view.PagerAdapter;

import android.support.v4.view.ViewPager;

import android.util.AttributeSet;
@@ -144,8 +145,10 @@ public class ViewPagerTabs extends HorizontalScrollView implements ViewPager.OnP 
    if (mTabIcons != null && position < mTabIcons.length) {

      View layout = LayoutInflater.from(getContext()).inflate(R.layout.unread_count_tab, null);

      ImageView iconView = (ImageView) layout.findViewById(R.id.icon);

      iconView.setBackgroundResource(mTabIcons[position]);

//      iconView.setBackgroundResource(mTabIcons[position]);

      iconView.setImageResource(mTabIcons[position]);

      iconView.setContentDescription(tabTitle);

      iconView.setColorFilter(getContext().getResources().getColor(R.color.dialer_theme_color), PorterDuff.Mode.MULTIPLY);



      TextView textView = (TextView) layout.findViewById(R.id.count);

      if (mUnreadCounts != null && mUnreadCounts[position] > 0) {

java/com/android/contacts/common/res/layout/search_bar_expanded.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
    android:background="?attr/selectableItemBackgroundBorderless"

    android:contentDescription="@string/action_menu_back_from_search"

    android:src="@drawable/back_arrow"

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

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



  <EditText

    android:id="@+id/search_view"

java/com/android/contacts/common/res/layout/unread_count_tab.xml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_centerInParent="true"/>



  <TextView

    android:id="@+id/count"

    android:layout_width="wrap_content"

java/com/android/contacts/common/res/values/colors.xml

+7 −3
Original line number Diff line number Diff line
@@ -51,11 +51,13 @@ 
    <item>#424242</item>

  </array>



  <color name="contactscommon_actionbar_background_color">@color/dialer_theme_color</color>

<!--  <color name="contactscommon_actionbar_background_color">@color/dialer_theme_color</color>-->

  <color name="contactscommon_actionbar_background_color">@color/actionbar_background_color</color>



  <color name="tab_ripple_color">#ffffff</color>

  <color name="tab_accent_color">@color/tab_ripple_color</color>

  <color name="tab_selected_underline_color">#f50057</color>

<!--  <color name="tab_selected_underline_color">#f50057</color>-->

  <color name="tab_selected_underline_color">@color/dialer_theme_color</color>

  <color name="tab_unread_count_background_color">#1C3AA9</color>



  <!-- Color of the title to the Frequently Contacted section -->
@@ -73,7 +75,9 @@ 
  <color name="searchbox_background_color">#ffffff</color>



  <color name="searchbox_hint_text_color">#737373</color>

  <color name="searchbox_icon_tint">@color/searchbox_hint_text_color</color>



<!--  <color name="searchbox_icon_tint">@color/searchbox_hint_text_color</color>-->

  <color name="searchbox_icon_tint">@color/dialer_theme_color</color>



  <color name="search_shortcut_icon_color">@color/dialtacts_theme_color</color>

java/com/android/dialer/app/res/layout/call_log_list_item.xml

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ 
          android:layout_gravity="center_vertical"

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

          android:scaleType="center"

          android:tint="@color/call_log_list_item_primary_action_icon_tint"

          android:tint="@color/dialer_theme_color"

          android:visibility="gone"/>



      </LinearLayout>