From 929539eb864822d669265b142bdcc49b6cf8ea6b Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Sat, 19 May 2018 00:05:02 -0700 Subject: 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 --- .../incallui/ConferenceParticipantListAdapter.java | 11 +-- .../android/incallui/PostCharDialogFragment.java | 3 +- .../android/incallui/RttRequestDialogFragment.java | 2 +- .../impl/res/layout/fragment_incoming_call.xml | 2 +- .../incallui/audioroute/res/values/styles.xml | 19 ++++- .../impl/res/layout/location_fragment.xml | 2 +- .../incallui/callpending/AndroidManifest.xml | 4 +- .../incallui/commontheme/res/values/styles.xml | 8 +- .../incallui/incall/impl/res/values/dimens.xml | 1 - .../res/drawable/incall_background_gradient.xml | 8 -- .../incallui/res/layout/caller_in_conference.xml | 12 +-- .../res/layout/frag_rtt_request_dialog.xml | 2 +- java/com/android/incallui/res/values/colors.xml | 70 ----------------- java/com/android/incallui/res/values/dimens.xml | 44 ----------- java/com/android/incallui/res/values/strings.xml | 5 -- java/com/android/incallui/res/values/styles.xml | 91 ---------------------- .../res/drawable/answer_data_background.xml | 2 +- .../res/drawable/spam_container_background.xml | 2 +- .../res/layout/fragment_composer_text.xml | 2 +- .../incallui/spam/SpamNotificationActivity.java | 10 ++- .../InternationalCallOnWifiDialogFragment.java | 2 +- .../frag_international_call_on_wifi_dialog.xml | 2 +- .../com/android/incallui/theme/AndroidManifest.xml | 16 ++++ .../res/drawable/incall_background_gradient.xml | 23 ++++++ .../android/incallui/theme/res/values/colors.xml | 70 +++++++++++++++++ .../android/incallui/theme/res/values/dimens.xml | 45 +++++++++++ .../android/incallui/theme/res/values/strings.xml | 21 +++++ .../android/incallui/theme/res/values/styles.xml | 84 ++++++++++++++++++++ .../impl/VideoChargesAlertDialogFragment.java | 2 +- .../res/layout/frag_video_charges_alert_dialog.xml | 2 +- 30 files changed, 310 insertions(+), 257 deletions(-) delete mode 100644 java/com/android/incallui/res/drawable/incall_background_gradient.xml delete mode 100644 java/com/android/incallui/res/values/colors.xml delete mode 100644 java/com/android/incallui/res/values/dimens.xml delete mode 100644 java/com/android/incallui/res/values/styles.xml create mode 100644 java/com/android/incallui/theme/AndroidManifest.xml create mode 100644 java/com/android/incallui/theme/res/drawable/incall_background_gradient.xml create mode 100644 java/com/android/incallui/theme/res/values/colors.xml create mode 100644 java/com/android/incallui/theme/res/values/dimens.xml create mode 100644 java/com/android/incallui/theme/res/values/strings.xml create mode 100644 java/com/android/incallui/theme/res/values/styles.xml (limited to 'java/com/android/incallui') diff --git a/java/com/android/incallui/ConferenceParticipantListAdapter.java b/java/com/android/incallui/ConferenceParticipantListAdapter.java index 597702b2a..5318fdb5f 100644 --- a/java/com/android/incallui/ConferenceParticipantListAdapter.java +++ b/java/com/android/incallui/ConferenceParticipantListAdapter.java @@ -357,9 +357,8 @@ public class ConferenceParticipantListAdapter extends BaseAdapter { statusTextView.setText(onHoldText); statusTextView.setVisibility(View.VISIBLE); - int onHoldColor = getContext().getColor(R.color.dialer_disabled_text_color); - nameTextView.setTextColor(onHoldColor); - numberTextView.setTextColor(onHoldColor); + nameTextView.setEnabled(false); + numberTextView.setEnabled(false); TypedValue alpha = new TypedValue(); getContext().getResources().getValue(R.dimen.alpha_hiden, alpha, true); @@ -373,10 +372,8 @@ public class ConferenceParticipantListAdapter extends BaseAdapter { TextView numberTextView) { statusTextView.setVisibility(View.GONE); - nameTextView.setTextColor( - getContext().getColor(R.color.conference_call_manager_caller_name_text_color)); - numberTextView.setTextColor( - getContext().getColor(R.color.conference_call_manager_secondary_text_color)); + nameTextView.setEnabled(true); + numberTextView.setEnabled(true); TypedValue alpha = new TypedValue(); getContext().getResources().getValue(R.dimen.alpha_enabled, alpha, true); diff --git a/java/com/android/incallui/PostCharDialogFragment.java b/java/com/android/incallui/PostCharDialogFragment.java index 1d06fd487..4bcc68e33 100644 --- a/java/com/android/incallui/PostCharDialogFragment.java +++ b/java/com/android/incallui/PostCharDialogFragment.java @@ -55,8 +55,7 @@ public class PostCharDialogFragment extends DialogFragment { buf.append(getResources().getText(R.string.wait_prompt_str)); buf.append(postDialStr); - final AlertDialog.Builder builder = - new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme); + final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setMessage(buf.toString()); builder.setPositiveButton( diff --git a/java/com/android/incallui/RttRequestDialogFragment.java b/java/com/android/incallui/RttRequestDialogFragment.java index fa9b0e5db..5437cc699 100644 --- a/java/com/android/incallui/RttRequestDialogFragment.java +++ b/java/com/android/incallui/RttRequestDialogFragment.java @@ -83,7 +83,7 @@ public class RttRequestDialogFragment extends DialogFragment { .setOnClickListener(v -> onPositiveButtonClick()); AlertDialog alertDialog = - new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme) + new AlertDialog.Builder(getActivity()) .setCancelable(false) .setView(dialogView) .setTitle(R.string.rtt_request_dialog_title) diff --git a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml index 1c8cbfdbd..589a74325 100644 --- a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml +++ b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml @@ -124,7 +124,7 @@ android:textAllCaps="true" android:textSize="14sp" android:textStyle="bold" - android:textColor="@color/background_dialer_white" + android:textColor="?android:attr/colorBackground" android:background="@drawable/urgent_call_background"/> + diff --git a/java/com/android/incallui/calllocation/impl/res/layout/location_fragment.xml b/java/com/android/incallui/calllocation/impl/res/layout/location_fragment.xml index d20e32b3f..5d1e2baf7 100644 --- a/java/com/android/incallui/calllocation/impl/res/layout/location_fragment.xml +++ b/java/com/android/incallui/calllocation/impl/res/layout/location_fragment.xml @@ -85,7 +85,7 @@ android:contentDescription="@string/location_map_description" android:scaleType="centerCrop" android:visibility="invisible" - tools:src="?android:colorPrimaryDark" + tools:src="?android:attr/colorPrimaryDark" tools:visibility="visible"/> - - + + @@ -38,7 +38,7 @@ 24dp 8dp fitCenter - ?android:textColorSecondary + ?android:attr/textColorSecondary - - - - - - - - - - - - diff --git a/java/com/android/incallui/sessiondata/res/drawable/answer_data_background.xml b/java/com/android/incallui/sessiondata/res/drawable/answer_data_background.xml index 1d481f3f8..cb7663369 100644 --- a/java/com/android/incallui/sessiondata/res/drawable/answer_data_background.xml +++ b/java/com/android/incallui/sessiondata/res/drawable/answer_data_background.xml @@ -19,5 +19,5 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - + diff --git a/java/com/android/incallui/sessiondata/res/drawable/spam_container_background.xml b/java/com/android/incallui/sessiondata/res/drawable/spam_container_background.xml index f01fe514a..023012bb2 100644 --- a/java/com/android/incallui/sessiondata/res/drawable/spam_container_background.xml +++ b/java/com/android/incallui/sessiondata/res/drawable/spam_container_background.xml @@ -18,5 +18,5 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - + \ No newline at end of file diff --git a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml index b93db63ad..b7b358075 100644 --- a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml +++ b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml @@ -39,7 +39,7 @@ android:paddingEnd="32dp" android:minHeight="108dp" android:lineSpacingMultiplier="1.2" - android:textColor="@color/background_dialer_white" + android:textColor="?android:attr/colorBackground" android:textAppearance="@style/Dialer.Incall.TextAppearance.Message" android:background="@drawable/answer_text_only_background" app:autoSizeTextType="uniform" diff --git a/java/com/android/incallui/spam/SpamNotificationActivity.java b/java/com/android/incallui/spam/SpamNotificationActivity.java index 2cf486874..37755fc53 100644 --- a/java/com/android/incallui/spam/SpamNotificationActivity.java +++ b/java/com/android/incallui/spam/SpamNotificationActivity.java @@ -16,7 +16,6 @@ package com.android.incallui.spam; -import android.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; import android.content.Context; @@ -27,6 +26,7 @@ import android.provider.CallLog; import android.provider.ContactsContract; import android.support.annotation.Nullable; import android.support.v4.app.FragmentActivity; +import android.support.v7.app.AlertDialog; import android.telephony.PhoneNumberUtils; import com.android.dialer.blocking.BlockedNumbersMigrator; import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler; @@ -230,7 +230,7 @@ public class SpamNotificationActivity extends FragmentActivity { } }, dismissListener) - .show(getFragmentManager(), BlockReportSpamDialogs.NOT_SPAM_DIALOG_TAG); + .show(getSupportFragmentManager(), BlockReportSpamDialogs.NOT_SPAM_DIALOG_TAG); } else { reportNotSpamAndFinish(number, contactLookupResultType); } @@ -257,7 +257,9 @@ public class SpamNotificationActivity extends FragmentActivity { } }, dismissListener) - .show(getFragmentManager(), BlockReportSpamDialogs.BLOCK_REPORT_SPAM_DIALOG_TAG); + .show( + getSupportFragmentManager(), + BlockReportSpamDialogs.BLOCK_REPORT_SPAM_DIALOG_TAG); } }); } else { @@ -539,7 +541,7 @@ public class SpamNotificationActivity extends FragmentActivity { private void showSpamBlockingPromoDialog() { spamBlockingPromoHelper.showSpamBlockingPromoDialog( - getFragmentManager(), + getSupportFragmentManager(), () -> { Logger.get(this) .logImpression( diff --git a/java/com/android/incallui/telecomeventui/InternationalCallOnWifiDialogFragment.java b/java/com/android/incallui/telecomeventui/InternationalCallOnWifiDialogFragment.java index 71a8be483..cd53f26c0 100644 --- a/java/com/android/incallui/telecomeventui/InternationalCallOnWifiDialogFragment.java +++ b/java/com/android/incallui/telecomeventui/InternationalCallOnWifiDialogFragment.java @@ -109,7 +109,7 @@ public class InternationalCallOnWifiDialogFragment extends DialogFragment { alwaysWarn.setChecked(preferences.getBoolean(ALWAYS_SHOW_WARNING_PREFERENCE_KEY, false)); AlertDialog alertDialog = - new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme) + new AlertDialog.Builder(getActivity()) .setCancelable(false) .setView(dialogView) .setPositiveButton( diff --git a/java/com/android/incallui/telecomeventui/res/layout/frag_international_call_on_wifi_dialog.xml b/java/com/android/incallui/telecomeventui/res/layout/frag_international_call_on_wifi_dialog.xml index 3d8adcb0d..996bc75ba 100644 --- a/java/com/android/incallui/telecomeventui/res/layout/frag_international_call_on_wifi_dialog.xml +++ b/java/com/android/incallui/telecomeventui/res/layout/frag_international_call_on_wifi_dialog.xml @@ -35,7 +35,7 @@ android:id="@+id/always_warn" android:layout_width="match_parent" android:layout_height="wrap_content" - android:buttonTint="@color/dialer_theme_color" + android:buttonTint="?android:attr/colorPrimary" android:text="@string/always_warn" android:textColor="@color/dialer_primary_text_color" android:textSize="14sp"/> diff --git a/java/com/android/incallui/theme/AndroidManifest.xml b/java/com/android/incallui/theme/AndroidManifest.xml new file mode 100644 index 000000000..3b1a459cb --- /dev/null +++ b/java/com/android/incallui/theme/AndroidManifest.xml @@ -0,0 +1,16 @@ + + diff --git a/java/com/android/incallui/theme/res/drawable/incall_background_gradient.xml b/java/com/android/incallui/theme/res/drawable/incall_background_gradient.xml new file mode 100644 index 000000000..996f17245 --- /dev/null +++ b/java/com/android/incallui/theme/res/drawable/incall_background_gradient.xml @@ -0,0 +1,23 @@ + + + + + diff --git a/java/com/android/incallui/theme/res/values/colors.xml b/java/com/android/incallui/theme/res/values/colors.xml new file mode 100644 index 000000000..cb894bbb7 --- /dev/null +++ b/java/com/android/incallui/theme/res/values/colors.xml @@ -0,0 +1,70 @@ + + + + + #4d4d4d + + #999999 + + #ffffff + + + ?android:attr/colorPrimary + + + @color/dialer_theme_color_20pct + + + + #00796B + #3367D6 + #303F9F + #7B1FA2 + #C2185B + #C53929 + #A52714 + + + + + #00695C + #2A56C6 + #283593 + #6A1B9A + #AD1457 + #B93221 + #841F10 + + + #E91141BB + #E91141BB + #CC229FEB + + #E91141BB + + #E5A30B0B + #D6C01111 + #B8E55135 + + #E9C22E2E + diff --git a/java/com/android/incallui/theme/res/values/dimens.xml b/java/com/android/incallui/theme/res/values/dimens.xml new file mode 100644 index 000000000..a84d8192a --- /dev/null +++ b/java/com/android/incallui/theme/res/values/dimens.xml @@ -0,0 +1,45 @@ + + + + + + 1dp + 20sp + 50dp + 9sp + + @dimen/dialpad_key_letters_default_size_for_single_alphabet + + 36dp + 116dp + + + 64dp + + 48dp + + 120dp + + + false + + 16sp + + diff --git a/java/com/android/incallui/theme/res/values/strings.xml b/java/com/android/incallui/theme/res/values/strings.xml new file mode 100644 index 000000000..c61290565 --- /dev/null +++ b/java/com/android/incallui/theme/res/values/strings.xml @@ -0,0 +1,21 @@ + + + + + Phone + \ No newline at end of file diff --git a/java/com/android/incallui/theme/res/values/styles.xml b/java/com/android/incallui/theme/res/values/styles.xml new file mode 100644 index 000000000..6bbad4e87 --- /dev/null +++ b/java/com/android/incallui/theme/res/values/styles.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/incallui/video/impl/VideoChargesAlertDialogFragment.java b/java/com/android/incallui/video/impl/VideoChargesAlertDialogFragment.java index 6762a9d22..799345243 100644 --- a/java/com/android/incallui/video/impl/VideoChargesAlertDialogFragment.java +++ b/java/com/android/incallui/video/impl/VideoChargesAlertDialogFragment.java @@ -117,7 +117,7 @@ public class VideoChargesAlertDialogFragment extends DialogFragment { SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity()); AlertDialog alertDialog = - new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme) + new AlertDialog.Builder(getActivity()) .setView(dialogView) .setPositiveButton( android.R.string.ok, diff --git a/java/com/android/incallui/video/impl/res/layout/frag_video_charges_alert_dialog.xml b/java/com/android/incallui/video/impl/res/layout/frag_video_charges_alert_dialog.xml index a547c7d69..56e1d794a 100644 --- a/java/com/android/incallui/video/impl/res/layout/frag_video_charges_alert_dialog.xml +++ b/java/com/android/incallui/video/impl/res/layout/frag_video_charges_alert_dialog.xml @@ -41,7 +41,7 @@ android:id="@+id/do_not_show" android:layout_width="match_parent" android:layout_height="wrap_content" - android:buttonTint="@color/dialer_theme_color" + android:buttonTint="?android:attr/colorPrimary" android:focusable="true" android:clickable="true" android:text="@string/do_not_show_again" -- cgit v1.2.3