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

Commit 929539eb authored by calderwoodra's avatar calderwoodra Committed by Copybara-Service
Browse files

Implement a global theme to be easily configured in Dialer. 

deleted several colors and unified them across the app
migrated several alert dialogs to support alert dialogs
added many todos
migrated several tests from GoogleRobolectricTestRunner to RobolectricTestRunner
Because of the test migration:
 - moved dialpad theme attributes into dialpad/theme
 - moved incall ui theme attributes into incallui/theme

Bug: 79883035
Test: tap
PiperOrigin-RevId: 197246477
Change-Id: Ifc534793bc32757bbbf2007a7c40287c8d0817ad
parent ea7399a7

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

+3 −2
Original line number Diff line number Diff line
@@ -24,6 +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;



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



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

    int underlineColor = res.getColor(R.color.tab_selected_underline_color);

    int backgroundColor = res.getColor(R.color.contactscommon_actionbar_background_color);

    int underlineColor = ThemeUtil.getColorAccent();

    int backgroundColor = ThemeUtil.getColorPrimary();



    mSelectedUnderlinePaint = new Paint();

    mSelectedUnderlinePaint.setColor(underlineColor);

java/com/android/contacts/common/res/drawable/ic_scroll_handle_pressed.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/dialtacts_theme_color"/>
 
 No newline at end of file
 
  android:tint="?android:attr/colorPrimary"/>
 
 No newline at end of file

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

+16 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright 2014 Google Inc. All Rights Reserved. -->

<!--

  ~ 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

  -->



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

  <size android:width="2dp"/>

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

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

</shape>
 
 No newline at end of file

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

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

  </array>



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

  <color name="contactscommon_actionbar_background_color">?android:attr/colorPrimary</color>



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

  <color name="tab_accent_color">@color/tab_ripple_color</color>
@@ -75,7 +75,7 @@ 
  <color name="searchbox_hint_text_color">#737373</color>

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



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

  <color name="search_shortcut_icon_color">?android:attr/colorPrimary</color>



  <!-- Color of the background of the contact detail and editor pages -->

  <color name="background_primary">#f9f9f9</color>

java/com/android/dialer/about/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
-->

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

  package="com.android.dialer.about">

  <application android:theme="@style/Theme.AppCompat">

  <application>

    <activity

        android:name="com.android.dialer.about.LicenseMenuActivity"

        android:label="@string/licenseActivityLabel"