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

Commit fbb2d4f8 authored by Eric Erfanian's avatar Eric Erfanian Committed by android-build-merger
Browse files

Merge changes Ica13ee39,I5e0fedc8,I8e7efad0,I0ecc1f91,Iee1e658a, ... 

am: 2c3d81ee

Change-Id: Ide0d5d3f5bf48d4ff62ea3fe5c5ba64cc4bebfca
parents 1df58625 2c3d81ee

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

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import android.util.AttributeSet; 
import android.view.View;

import android.widget.LinearLayout;

import com.android.contacts.common.R;

import com.android.dialer.theme.ThemeUtil;

import com.android.dialer.theme.base.ThemeComponent;



public class ViewPagerTabStrip extends LinearLayout {
@@ -43,8 +43,8 @@ public class ViewPagerTabStrip extends LinearLayout { 
    final Resources res = context.getResources();



    mSelectedUnderlineThickness = res.getDimensionPixelSize(R.dimen.tab_selected_underline_height);

    int underlineColor = ThemeUtil.getColorAccent();

    int backgroundColor = ThemeUtil.getColorPrimary();

    int underlineColor = ThemeComponent.get(context).theme().getColorAccent();

    int backgroundColor = ThemeComponent.get(context).theme().getColorPrimary();



    mSelectedUnderlinePaint = new Paint();

    mSelectedUnderlinePaint.setColor(underlineColor);

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

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ public class ViewPagerTabs extends HorizontalScrollView implements ViewPager.OnP 
    } else {

      final TextView textView = new TextView(getContext());

      textView.setText(tabTitle);

      textView.setBackgroundResource(R.drawable.view_pager_tab_background);

      textView.setClickable(true);



      // Assign various text appearance related attributes to child views.

      if (mTextStyle > 0) {

java/com/android/contacts/common/res/drawable/dialog_background_material.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ 
  android:inset="16dp">

  <shape android:shape="rectangle">

    <corners android:radius="2dp"/>

    <solid android:color="@color/call_subject_history_background"/>

    <solid android:color="?android:attr/colorBackground"/>

  </shape>

</inset>

java/com/android/contacts/common/res/drawable/ic_scroll_handle_default.xml

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


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

  android:src="@drawable/ic_scroll_handle"

  android:tint="@color/dialer_secondary_text_color"/>
 
  android:tint="?colorIcon"/>

java/com/android/contacts/common/res/drawable/item_background_material_dark.xml

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

<!-- Copyright (C) 2014 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.

-->



<!-- Based on the Theme.Material's default selectableItemBackground -->

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

  android:color="@color/dialer_ripple_material_dark">

  <item android:id="@android:id/mask">

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

  </item>

</ripple>
 
 No newline at end of file