diff options
author | Eric Erfanian <erfanian@google.com> | 2017-10-24 14:05:52 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-10-24 14:05:52 -0700 |
commit | 938468da6f5c225ebb161a68bd949c9cf3261892 (patch) | |
tree | 232533fa35dc9d140fdfe0dac82b2bd21ad1b5c4 /java/com/android/contacts | |
parent | 958b292fc04ad15879fff47df929d6d1a826615c (diff) | |
download | android_packages_apps_Dialer-938468da6f5c225ebb161a68bd949c9cf3261892.tar.gz android_packages_apps_Dialer-938468da6f5c225ebb161a68bd949c9cf3261892.tar.bz2 android_packages_apps_Dialer-938468da6f5c225ebb161a68bd949c9cf3261892.zip |
Rename the new bubble package name from "bubble" to "newbubble".
It fixes AOSP for package name conflict.
Test: manual
PiperOrigin-RevId: 173298696
Change-Id: Id10ebe0bcf029e61f65cf6580c7198abd8395081
Diffstat (limited to 'java/com/android/contacts')
7 files changed, 33 insertions, 7 deletions
diff --git a/java/com/android/contacts/common/MoreContactUtils.java b/java/com/android/contacts/common/MoreContactUtils.java index 26241b34f..9749cabfd 100644 --- a/java/com/android/contacts/common/MoreContactUtils.java +++ b/java/com/android/contacts/common/MoreContactUtils.java @@ -65,7 +65,7 @@ public class MoreContactUtils { // TODO: Move this to PhoneDataItem.shouldCollapse override private static boolean shouldCollapsePhoneNumbers(String number1, String number2) { - // Work around to address b/20724444. We want to distinguish between #555, *555 and 555. + // Work around to address a bug. We want to distinguish between #555, *555 and 555. // This makes no attempt to distinguish between 555 and 55*5, since 55*5 is an improbable // number. PhoneNumberUtil already distinguishes between 555 and 55#5. if (number1.contains("#") != number2.contains("#") @@ -119,7 +119,7 @@ public class MoreContactUtils { // +14155551212 // 4155551212 // - // From b/7519057, case 2 needs to be equal. But also that bug, case 3 + // From a bug, case 2 needs to be equal. But also that bug, case 3 // below should not be equal. // // case 3) diff --git a/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java b/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java index 172fb11e3..bb0d3c625 100644 --- a/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java +++ b/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java @@ -24,7 +24,7 @@ import java.lang.reflect.Field; public class TelecomManagerCompat { // TODO(mdooley): remove once this is available in android.telecom.Call - // b/33779976 + // a bug public static final String EXTRA_LAST_EMERGENCY_CALLBACK_TIME_MILLIS = "android.telecom.extra.LAST_EMERGENCY_CALLBACK_TIME_MILLIS"; diff --git a/java/com/android/contacts/common/list/AutoScrollListView.java b/java/com/android/contacts/common/list/AutoScrollListView.java index 601abf528..8d6455f7f 100644 --- a/java/com/android/contacts/common/list/AutoScrollListView.java +++ b/java/com/android/contacts/common/list/AutoScrollListView.java @@ -116,7 +116,7 @@ public class AutoScrollListView extends ListView { protected void onLayout(boolean changed, int l, int t, int r, int b) { super.onLayout(changed, l, t, r, b); - // Workaround for b/31160338 and b/32778636. + // Workaround for a bug and a bug. if (android.os.Build.VERSION.SDK_INT == Build.VERSION_CODES.N || android.os.Build.VERSION.SDK_INT == Build.VERSION_CODES.N_MR1) { layoutChildren(); diff --git a/java/com/android/contacts/common/list/ContactEntryListFragment.java b/java/com/android/contacts/common/list/ContactEntryListFragment.java index 94551a8c8..c807ea815 100644 --- a/java/com/android/contacts/common/list/ContactEntryListFragment.java +++ b/java/com/android/contacts/common/list/ContactEntryListFragment.java @@ -825,7 +825,7 @@ public abstract class ContactEntryListFragment<T extends ContactEntryListAdapter @Override public void onResume() { super.onResume(); - // Restore the selection of the list view. See b/19982820. + // Restore the selection of the list view. See a bug. // This has to be done manually because if the list view has its emptyView set, // the scrolling state will be reset when clearPartitions() is called on the adapter. mListView.setSelectionFromTop(mListViewTopIndex, mListViewTopOffset); diff --git a/java/com/android/contacts/common/res/drawable/back_arrow.xml b/java/com/android/contacts/common/res/drawable/back_arrow.xml new file mode 100644 index 000000000..34fa3d7fc --- /dev/null +++ b/java/com/android/contacts/common/res/drawable/back_arrow.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2017 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0" + android:autoMirrored="true" + android:tint="?attr/colorControlNormal"> + <path + android:fillColor="@android:color/white" + android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/> +</vector> diff --git a/java/com/android/contacts/common/res/layout-ldrtl/unread_count_tab.xml b/java/com/android/contacts/common/res/layout-ldrtl/unread_count_tab.xml index 2aa97722d..9e9be95e3 100644 --- a/java/com/android/contacts/common/res/layout-ldrtl/unread_count_tab.xml +++ b/java/com/android/contacts/common/res/layout-ldrtl/unread_count_tab.xml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<!-- layoutDirection set to ltr as a workaround to a framework bug (b/22010411) causing view with +<!-- layoutDirection set to ltr as a workaround to a framework bug (a bug) causing view with layout_centerInParent inside a RelativeLayout to expand to screen width when RTL is active --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/java/com/android/contacts/common/res/layout/search_bar_expanded.xml b/java/com/android/contacts/common/res/layout/search_bar_expanded.xml index f0179ad30..ccea3f76f 100644 --- a/java/com/android/contacts/common/res/layout/search_bar_expanded.xml +++ b/java/com/android/contacts/common/res/layout/search_bar_expanded.xml @@ -28,7 +28,7 @@ android:layout_centerVertical="true" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/action_menu_back_from_search" - android:src="@drawable/quantum_ic_arrow_back_vd_theme_24" + android:src="@drawable/back_arrow" android:tint="@color/contactscommon_actionbar_background_color"/> <EditText |