diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-03-16 11:07:39 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-03-16 11:12:53 -0700 |
| commit | 1019500220518fb5fb023fcb7d370ab3cbf12307 (patch) | |
| tree | f638cd81db6951acb34f20caf68d1e5d26191adb /java/com/android/dialer/app | |
| parent | d5e47f6da5b08b13ecdfa7f1edc7e12aeb83fab9 (diff) | |
Update dialer to tap green cl 150332012.
Test: Treehugger
Change-Id: If2baab1d3fc2dee602a4f784bba532182e7174f5
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/voicemail_error_message_fragment.xml (renamed from java/com/android/dialer/app/voicemail/error/res/layout/voicemai_error_message_fragment.xml) | 0 |
3 files changed, 16 insertions, 1 deletions
diff --git a/java/com/android/dialer/app/calllog/PhoneAccountHandles.java b/java/com/android/dialer/app/calllog/PhoneAccountHandles.java index 6d51b853c..b0fa1ed45 100644 --- a/java/com/android/dialer/app/calllog/PhoneAccountHandles.java +++ b/java/com/android/dialer/app/calllog/PhoneAccountHandles.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.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 d34a0f3c7..628ef87eb 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.voicemai_error_message_fragment); + view = alertManager.inflate(R.layout.voicemail_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/voicemai_error_message_fragment.xml b/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_error_message_fragment.xml index 4a40857a0..4a40857a0 100644 --- a/java/com/android/dialer/app/voicemail/error/res/layout/voicemai_error_message_fragment.xml +++ b/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_error_message_fragment.xml |