diff options
Diffstat (limited to 'java')
23 files changed, 45 insertions, 120 deletions
diff --git a/java/com/android/contacts/common/model/dataitem/ImDataItem.java b/java/com/android/contacts/common/model/dataitem/ImDataItem.java index 16b9fd094..b9902551b 100644 --- a/java/com/android/contacts/common/model/dataitem/ImDataItem.java +++ b/java/com/android/contacts/common/model/dataitem/ImDataItem.java @@ -22,6 +22,8 @@ import android.provider.ContactsContract.CommonDataKinds.Email; import android.provider.ContactsContract.CommonDataKinds.Im; import android.text.TextUtils; +import java.util.Objects; + /** * Represents an IM data item, wrapping the columns in {@link ContactsContract.CommonDataKinds.Im}. */ @@ -97,7 +99,7 @@ public class ImDataItem extends DataItem { return that.getProtocol() == Im.PROTOCOL_CUSTOM; } return true; - } else if (getProtocol() != that.getProtocol()) { + } else if (!Objects.equals(getProtocol(), that.getProtocol())) { return false; } else if (getProtocol() == Im.PROTOCOL_CUSTOM && !TextUtils.equals(getCustomProtocol(), that.getCustomProtocol())) { diff --git a/java/com/android/contacts/common/util/DateUtils.java b/java/com/android/contacts/common/util/DateUtils.java index 09d52bce8..d5147eb9b 100644 --- a/java/com/android/contacts/common/util/DateUtils.java +++ b/java/com/android/contacts/common/util/DateUtils.java @@ -16,7 +16,11 @@ package com.android.contacts.common.util; -import android.text.format.Time; +import java.time.Instant; +import java.time.LocalDate; +import java.time.ZoneId; +import java.time.temporal.ChronoUnit; + /** Utility methods for processing dates. */ public class DateUtils { @@ -30,13 +34,9 @@ public class DateUtils { * @param date2 Second date to check. * @return The absolute difference in days between the two dates. */ - public static int getDayDifference(Time time, long date1, long date2) { - time.set(date1); - int startDay = Time.getJulianDay(date1, time.gmtoff); - - time.set(date2); - int currentDay = Time.getJulianDay(date2, time.gmtoff); - - return Math.abs(currentDay - startDay); + public static int getDayDifference(ZoneId timeZone, long date1, long date2) { + LocalDate localDate1 = Instant.ofEpochMilli(date1).atZone(timeZone).toLocalDate(); + LocalDate localDate2 = Instant.ofEpochMilli(date2).atZone(timeZone).toLocalDate(); + return Math.abs((int) ChronoUnit.DAYS.between(localDate2, localDate1)); } } diff --git a/java/com/android/dialer/app/calllog/CallLogGroupBuilder.java b/java/com/android/dialer/app/calllog/CallLogGroupBuilder.java index e52591174..805ee64c5 100644 --- a/java/com/android/dialer/app/calllog/CallLogGroupBuilder.java +++ b/java/com/android/dialer/app/calllog/CallLogGroupBuilder.java @@ -23,7 +23,6 @@ import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.telephony.PhoneNumberUtils; import android.text.TextUtils; -import android.text.format.Time; import com.android.contacts.common.util.DateUtils; import com.android.dialer.calllogutils.CallbackActionHelper; import com.android.dialer.calllogutils.CallbackActionHelper.CallbackAction; @@ -31,6 +30,8 @@ import com.android.dialer.compat.telephony.TelephonyManagerCompat; import com.android.dialer.inject.ApplicationContext; import com.android.dialer.phonenumbercache.CallLogQuery; import com.android.dialer.phonenumberutil.PhoneNumberHelper; + +import java.time.ZoneId; import java.util.Objects; /** @@ -56,7 +57,7 @@ public class CallLogGroupBuilder { /** Day grouping for calls which occurred before last week. */ public static final int DAY_GROUP_OTHER = 2; /** Instance of the time object used for time calculations. */ - private static final Time TIME = new Time(); + private static final ZoneId TIME_ZONE = ZoneId.systemDefault(); private final Context appContext; /** The object on which the groups are created. */ @@ -255,7 +256,7 @@ public class CallLogGroupBuilder { * @return The date group the call belongs in. */ private int getDayGroup(long date, long now) { - int days = DateUtils.getDayDifference(TIME, date, now); + int days = DateUtils.getDayDifference(TIME_ZONE, date, now); if (days == 0) { return DAY_GROUP_TODAY; diff --git a/java/com/android/dialer/app/calllog/MissedCallNotifier.java b/java/com/android/dialer/app/calllog/MissedCallNotifier.java index f2d2af834..64536c8b0 100644 --- a/java/com/android/dialer/app/calllog/MissedCallNotifier.java +++ b/java/com/android/dialer/app/calllog/MissedCallNotifier.java @@ -17,6 +17,7 @@ package com.android.dialer.app.calllog; import static com.android.dialer.app.DevicePolicyResources.NOTIFICATION_MISSED_WORK_CALL_TITLE; +import android.app.BroadcastOptions; import android.app.Notification; import android.app.Notification.Builder; import android.app.PendingIntent; @@ -27,6 +28,7 @@ import android.content.Intent; import android.graphics.Bitmap; import android.graphics.drawable.Icon; import android.net.Uri; +import android.os.Bundle; import android.provider.CallLog.Calls; import android.service.notification.StatusBarNotification; import android.support.annotation.NonNull; @@ -44,6 +46,7 @@ import android.text.BidiFormatter; import android.text.TextDirectionHeuristics; import android.text.TextUtils; import android.util.ArraySet; + import com.android.contacts.common.ContactsUtils; import com.android.dialer.app.MainComponent; import com.android.dialer.app.R; @@ -68,6 +71,7 @@ import com.android.dialer.precall.PreCall; import com.android.dialer.theme.base.ThemeComponent; import com.android.dialer.util.DialerUtils; import com.android.dialer.util.IntentUtil; + import java.util.Iterator; import java.util.List; import java.util.Set; @@ -500,6 +504,12 @@ public class MissedCallNotifier implements Worker<Pair<Integer, String>, Void> { /** Closes open system dialogs and the notification shade. */ private void closeSystemDialogs(Context context) { - context.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)); + final Intent intent = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS) + .addFlags(Intent.FLAG_RECEIVER_FOREGROUND); + final Bundle options = BroadcastOptions.makeBasic() + .setDeliveryGroupPolicy(BroadcastOptions.DELIVERY_GROUP_POLICY_MOST_RECENT) + .setDeferralPolicy(BroadcastOptions.DEFERRAL_POLICY_UNTIL_ACTIVE) + .toBundle(); + context.sendBroadcast(intent, null /* receiverPermission */, options); } } diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_not_interested_googblue_24dp.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_not_interested_googblue_24dp.png Binary files differdeleted file mode 100644 index 393a0c882..000000000 --- a/java/com/android/dialer/app/res/drawable-hdpi/ic_not_interested_googblue_24dp.png +++ /dev/null diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_not_interested_googblue_24dp.png b/java/com/android/dialer/app/res/drawable-mdpi/ic_not_interested_googblue_24dp.png Binary files differdeleted file mode 100644 index d7d5c588f..000000000 --- a/java/com/android/dialer/app/res/drawable-mdpi/ic_not_interested_googblue_24dp.png +++ /dev/null diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_not_interested_googblue_24dp.png b/java/com/android/dialer/app/res/drawable-xhdpi/ic_not_interested_googblue_24dp.png Binary files differdeleted file mode 100644 index 3e6ec071b..000000000 --- a/java/com/android/dialer/app/res/drawable-xhdpi/ic_not_interested_googblue_24dp.png +++ /dev/null diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_not_interested_googblue_24dp.png b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_not_interested_googblue_24dp.png Binary files differdeleted file mode 100644 index 7c256b5d7..000000000 --- a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_not_interested_googblue_24dp.png +++ /dev/null diff --git a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_not_interested_googblue_24dp.png b/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_not_interested_googblue_24dp.png Binary files differdeleted file mode 100644 index 6591ed485..000000000 --- a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_not_interested_googblue_24dp.png +++ /dev/null diff --git a/java/com/android/dialer/callintent/CallIntent.java b/java/com/android/dialer/callintent/CallIntent.java index ef7aff672..183eb16e7 100644 --- a/java/com/android/dialer/callintent/CallIntent.java +++ b/java/com/android/dialer/callintent/CallIntent.java @@ -152,8 +152,7 @@ public abstract class CallIntent implements Parcelable { .setTimeSinceFirstClick(PerformanceReport.getTimeSinceFirstClick()) .addAllUiActionsSinceAppLaunch(PerformanceReport.getActions()) .addAllUiActionTimestampsSinceAppLaunch(PerformanceReport.getActionTimestamps()) - .setStartingTabIndex(PerformanceReport.getStartingTabIndex()) - .build(); + .setStartingTabIndex(PerformanceReport.getStartingTabIndex()); PerformanceReport.stopRecording(); } diff --git a/java/com/android/dialer/callintent/CallIntentBuilder.java b/java/com/android/dialer/callintent/CallIntentBuilder.java index 7cc589123..b7f7d76a9 100644 --- a/java/com/android/dialer/callintent/CallIntentBuilder.java +++ b/java/com/android/dialer/callintent/CallIntentBuilder.java @@ -77,8 +77,7 @@ public class CallIntentBuilder implements Parcelable { .setTimeSinceFirstClick(PerformanceReport.getTimeSinceFirstClick()) .addAllUiActionsSinceAppLaunch(PerformanceReport.getActions()) .addAllUiActionTimestampsSinceAppLaunch(PerformanceReport.getActionTimestamps()) - .setStartingTabIndex(PerformanceReport.getStartingTabIndex()) - .build(); + .setStartingTabIndex(PerformanceReport.getStartingTabIndex()); PerformanceReport.stopRecording(); } diff --git a/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_scroll_handle.png b/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_scroll_handle.png Binary files differdeleted file mode 100644 index 0724e2afc..000000000 --- a/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_scroll_handle.png +++ /dev/null diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_scroll_handle.png b/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_scroll_handle.png Binary files differdeleted file mode 100644 index e0adfbb4f..000000000 --- a/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_scroll_handle.png +++ /dev/null diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_scroll_handle.png b/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_scroll_handle.png Binary files differdeleted file mode 100644 index 37e041cc6..000000000 --- a/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_scroll_handle.png +++ /dev/null diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_scroll_handle.png b/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_scroll_handle.png Binary files differdeleted file mode 100644 index d725ce159..000000000 --- a/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_scroll_handle.png +++ /dev/null diff --git a/java/com/android/dialer/contacts/resources/res/drawable/fastscroll_thumb.xml b/java/com/android/dialer/contacts/resources/res/drawable/fastscroll_thumb.xml deleted file mode 100644 index 67645ff91..000000000 --- a/java/com/android/dialer/contacts/resources/res/drawable/fastscroll_thumb.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 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. ---> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/ic_scroll_handle_pressed" android:state_pressed="true"/> - <item android:drawable="@drawable/ic_scroll_handle_default"/> -</selector>
\ No newline at end of file diff --git a/java/com/android/dialer/contacts/resources/res/drawable/ic_scroll_handle_default.xml b/java/com/android/dialer/contacts/resources/res/drawable/ic_scroll_handle_default.xml deleted file mode 100644 index 9164ab1ab..000000000 --- a/java/com/android/dialer/contacts/resources/res/drawable/ic_scroll_handle_default.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 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. ---> - -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_scroll_handle" - android:tint="?colorIcon"/> diff --git a/java/com/android/dialer/contacts/resources/res/drawable/ic_scroll_handle_pressed.xml b/java/com/android/dialer/contacts/resources/res/drawable/ic_scroll_handle_pressed.xml deleted file mode 100644 index c9b93d925..000000000 --- a/java/com/android/dialer/contacts/resources/res/drawable/ic_scroll_handle_pressed.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 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. ---> - -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_scroll_handle" - android:tint="?android:attr/colorPrimary"/>
\ No newline at end of file diff --git a/java/com/android/dialer/voicemail/settings/res/drawable-xhdpi/ic_arrow_back_grey600_48dp.png b/java/com/android/dialer/voicemail/settings/res/drawable-xhdpi/ic_arrow_back_grey600_48dp.png Binary files differdeleted file mode 100644 index 0a379b484..000000000 --- a/java/com/android/dialer/voicemail/settings/res/drawable-xhdpi/ic_arrow_back_grey600_48dp.png +++ /dev/null diff --git a/java/com/android/dialer/voicemail/settings/res/drawable-xhdpi/ic_stop_circle_filled_blue_24dp.png b/java/com/android/dialer/voicemail/settings/res/drawable-xhdpi/ic_stop_circle_filled_blue_24dp.png Binary files differdeleted file mode 100644 index 520f860fa..000000000 --- a/java/com/android/dialer/voicemail/settings/res/drawable-xhdpi/ic_stop_circle_filled_blue_24dp.png +++ /dev/null diff --git a/java/com/android/incallui/NotificationBroadcastReceiver.java b/java/com/android/incallui/NotificationBroadcastReceiver.java index 241d8ed48..91421ea1b 100644 --- a/java/com/android/incallui/NotificationBroadcastReceiver.java +++ b/java/com/android/incallui/NotificationBroadcastReceiver.java @@ -16,14 +16,17 @@ package com.android.incallui; +import android.app.BroadcastOptions; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.os.Build.VERSION_CODES; +import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.RequiresApi; import android.telecom.CallAudioState; import android.telecom.VideoProfile; + import com.android.dialer.common.LogUtil; import com.android.dialer.common.concurrent.DialerExecutorComponent; import com.android.dialer.logging.DialerImpression; @@ -32,6 +35,7 @@ import com.android.incallui.call.CallList; import com.android.incallui.call.DialerCall; import com.android.incallui.call.TelecomAdapter; import com.android.incallui.speakeasy.SpeakEasyCallManager; + import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -97,7 +101,7 @@ public class NotificationBroadcastReceiver extends BroadcastReceiver { } else if (action.equals(ACTION_DECLINE_VIDEO_UPGRADE_REQUEST)) { declineUpgradeRequest(); } else if (action.equals(ACTION_PULL_EXTERNAL_CALL)) { - context.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)); + closeSystemDialogs(context); int notificationId = intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1); InCallPresenter.getInstance().getExternalCallNotifier().pullExternalCall(notificationId); } else if (action.equals(ACTION_TURN_ON_SPEAKER)) { @@ -220,4 +224,15 @@ public class NotificationBroadcastReceiver extends BroadcastReceiver { } } } + + /** Closes open system dialogs and the notification shade. */ + private void closeSystemDialogs(Context context) { + final Intent intent = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS) + .addFlags(Intent.FLAG_RECEIVER_FOREGROUND); + final Bundle options = BroadcastOptions.makeBasic() + .setDeliveryGroupPolicy(BroadcastOptions.DELIVERY_GROUP_POLICY_MOST_RECENT) + .setDeferralPolicy(BroadcastOptions.DEFERRAL_POLICY_UNTIL_ACTIVE) + .toBundle(); + context.sendBroadcast(intent, null /* receiverPermission */, options); + } } diff --git a/java/com/android/incallui/calllocation/impl/res/drawable/bg_location_card.xml b/java/com/android/incallui/calllocation/impl/res/drawable/bg_location_card.xml deleted file mode 100644 index 0bcba95f2..000000000 --- a/java/com/android/incallui/calllocation/impl/res/drawable/bg_location_card.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?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 - --> - -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="@color/ripple_material_light"> - <item android:drawable="@android:color/white"/> -</ripple> diff --git a/java/com/android/incallui/rtt/impl/res/drawable/incallui_message_bubble.xml b/java/com/android/incallui/rtt/impl/res/drawable/incallui_message_bubble.xml deleted file mode 100644 index 31044b64e..000000000 --- a/java/com/android/incallui/rtt/impl/res/drawable/incallui_message_bubble.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ 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" - android:shape="rectangle"> - <solid android:color="?android:attr/colorBackgroundFloating"/> - <corners android:radius="20dp"/> -</shape>
\ No newline at end of file |
