From 9a090c89e7a0c43a668bd6e2ac5e5e680f323aed Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Thu, 16 Mar 2017 19:22:24 -0700 Subject: Update AOSP Dialer source from internal google3 repository at cl/150392808 Test: Treehugger Notable this release: * Reintroduce localization. This CL updates the AOSP Dialer source with all the changes that have gone into the private google3 repository. This includes all the changes from 3/15/2017 to cl/150392808 (3/16/2017). This goal of these drops is to keep the AOSP source in sync with the internal google3 repository. Currently these sync are done by hand with very minor modifications to the internal source code. See the Android.mk file for list of modifications. Our current goal is to do frequent drops (daily if possible) and eventually switched to an automated process. Change-Id: Ia16d68469c2ca1ff42c7fa31d922bdb78c4e244a --- .../dialer/enrichedcall/FuzzyPhoneNumberMatcher.java | 15 +++++++++++++++ .../dialer/enrichedcall/historyquery/HistoryQuery.java | 15 +++++++++++++++ .../enrichedcall/videoshare/VideoShareListener.java | 15 +++++++++++++++ 3 files changed, 45 insertions(+) (limited to 'java/com/android/dialer/enrichedcall') diff --git a/java/com/android/dialer/enrichedcall/FuzzyPhoneNumberMatcher.java b/java/com/android/dialer/enrichedcall/FuzzyPhoneNumberMatcher.java index f589f94a6..250c64313 100644 --- a/java/com/android/dialer/enrichedcall/FuzzyPhoneNumberMatcher.java +++ b/java/com/android/dialer/enrichedcall/FuzzyPhoneNumberMatcher.java @@ -1,3 +1,18 @@ +/* + * 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. + */ package com.android.dialer.enrichedcall; import android.support.annotation.NonNull; diff --git a/java/com/android/dialer/enrichedcall/historyquery/HistoryQuery.java b/java/com/android/dialer/enrichedcall/historyquery/HistoryQuery.java index b7593cebb..e61c79ec8 100644 --- a/java/com/android/dialer/enrichedcall/historyquery/HistoryQuery.java +++ b/java/com/android/dialer/enrichedcall/historyquery/HistoryQuery.java @@ -1,3 +1,18 @@ +/* + * 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. + */ package com.android.dialer.enrichedcall.historyquery; import android.support.annotation.NonNull; diff --git a/java/com/android/dialer/enrichedcall/videoshare/VideoShareListener.java b/java/com/android/dialer/enrichedcall/videoshare/VideoShareListener.java index bcc387a3f..f24724afd 100644 --- a/java/com/android/dialer/enrichedcall/videoshare/VideoShareListener.java +++ b/java/com/android/dialer/enrichedcall/videoshare/VideoShareListener.java @@ -1,3 +1,18 @@ +/* + * 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. + */ package com.android.dialer.enrichedcall.videoshare; import android.support.annotation.MainThread; -- cgit v1.2.3