diff options
| author | Sailesh Nepal <sail@google.com> | 2017-03-16 20:19:43 +0000 |
|---|---|---|
| committer | Sailesh Nepal <sail@google.com> | 2017-03-16 20:19:43 +0000 |
| commit | 2df4538eb90b896be15eebc1d9adf1206131c8a3 (patch) | |
| tree | b54abbb51fb7d66e7755a1fbb5db023ff601090b /java/com/android/dialer/app | |
| parent | 1019500220518fb5fb023fcb7d370ab3cbf12307 (diff) | |
| download | android_packages_apps_Dialer-2df4538eb90b896be15eebc1d9adf1206131c8a3.tar.gz android_packages_apps_Dialer-2df4538eb90b896be15eebc1d9adf1206131c8a3.tar.bz2 android_packages_apps_Dialer-2df4538eb90b896be15eebc1d9adf1206131c8a3.zip | |
Revert "Update dialer to tap green cl 150332012."
This reverts commit 1019500220518fb5fb023fcb7d370ab3cbf12307.
Change-Id: Ie6e4f81a995fca7345132b596521b0bd06ceffb9
Diffstat (limited to 'java/com/android/dialer/app')
| -rw-r--r-- | java/com/android/dialer/app/calllog/PhoneAccountHandles.java | 15 | ||||
| -rw-r--r-- | java/com/android/dialer/app/voicemail/error/VoicemailErrorAlert.java | 2 | ||||
| -rw-r--r-- | java/com/android/dialer/app/voicemail/error/res/layout/voicemai_error_message_fragment.xml (renamed from java/com/android/dialer/app/voicemail/error/res/layout/voicemail_error_message_fragment.xml) | 0 |
3 files changed, 1 insertions, 16 deletions
diff --git a/java/com/android/dialer/app/calllog/PhoneAccountHandles.java b/java/com/android/dialer/app/calllog/PhoneAccountHandles.java index b0fa1ed45..6d51b853c 100644 --- a/java/com/android/dialer/app/calllog/PhoneAccountHandles.java +++ b/java/com/android/dialer/app/calllog/PhoneAccountHandles.java @@ -1,18 +1,3 @@ -/* - * 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.app.calllog; import android.content.ComponentName; diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailErrorAlert.java b/java/com/android/dialer/app/voicemail/error/VoicemailErrorAlert.java index 628ef87eb..d34a0f3c7 100644 --- a/java/com/android/dialer/app/voicemail/error/VoicemailErrorAlert.java +++ b/java/com/android/dialer/app/voicemail/error/VoicemailErrorAlert.java @@ -56,7 +56,7 @@ public class VoicemailErrorAlert { this.modalAlertManager = modalAlertManager; this.messageCreator = messageCreator; - view = alertManager.inflate(R.layout.voicemail_error_message_fragment); + view = alertManager.inflate(R.layout.voicemai_error_message_fragment); header = (TextView) view.findViewById(R.id.error_card_header); details = (TextView) view.findViewById(R.id.error_card_details); primaryAction = (TextView) view.findViewById(R.id.primary_action); diff --git a/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_error_message_fragment.xml b/java/com/android/dialer/app/voicemail/error/res/layout/voicemai_error_message_fragment.xml index 4a40857a0..4a40857a0 100644 --- a/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_error_message_fragment.xml +++ b/java/com/android/dialer/app/voicemail/error/res/layout/voicemai_error_message_fragment.xml |