Merge "Fix issue where characters overlap" into oc-dr1-dev
diff --git a/res/layout/emergency_dialer.xml b/res/layout/emergency_dialer.xml
index a7d5fc9..2a45433 100644
--- a/res/layout/emergency_dialer.xml
+++ b/res/layout/emergency_dialer.xml
@@ -95,8 +95,10 @@
android:backgroundTint="#00000000"
style="?android:attr/buttonStyle">
<TextView
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:gravity="center"
+ android:maxLines="1"
android:id="@+id/selected_label"
android:textColor="@android:color/white"
android:textAppearance="?android:attr/textAppearanceButton" />
@@ -104,6 +106,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/launch_hint"
+ android:maxLines="1"
+ android:autoSizeTextType="uniform"
android:text="@string/emergency_action_launch_hint"
android:textColor="@android:color/white"
android:textStyle="italic" />
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 6261946..ae84817 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -314,7 +314,7 @@
<string name="lodgings_disable" msgid="3387879742320682391">"Nyumba zimelemzwa"</string>
<string name="enable_disable_retail_directory" msgid="1357809784475660303">"Saraka ya Rejareja"</string>
<string name="retail_directory_enable" msgid="3280626290436111496">"Saraka ya Rejareja imewezeshwa"</string>
- <string name="retail_directory_disable" msgid="6479739816662879027">"Saraka ya Rejareja imelemazwa"</string>
+ <string name="retail_directory_disable" msgid="6479739816662879027">"Saraka ya Rejareja imezimwa"</string>
<string name="enable_disable_advertisements" msgid="5999495926176182128">"Matangazo"</string>
<string name="advertisements_enable" msgid="2050305021264683786">"Matangazo yamewezeshwa"</string>
<string name="advertisements_disable" msgid="8350985908788707935">"Matangazo yamelemazwa"</string>
@@ -599,8 +599,8 @@
<string name="mobile_data_status_roaming_turned_on_subtext" msgid="1335176927083781041">"Kipengele cha kutumia data kwenye mitandao mingine kimewashwa"</string>
<string name="mobile_data_status_roaming_without_plan_subtext" msgid="3568412513831673037">"Unatumia mtandao mwingine kwa sasa, mpango wa data unahitajika"</string>
<string name="mobile_data_status_roaming_with_plan_subtext" msgid="8721998948811064377">"Unatumia mtandao mwingine kwa sasa, mpango wa data umewashwa"</string>
- <string name="mobile_data_status_no_plan_subtext" msgid="4887747337017565725">"Data ya simu imeisha"</string>
- <string name="mobile_data_activate_prepaid" msgid="7447025165850512683">"Data ya simu imeisha"</string>
+ <string name="mobile_data_status_no_plan_subtext" msgid="4887747337017565725">"Data ya mtandao wa simu imeisha"</string>
+ <string name="mobile_data_activate_prepaid" msgid="7447025165850512683">"Data ya mtandao wa simu imeisha"</string>
<string name="mobile_data_activate_prepaid_summary" msgid="5705389791791637666">"Ongeza data ya simu kupitia <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="mobile_data_activate_roaming_plan" msgid="5998161536947086264">"Hakuna mpango wa kutumia mitandao mingine"</string>
<string name="mobile_data_activate_roaming_plan_summary" msgid="511202908883425459">"Ongeza mpango wa kutumia mitandao mingine kupitia <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 2293c11..cd5f84e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -26,7 +26,7 @@
<string name="payphone" msgid="4793877574636445118">"Таксофон"</string>
<string name="onHold" msgid="9035493194749959955">"Очікує"</string>
<string name="mmiStarted" msgid="6347869857061147003">"Код MMI запущено"</string>
- <string name="ussdRunning" msgid="485588686340541690">"Запуск. код USSD..."</string>
+ <string name="ussdRunning" msgid="485588686340541690">"Виконується запит USSD…"</string>
<string name="mmiCancelled" msgid="2771923949751842276">"Код MMI скасовано"</string>
<string name="cancel" msgid="5044513931633602634">"Скасувати"</string>
<string name="enter_input" msgid="1810529547726803893">"Кількість символів повідомлення USSD має становити від <xliff:g id="MIN_LEN">%d</xliff:g> до <xliff:g id="MAX_LEN">%d</xliff:g>. Повторіть спробу."</string>
diff --git a/src/com/android/phone/EmergencyActionGroup.java b/src/com/android/phone/EmergencyActionGroup.java
index 524462e..54842f3 100644
--- a/src/com/android/phone/EmergencyActionGroup.java
+++ b/src/com/android/phone/EmergencyActionGroup.java
@@ -240,6 +240,9 @@
}
private void revealTheButton(View v) {
+ CharSequence buttonText = ((Button) v).getText();
+ mSelectedLabel.setText(buttonText);
+ mSelectedLabel.setAutoSizeTextTypeWithDefaults(TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM);
mSelectedContainer.setVisibility(VISIBLE);
int centerX = v.getLeft() + v.getWidth() / 2;
int centerY = v.getTop() + v.getHeight() / 2;
@@ -255,7 +258,6 @@
animateHintText(mSelectedLabel, v, reveal);
animateHintText(mLaunchHint, v, reveal);
- mSelectedLabel.setText(((Button) v).getText());
mSelectedContainer.setTag(R.id.tag_intent, v.getTag(R.id.tag_intent));
mLastRevealed = v;
postDelayed(mHideRunnable, HIDE_DELAY);