summaryrefslogtreecommitdiff
path: root/java/com/android/incallui/incall/impl
diff options
context:
space:
mode:
Diffstat (limited to 'java/com/android/incallui/incall/impl')
-rw-r--r--java/com/android/incallui/incall/impl/InCallFragment.java12
-rw-r--r--java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml2
-rw-r--r--java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml2
-rw-r--r--java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml2
4 files changed, 13 insertions, 5 deletions
diff --git a/java/com/android/incallui/incall/impl/InCallFragment.java b/java/com/android/incallui/incall/impl/InCallFragment.java
index ea3ce8efb..b02237dcf 100644
--- a/java/com/android/incallui/incall/impl/InCallFragment.java
+++ b/java/com/android/incallui/incall/impl/InCallFragment.java
@@ -202,6 +202,12 @@ public class InCallFragment extends Fragment
}
@Override
+ public void onPause() {
+ super.onPause();
+ inCallScreenDelegate.onInCallScreenPaused();
+ }
+
+ @Override
public void onDestroy() {
super.onDestroy();
inCallScreenDelegate.onInCallScreenUnready();
@@ -438,8 +444,10 @@ public class InCallFragment extends Fragment
pager.setSwipingLocked(false);
} else {
paginator.setVisibility(View.GONE);
- pager.setSwipingLocked(true);
- pager.setCurrentItem(adapter.getButtonGridPosition());
+ if (adapter != null) {
+ pager.setSwipingLocked(true);
+ pager.setCurrentItem(adapter.getButtonGridPosition());
+ }
}
}
diff --git a/java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml b/java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml
index 93acde1ee..89b72df54 100644
--- a/java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml
@@ -5,7 +5,7 @@
<string name="incall_label_hold" msgid="4223472584896867896">"Hold"</string>
<string name="incall_label_add_call" msgid="5641663436373994915">"Add call"</string>
<string name="incall_label_mute" msgid="2180667027331706737">"Mute"</string>
- <string name="incall_label_dialpad" msgid="8609779533654156550">"Key pad"</string>
+ <string name="incall_label_dialpad" msgid="8609779533654156550">"Keypad"</string>
<string name="incall_label_speaker" msgid="8100402799687856933">"Speaker"</string>
<string name="incall_talkback_speaker_on" msgid="5819463769258124228">", is on"</string>
<string name="incall_talkback_speaker_off" msgid="7486836772563090186">", is off"</string>
diff --git a/java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml b/java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml
index 93acde1ee..89b72df54 100644
--- a/java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml
@@ -5,7 +5,7 @@
<string name="incall_label_hold" msgid="4223472584896867896">"Hold"</string>
<string name="incall_label_add_call" msgid="5641663436373994915">"Add call"</string>
<string name="incall_label_mute" msgid="2180667027331706737">"Mute"</string>
- <string name="incall_label_dialpad" msgid="8609779533654156550">"Key pad"</string>
+ <string name="incall_label_dialpad" msgid="8609779533654156550">"Keypad"</string>
<string name="incall_label_speaker" msgid="8100402799687856933">"Speaker"</string>
<string name="incall_talkback_speaker_on" msgid="5819463769258124228">", is on"</string>
<string name="incall_talkback_speaker_off" msgid="7486836772563090186">", is off"</string>
diff --git a/java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml b/java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml
index 93acde1ee..89b72df54 100644
--- a/java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml
@@ -5,7 +5,7 @@
<string name="incall_label_hold" msgid="4223472584896867896">"Hold"</string>
<string name="incall_label_add_call" msgid="5641663436373994915">"Add call"</string>
<string name="incall_label_mute" msgid="2180667027331706737">"Mute"</string>
- <string name="incall_label_dialpad" msgid="8609779533654156550">"Key pad"</string>
+ <string name="incall_label_dialpad" msgid="8609779533654156550">"Keypad"</string>
<string name="incall_label_speaker" msgid="8100402799687856933">"Speaker"</string>
<string name="incall_talkback_speaker_on" msgid="5819463769258124228">", is on"</string>
<string name="incall_talkback_speaker_off" msgid="7486836772563090186">", is off"</string>