PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Wi-Fi] EAP method AKA' did not pronounced as AKA prime.

Browse Source 
Spinner did not use ttsspan to store the display string so AKA' just
pronounced as AKA.

To fix it, use charsequence array, which each specific array item have
the ttsSpan to store the string for TTS engine.

Bug: 119929832
Test: Set a 3-texts array and check if the specific array item
replacement mechanism work correctly or not.

Change-Id: I8e7d10da99a3f3503e1019687c45cf40070d0045
This commit is contained in:
govenliu
2019-07-10 17:29:16 +08:00
parent 2fbcb76a31
commit 41cdecca3d
4 changed files with 131 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/wifi_dialog.xml
View File

@@ -138,8 +138,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item_spinner"
android:prompt="@string/wifi_eap_method"
android:entries="@array/wifi_eap_method" />
android:prompt="@string/wifi_eap_method" />
</LinearLayout>
<LinearLayout android:id="@+id/l_phase2"

12
res/values/arrays.xml
View File

@@ -238,6 +238,18 @@
<item>AKA\'</item>
</string-array>
<!-- Target EAP methods that will have different TTS strings -->
<!-- Note that this array length should be same as the wifi_eap_method_tts_strings-->
<string-array name="wifi_eap_method_target_strings" translatable="false">
<item>AKA\'</item>
</string-array>
<!-- TTS strings for the target EAP methods -->
<!-- Note that this array length should be same as the wifi_eap_method_target_strings-->
<string-array name="wifi_eap_method_tts_strings" translatable="false">
<item>AKA prime</item>
</string-array>
<!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
<string-array name="eap_method_without_sim_auth" translatable="false">
<item>PEAP</item>

86
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -40,6 +40,7 @@ import android.security.Credentials;
import android.security.KeyStore;
import android.text.Editable;
import android.text.InputType;
import android.text.SpannableString;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.util.Log;
@@ -122,9 +123,9 @@ public class WifiConfigController implements TextWatcher,
/* Phase2 methods supported by PEAP are limited */
private ArrayAdapter<String> mPhase2PeapAdapter;
private ArrayAdapter<CharSequence> mPhase2PeapAdapter;
/* Full list of phase2 methods */
private ArrayAdapter<String> mPhase2FullAdapter;
private ArrayAdapter<CharSequence> mPhase2FullAdapter;
// e.g. AccessPoint.SECURITY_NONE
@VisibleForTesting
@@ -145,7 +146,7 @@ public class WifiConfigController implements TextWatcher,
private TextView mEapDomainView;
private Spinner mPhase2Spinner;
// Associated with mPhase2Spinner, one of mPhase2FullAdapter or mPhase2PeapAdapter
private ArrayAdapter<String> mPhase2Adapter;
private ArrayAdapter<CharSequence> mPhase2Adapter;
private Spinner mEapUserCertSpinner;
private TextView mEapIdentityView;
private TextView mEapAnonymousView;
@@ -218,17 +219,16 @@ public class WifiConfigController implements TextWatcher,
mLevels = res.getStringArray(R.array.wifi_signal);
if (Utils.isWifiOnly(mContext) || !mContext.getResources().getBoolean(
com.android.internal.R.bool.config_eap_sim_based_auth_supported)) {
mPhase2PeapAdapter = new ArrayAdapter<String>(
mPhase2PeapAdapter = new ArrayAdapter<CharSequence>(
mContext, android.R.layout.simple_spinner_item,
res.getStringArray(R.array.wifi_peap_phase2_entries));
} else {
mPhase2PeapAdapter = new ArrayAdapter<String>(
mContext, android.R.layout.simple_spinner_item,
res.getStringArray(R.array.wifi_peap_phase2_entries_with_sim_auth));
mPhase2PeapAdapter = getSpinnerArrayWithEapMethodsTts(
R.array.wifi_peap_phase2_entries_with_sim_auth);
}
mPhase2PeapAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
mPhase2FullAdapter = new ArrayAdapter<String>(
mPhase2FullAdapter = new ArrayAdapter<CharSequence>(
mContext, android.R.layout.simple_spinner_item,
res.getStringArray(R.array.wifi_phase2_entries));
mPhase2FullAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
@@ -991,6 +991,12 @@ public class WifiConfigController implements TextWatcher,
spinnerAdapter.setDropDownViewResource(
android.R.layout.simple_spinner_dropdown_item);
mEapMethodSpinner.setAdapter(spinnerAdapter);
} else {
final ArrayAdapter<CharSequence> wifispinnerAdapter =
getSpinnerArrayWithEapMethodsTts(R.array.wifi_eap_method);
wifispinnerAdapter.setDropDownViewResource(
android.R.layout.simple_spinner_dropdown_item);
mEapMethodSpinner.setAdapter(wifispinnerAdapter);
}
mPhase2Spinner = (Spinner) mView.findViewById(R.id.phase2);
mPhase2Spinner.setOnItemSelectedListener(this);
@@ -1579,4 +1585,68 @@ public class WifiConfigController implements TextWatcher,
((CheckBox) mView.findViewById(R.id.wifi_advanced_togglebox))
.setOnCheckedChangeListener(this);
}
/**
* For each target string in {@code targetStringArray} try to find if it appears in {@code
* originalStringArray}, if found then use the corresponding string, which have the same index
* of the target string in {@code replacementStringArray}, to replace it. And finally return the
* whole new string array back to caller.
*/
@VisibleForTesting
CharSequence[] findAndReplaceTargetStrings(CharSequence originalStringArray[],
CharSequence targetStringArray[], CharSequence replacementStringArray[]) {
// The length of the targetStringArray and replacementStringArray should be the same, each
// item in the targetStringArray should have a 1:1 mapping to replacementStringArray, so
// just return the original string if the lengths are different.
if (targetStringArray.length != replacementStringArray.length) {
return originalStringArray;
}
final CharSequence[] returnEntries = new CharSequence[originalStringArray.length];
for (int i = 0; i < originalStringArray.length; i++) {
returnEntries[i] = originalStringArray[i];
for (int j = 0; j < targetStringArray.length; j++) {
if (TextUtils.equals(originalStringArray[i], targetStringArray[j])) {
returnEntries[i] = replacementStringArray[j];
}
}
}
return returnEntries;
}
/**
* This function is to span the TTS strings to each EAP method items in the
* spinner to have detail TTS content for the TTS engine usage.
*/
private ArrayAdapter<CharSequence> getSpinnerArrayWithEapMethodsTts(int resid) {
final Resources res = mContext.getResources();
CharSequence[] sourceStrings = res.getStringArray(
resid);
CharSequence[] targetStrings = res.getStringArray(
R.array.wifi_eap_method_target_strings);
CharSequence[] ttsStrings = res.getStringArray(
R.array.wifi_eap_method_tts_strings);
// Replace the target strings with tts strings and save all in a new array.
final CharSequence[] newTtsSourceStrings = findAndReplaceTargetStrings(
sourceStrings, targetStrings, ttsStrings);
// Build new ttsspan text arrays for talkback.
final CharSequence[] accessibilityArray = createAccessibleEntries(
sourceStrings, newTtsSourceStrings);
// Return a new ArrayAdapter with the new talkback array.
return new ArrayAdapter<CharSequence>(
mContext, android.R.layout.simple_spinner_item, accessibilityArray);
}
private SpannableString[] createAccessibleEntries(CharSequence entries[],
CharSequence[] contentDescriptions) {
final SpannableString[] accessibleEntries = new SpannableString[entries.length];
for (int i = 0; i < entries.length; i++) {
accessibleEntries[i] = com.android.settings.Utils.createAccessibleSequence(entries[i],
contentDescriptions[i].toString());
}
return accessibleEntries;
}
}

40
tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
View File

@@ -27,6 +27,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.res.Resources;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.os.ServiceSpecificException;
@@ -445,4 +446,43 @@ public class WifiConfigControllerTest {
WifiConfiguration config = mController.getConfig();
assertThat(config.macRandomizationSetting).isEqualTo(WifiConfiguration.RANDOMIZATION_NONE);
}
@Test
public void replaceTtsString_whenTargetMatched_shouldSuccess() {
final CharSequence[] display = {"PEAP", "AKA1", "AKA2'"};
final CharSequence[] target = {"AKA1", "AKA2'"};
final CharSequence[] ttsString = {"AKA1_TTS", "AKA2_TTS"};
final CharSequence[] resultTts = mController.findAndReplaceTargetStrings(display, target,
ttsString);
assertThat(resultTts[0]).isEqualTo("PEAP");
assertThat(resultTts[1]).isEqualTo("AKA1_TTS");
assertThat(resultTts[2]).isEqualTo("AKA2_TTS");
}
@Test
public void replaceTtsString_whenNoTargetStringMatched_originalStringShouldNotChanged() {
final CharSequence[] display = {"PEAP", "AKA1", "AKA2"};
final CharSequence[] target = {"WEP1", "WEP2'"};
final CharSequence[] ttsString = {"WEP1_TTS", "WEP2_TTS"};
final CharSequence[] resultTts = mController.findAndReplaceTargetStrings(display, target,
ttsString);
assertThat(resultTts[0]).isEqualTo("PEAP");
assertThat(resultTts[1]).isEqualTo("AKA1");
assertThat(resultTts[2]).isEqualTo("AKA2");
}
@Test
public void checktEapMethodTargetAndTtsArraylength_shouldHaveSameCount() {
final Resources resources = mContext.getResources();
final String[] targetStringArray = resources.getStringArray(
R.array.wifi_eap_method_target_strings);
final String[] ttsStringArray = resources.getStringArray(
R.array.wifi_eap_method_tts_strings);
assertThat(targetStringArray.length).isEqualTo(ttsStringArray.length);
}
}