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

Commit 7c16c741 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch 'epic34-s-app_redesign' into 'v1-s' 

Dialer: Redesign app according to our palette

See merge request e/os/android_packages_apps_Dialer!78
parents 627df4e1 7e9defd6

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

+2 −2
Original line number Diff line number Diff line
@@ -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 = ThemeComponent.get(context).theme().getColorAccent();

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

    int underlineColor = context.getResources().getColor(R.color.dialer_theme_color);

    int backgroundColor = context.getResources().getColor(R.color.foreground_color);



    mSelectedUnderlinePaint = new Paint();

    mSelectedUnderlinePaint.setColor(underlineColor);

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

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ public class ViewPagerTabs extends HorizontalScrollView implements ViewPager.OnP 
      View layout = LayoutInflater.from(getContext()).inflate(R.layout.unread_count_tab, null);

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

      iconView.setBackgroundResource(mTabIcons[position]);

      iconView.setBackgroundTintList(getContext().getResources().getColorStateList(R.color.dialer_theme_color));

      iconView.setContentDescription(tabTitle);

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

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

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

+2 −2
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ 
        android:name="com.android.dialer.about.LicenseMenuActivity"

        android:label="@string/licenseActivityLabel"

        android:exported="true"

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

        android:theme="@style/Dialer.ThemeBase.ActionBar">

    </activity>

    <activity

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

        android:label="@string/licenseActivityLabel"

        android:exported="false"

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

        android:theme="@style/Dialer.ThemeBase.ActionBar">

    </activity>

  </application>

</manifest>

java/com/android/dialer/app/calllog/CallLogFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ public class CallLogFragment extends Fragment 
    recyclerView.setLayoutManager(layoutManager);

    PerformanceReport.logOnScrollStateChange(recyclerView);

    emptyListView = (EmptyContentView) view.findViewById(R.id.empty_list_view);

    emptyListView.setImage(R.drawable.empty_call_log);

    emptyListView.setImage(R.drawable.ic_baseline_access_time_48);

    emptyListView.setActionClickedListener(this);

    modalAlertView = (ViewGroup) view.findViewById(R.id.modal_message_container);

    modalAlertManager =

java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder 
    if (!TextUtils.isEmpty(voicemailUri)) {

      // Treat as voicemail list item; show play button if not expanded.

      if (!isExpanded) {

        primaryActionButtonView.setImageResource(R.drawable.quantum_ic_play_arrow_white_24);

        primaryActionButtonView.setImageResource(R.drawable.quantum_ic_play_arrow_vd_theme_24);

        primaryActionButtonView.setContentDescription(

            TextUtils.expandTemplate(

                context.getString(R.string.description_voicemail_action), validNameOrNumber));