From e760e4204887acd9fb6e4b8b00059659a1367c3b Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Thu, 15 Mar 2018 15:56:30 -0700 Subject: Resolve all build resource conflicts. For simplicity, instead of resolve the nui shortcut string, I deleted it since it isn't used anymore. Test: build log PiperOrigin-RevId: 189260472 Change-Id: I67d5a49d78916a8960e41ad1c7b7f59efad6d718 --- .../contacts/common/dialog/CallSubjectDialog.java | 2 +- .../android/contacts/common/res/values/strings.xml | 2 +- java/com/android/dialer/app/MainComponent.java | 34 ------- .../dialer/app/res/drawable-hdpi/ic_handle.png | Bin 543 -> 0 bytes .../dialer/app/res/drawable-hdpi/old_ic_handle.png | Bin 0 -> 543 bytes .../dialer/app/res/drawable-mdpi/ic_handle.png | Bin 454 -> 0 bytes .../dialer/app/res/drawable-mdpi/old_ic_handle.png | Bin 0 -> 454 bytes .../dialer/app/res/drawable-xhdpi/ic_handle.png | Bin 681 -> 0 bytes .../app/res/drawable-xhdpi/old_ic_handle.png | Bin 0 -> 681 bytes .../dialer/app/res/drawable-xxhdpi/ic_handle.png | Bin 1431 -> 0 bytes .../app/res/drawable-xxhdpi/old_ic_handle.png | Bin 0 -> 1431 bytes .../dialer/app/res/drawable-xxxhdpi/ic_handle.png | Bin 1687 -> 0 bytes .../app/res/drawable-xxxhdpi/old_ic_handle.png | Bin 0 -> 1687 bytes .../app/res/drawable/ic_voicemail_seek_handle.xml | 2 +- .../drawable/ic_voicemail_seek_handle_disabled.xml | 20 ---- .../old_ic_voicemail_seek_handle_disabled.xml | 20 ++++ java/com/android/dialer/app/res/values/strings.xml | 4 - .../app/voicemail/VoicemailPlaybackLayout.java | 2 +- .../dialer/blocking/BlockNumberDialogFragment.java | 2 +- .../android/dialer/blocking/res/values/strings.xml | 2 +- .../dialer/historyitemactions/SharedModules.java | 2 +- .../res/drawable-xxxhdpi/bottomsheet_unblock.png | Bin 0 -> 1034 bytes .../res/drawable-xxxhdpi/ic_unblock.png | Bin 1034 -> 0 bytes java/com/android/dialer/main/impl/MainImpl.java | 34 ------- .../dialer/main/impl/res/values/strings.xml | 4 - .../android/dialer/main/impl/res/values/styles.xml | 4 +- .../directories/res/values/strings.xml | 6 -- .../dialer/speeddial/SuggestionViewHolder.java | 3 +- .../android/dialer/theme/res/values/strings.xml | 6 ++ .../listui/res/layout/voicemail_tos_fragment.xml | 102 --------------------- .../dialer/voicemail/listui/res/values/strings.xml | 2 - 31 files changed, 36 insertions(+), 217 deletions(-) delete mode 100644 java/com/android/dialer/app/res/drawable-hdpi/ic_handle.png create mode 100644 java/com/android/dialer/app/res/drawable-hdpi/old_ic_handle.png delete mode 100644 java/com/android/dialer/app/res/drawable-mdpi/ic_handle.png create mode 100644 java/com/android/dialer/app/res/drawable-mdpi/old_ic_handle.png delete mode 100644 java/com/android/dialer/app/res/drawable-xhdpi/ic_handle.png create mode 100644 java/com/android/dialer/app/res/drawable-xhdpi/old_ic_handle.png delete mode 100644 java/com/android/dialer/app/res/drawable-xxhdpi/ic_handle.png create mode 100644 java/com/android/dialer/app/res/drawable-xxhdpi/old_ic_handle.png delete mode 100644 java/com/android/dialer/app/res/drawable-xxxhdpi/ic_handle.png create mode 100644 java/com/android/dialer/app/res/drawable-xxxhdpi/old_ic_handle.png delete mode 100644 java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle_disabled.xml create mode 100644 java/com/android/dialer/app/res/drawable/old_ic_voicemail_seek_handle_disabled.xml create mode 100644 java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/bottomsheet_unblock.png delete mode 100644 java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/ic_unblock.png delete mode 100644 java/com/android/dialer/voicemail/listui/res/layout/voicemail_tos_fragment.xml diff --git a/java/com/android/contacts/common/dialog/CallSubjectDialog.java b/java/com/android/contacts/common/dialog/CallSubjectDialog.java index 2ba2476a6..7bc13fe72 100644 --- a/java/com/android/contacts/common/dialog/CallSubjectDialog.java +++ b/java/com/android/contacts/common/dialog/CallSubjectDialog.java @@ -331,7 +331,7 @@ public class CallSubjectDialog extends Activity { mNumberView.setText( TextUtils.isEmpty(mNumberLabel) ? mDisplayNumber - : getString(R.string.call_subject_type_and_number, mNumberLabel, mDisplayNumber)); + : getString(R.string.old_call_subject_type_and_number, mNumberLabel, mDisplayNumber)); } else { mNumberView.setVisibility(View.GONE); mNumberView.setText(null); diff --git a/java/com/android/contacts/common/res/values/strings.xml b/java/com/android/contacts/common/res/values/strings.xml index 809439ee5..cf24a8867 100644 --- a/java/com/android/contacts/common/res/values/strings.xml +++ b/java/com/android/contacts/common/res/values/strings.xml @@ -395,7 +395,7 @@ - %1$s %2$s + %1$s %2$s %1$s tab. diff --git a/java/com/android/dialer/app/MainComponent.java b/java/com/android/dialer/app/MainComponent.java index 3bd48bf15..f8d457c5f 100644 --- a/java/com/android/dialer/app/MainComponent.java +++ b/java/com/android/dialer/app/MainComponent.java @@ -16,34 +16,21 @@ package com.android.dialer.app; -import android.annotation.TargetApi; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import android.os.Build; -import android.os.Build.VERSION_CODES; -import android.support.v4.content.pm.ShortcutInfoCompat; -import android.support.v4.content.pm.ShortcutManagerCompat; -import android.support.v4.graphics.drawable.IconCompat; import com.android.dialer.configprovider.ConfigProviderBindings; /** This class is a copy of dialer.main.impl.MainImpl to get around a dependency issue. */ public class MainComponent { - private static final String SHORTCUT_KEY = "nui_launcher_shortcut"; - public static boolean isNewUiEnabled(Context context) { return ConfigProviderBindings.get(context).getBoolean("is_nui_shortcut_enabled", false); } public static void createNewUiLauncherShortcut(Context context) { enableComponent(context); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - createLauncherShortcutO(context); - } else { - createLauncherShortcutPreO(context); - } } public static boolean isNuiComponentEnabled(Context context) { @@ -70,27 +57,6 @@ public class MainComponent { PackageManager.DONT_KILL_APP); } - @TargetApi(VERSION_CODES.O) - private static void createLauncherShortcutO(Context context) { - ShortcutInfoCompat shortcutInfo = - new ShortcutInfoCompat.Builder(context, SHORTCUT_KEY) - .setIcon(IconCompat.createWithResource(context, R.drawable.nui_launcher_icon)) - .setIntent(getIntent(context)) - .setShortLabel(context.getString(R.string.nui_shortcut_name)) - .build(); - ShortcutManagerCompat.requestPinShortcut(context, shortcutInfo, null); - } - - private static void createLauncherShortcutPreO(Context context) { - Intent intent = new Intent("com.android.launcher.action.INSTALL_SHORTCUT"); - intent.putExtra( - Intent.EXTRA_SHORTCUT_ICON, - Intent.ShortcutIconResource.fromContext(context, R.drawable.nui_launcher_icon)); - intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, context.getString(R.string.nui_shortcut_name)); - intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, getIntent(context)); - context.sendBroadcast(intent); - } - /** * @param context Context of the application package implementing MainActivity class. * @return intent for MainActivity.class diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_handle.png deleted file mode 100644 index 34310aa49..000000000 Binary files a/java/com/android/dialer/app/res/drawable-hdpi/ic_handle.png and /dev/null differ diff --git a/java/com/android/dialer/app/res/drawable-hdpi/old_ic_handle.png b/java/com/android/dialer/app/res/drawable-hdpi/old_ic_handle.png new file mode 100644 index 000000000..34310aa49 Binary files /dev/null and b/java/com/android/dialer/app/res/drawable-hdpi/old_ic_handle.png differ diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-mdpi/ic_handle.png deleted file mode 100644 index 81a67ba6f..000000000 Binary files a/java/com/android/dialer/app/res/drawable-mdpi/ic_handle.png and /dev/null differ diff --git a/java/com/android/dialer/app/res/drawable-mdpi/old_ic_handle.png b/java/com/android/dialer/app/res/drawable-mdpi/old_ic_handle.png new file mode 100644 index 000000000..81a67ba6f Binary files /dev/null and b/java/com/android/dialer/app/res/drawable-mdpi/old_ic_handle.png differ diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-xhdpi/ic_handle.png deleted file mode 100644 index 0ad839286..000000000 Binary files a/java/com/android/dialer/app/res/drawable-xhdpi/ic_handle.png and /dev/null differ diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/old_ic_handle.png b/java/com/android/dialer/app/res/drawable-xhdpi/old_ic_handle.png new file mode 100644 index 000000000..0ad839286 Binary files /dev/null and b/java/com/android/dialer/app/res/drawable-xhdpi/old_ic_handle.png differ diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_handle.png deleted file mode 100644 index d07a1d057..000000000 Binary files a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_handle.png and /dev/null differ diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/old_ic_handle.png b/java/com/android/dialer/app/res/drawable-xxhdpi/old_ic_handle.png new file mode 100644 index 000000000..d07a1d057 Binary files /dev/null and b/java/com/android/dialer/app/res/drawable-xxhdpi/old_ic_handle.png differ diff --git a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_handle.png deleted file mode 100644 index 72641c7ab..000000000 Binary files a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_handle.png and /dev/null differ diff --git a/java/com/android/dialer/app/res/drawable-xxxhdpi/old_ic_handle.png b/java/com/android/dialer/app/res/drawable-xxxhdpi/old_ic_handle.png new file mode 100644 index 000000000..72641c7ab Binary files /dev/null and b/java/com/android/dialer/app/res/drawable-xxxhdpi/old_ic_handle.png differ diff --git a/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml b/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml index 84cda0310..ffdd64edc 100644 --- a/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml +++ b/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml @@ -15,6 +15,6 @@ ~ limitations under the License --> \ No newline at end of file diff --git a/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle_disabled.xml b/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle_disabled.xml deleted file mode 100644 index 5e974c45a..000000000 --- a/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle_disabled.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - \ No newline at end of file diff --git a/java/com/android/dialer/app/res/drawable/old_ic_voicemail_seek_handle_disabled.xml b/java/com/android/dialer/app/res/drawable/old_ic_voicemail_seek_handle_disabled.xml new file mode 100644 index 000000000..cfce81812 --- /dev/null +++ b/java/com/android/dialer/app/res/drawable/old_ic_voicemail_seek_handle_disabled.xml @@ -0,0 +1,20 @@ + + + + \ No newline at end of file diff --git a/java/com/android/dialer/app/res/values/strings.xml b/java/com/android/dialer/app/res/values/strings.xml index 7c883299c..e5092f001 100644 --- a/java/com/android/dialer/app/res/values/strings.xml +++ b/java/com/android/dialer/app/res/values/strings.xml @@ -718,8 +718,4 @@ Calls deleted. View and delete attachments shared during calls in Messages. - - - Phone NUI diff --git a/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java b/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java index 05da8e752..009fb9e10 100644 --- a/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java +++ b/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java @@ -234,7 +234,7 @@ public class VoicemailPlaybackLayout extends LinearLayout getResources().getDrawable(R.drawable.ic_voicemail_seek_handle, context.getTheme()); voicemailSeekHandleDisabled = getResources() - .getDrawable(R.drawable.ic_voicemail_seek_handle_disabled, context.getTheme()); + .getDrawable(R.drawable.old_ic_voicemail_seek_handle_disabled, context.getTheme()); } @Override diff --git a/java/com/android/dialer/blocking/BlockNumberDialogFragment.java b/java/com/android/dialer/blocking/BlockNumberDialogFragment.java index dfd6ef076..621287f6c 100644 --- a/java/com/android/dialer/blocking/BlockNumberDialogFragment.java +++ b/java/com/android/dialer/blocking/BlockNumberDialogFragment.java @@ -137,7 +137,7 @@ public class BlockNumberDialogFragment extends DialogFragment { } else { title = ContactDisplayUtils.getTtsSpannedPhoneNumber( - getResources(), R.string.block_number_confirmation_title, displayNumber); + getResources(), R.string.old_block_number_confirmation_title, displayNumber); okText = getString(R.string.block_number_ok); if (FilteredNumberCompat.useNewFiltering(getContext())) { message = getString(R.string.block_number_confirmation_message_new_filtering); diff --git a/java/com/android/dialer/blocking/res/values/strings.xml b/java/com/android/dialer/blocking/res/values/strings.xml index 7b344da4a..e5f6c8000 100644 --- a/java/com/android/dialer/blocking/res/values/strings.xml +++ b/java/com/android/dialer/blocking/res/values/strings.xml @@ -29,7 +29,7 @@ - + Block%1$s? diff --git a/java/com/android/dialer/historyitemactions/SharedModules.java b/java/com/android/dialer/historyitemactions/SharedModules.java index fa7062653..468661feb 100644 --- a/java/com/android/dialer/historyitemactions/SharedModules.java +++ b/java/com/android/dialer/historyitemactions/SharedModules.java @@ -179,7 +179,7 @@ public class SharedModules { @Override public int getDrawableId() { return isBlocked - ? R.drawable.ic_unblock // TODO(a bug): use a vector icon + ? R.drawable.bottomsheet_unblock // TODO(a bug): use a vector icon : R.drawable.quantum_ic_block_vd_theme_24; } diff --git a/java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/bottomsheet_unblock.png b/java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/bottomsheet_unblock.png new file mode 100644 index 000000000..01551e2fc Binary files /dev/null and b/java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/bottomsheet_unblock.png differ diff --git a/java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/ic_unblock.png b/java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/ic_unblock.png deleted file mode 100644 index 01551e2fc..000000000 Binary files a/java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/ic_unblock.png and /dev/null differ diff --git a/java/com/android/dialer/main/impl/MainImpl.java b/java/com/android/dialer/main/impl/MainImpl.java index 1cd457c8a..717350e5f 100644 --- a/java/com/android/dialer/main/impl/MainImpl.java +++ b/java/com/android/dialer/main/impl/MainImpl.java @@ -16,23 +16,15 @@ package com.android.dialer.main.impl; -import android.annotation.TargetApi; import android.content.ComponentName; import android.content.Context; -import android.content.Intent; import android.content.pm.PackageManager; -import android.os.Build; -import android.os.Build.VERSION_CODES; -import android.support.v4.content.pm.ShortcutInfoCompat; -import android.support.v4.content.pm.ShortcutManagerCompat; -import android.support.v4.graphics.drawable.IconCompat; import com.android.dialer.configprovider.ConfigProviderBindings; import com.android.dialer.main.Main; import javax.inject.Inject; /** The entry point for the main feature. */ final class MainImpl implements Main { - private static final String SHORTCUT_KEY = "nui_launcher_shortcut"; @Inject MainImpl() {} @@ -45,11 +37,6 @@ final class MainImpl implements Main { @Override public void createNewUiLauncherShortcut(Context context) { enableComponent(context); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - createLauncherShortcutO(context); - } else { - createLauncherShortcutPreO(context); - } } /** @@ -75,25 +62,4 @@ final class MainImpl implements Main { PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP); } - - @TargetApi(VERSION_CODES.O) - private static void createLauncherShortcutO(Context context) { - ShortcutInfoCompat shortcutInfo = - new ShortcutInfoCompat.Builder(context, SHORTCUT_KEY) - .setIcon(IconCompat.createWithResource(context, R.drawable.nui_launcher_icon)) - .setIntent(MainActivity.getIntent(context)) - .setShortLabel(context.getString(R.string.nui_shortcut_name)) - .build(); - ShortcutManagerCompat.requestPinShortcut(context, shortcutInfo, null); - } - - private static void createLauncherShortcutPreO(Context context) { - Intent intent = new Intent("com.android.launcher.action.INSTALL_SHORTCUT"); - intent.putExtra( - Intent.EXTRA_SHORTCUT_ICON, - Intent.ShortcutIconResource.fromContext(context, R.drawable.nui_launcher_icon)); - intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, context.getString(R.string.nui_shortcut_name)); - intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, MainActivity.getIntent(context)); - context.sendBroadcast(intent); - } } diff --git a/java/com/android/dialer/main/impl/res/values/strings.xml b/java/com/android/dialer/main/impl/res/values/strings.xml index 4e65432e5..121820383 100644 --- a/java/com/android/dialer/main/impl/res/values/strings.xml +++ b/java/com/android/dialer/main/impl/res/values/strings.xml @@ -18,10 +18,6 @@ Phone - - Phone NUI - Phone Keypad diff --git a/java/com/android/dialer/main/impl/res/values/styles.xml b/java/com/android/dialer/main/impl/res/values/styles.xml index 47fdbac93..387b1d79e 100644 --- a/java/com/android/dialer/main/impl/res/values/styles.xml +++ b/java/com/android/dialer/main/impl/res/values/styles.xml @@ -46,12 +46,12 @@ - @style/ActionModeStyle + @style/NuiActionModeStyle @style/ThemeOverlay.AppCompat.Dark.ActionBar - diff --git a/java/com/android/dialer/searchfragment/directories/res/values/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values/strings.xml index 097f353ea..beabba135 100644 --- a/java/com/android/dialer/searchfragment/directories/res/values/strings.xml +++ b/java/com/android/dialer/searchfragment/directories/res/values/strings.xml @@ -17,10 +17,4 @@ Directory %1$s - - - - %1$s %2$s - \ No newline at end of file diff --git a/java/com/android/dialer/speeddial/SuggestionViewHolder.java b/java/com/android/dialer/speeddial/SuggestionViewHolder.java index 68c0ce4c3..213a54f55 100644 --- a/java/com/android/dialer/speeddial/SuggestionViewHolder.java +++ b/java/com/android/dialer/speeddial/SuggestionViewHolder.java @@ -63,8 +63,7 @@ public class SuggestionViewHolder extends RecyclerView.ViewHolder implements OnC String secondaryInfo = TextUtils.isEmpty(label) ? number - : context.getString( - com.android.contacts.common.R.string.call_subject_type_and_number, label, number); + : context.getString(R.string.call_subject_type_and_number, label, number); nameOrNumberView.setText(name); numberView.setText(secondaryInfo); diff --git a/java/com/android/dialer/theme/res/values/strings.xml b/java/com/android/dialer/theme/res/values/strings.xml index a14693f51..6194751ef 100644 --- a/java/com/android/dialer/theme/res/values/strings.xml +++ b/java/com/android/dialer/theme/res/values/strings.xml @@ -32,4 +32,10 @@ Call + + + + %1$s %2$s + diff --git a/java/com/android/dialer/voicemail/listui/res/layout/voicemail_tos_fragment.xml b/java/com/android/dialer/voicemail/listui/res/layout/voicemail_tos_fragment.xml deleted file mode 100644 index d78d193fd..000000000 --- a/java/com/android/dialer/voicemail/listui/res/layout/voicemail_tos_fragment.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - -