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

Merge "Fix accessibility button footer preference did not announced correct by TalkBack" into sc-dev am: bf6af8ac92

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15204641

Change-Id: I85699714907df0027c81542ea89c60a02335fb06
This commit is contained in:
Jason Hsu
2021-07-06 07:17:20 +00:00
committed by Automerger Merge Worker
parent 7066e8a96c bf6af8ac92
commit 336cfe271f
3 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/xml/accessibility_button_settings.xml
View File

@@ -61,6 +61,7 @@
<com.android.settings.accessibility.AccessibilityFooterPreference
android:key="accessibility_button_footer"
android:title="@string/accessibility_button_description"
android:persistent="false"
android:selectable="false"
settings:searchable="false"

17
src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceController.java
View File

@@ -18,6 +18,8 @@ package com.android.settings.accessibility;
import android.content.Context;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
/**
@@ -36,9 +38,16 @@ public class AccessibilityButtonFooterPreferenceController extends
}
@Override
public CharSequence getSummary() {
return AccessibilityUtil.isGestureNavigateEnabled(mContext)
? mContext.getString(R.string.accessibility_button_gesture_description)
: mContext.getString(R.string.accessibility_button_description);
public void displayPreference(PreferenceScreen screen) {
// Need to update footerPreference's data before super.displayPreference(), then it will use
// data to update related property of footerPreference.
if (AccessibilityUtil.isGestureNavigateEnabled(mContext)) {
final AccessibilityFooterPreference footerPreference =
screen.findPreference(getPreferenceKey());
footerPreference.setTitle(
mContext.getString(R.string.accessibility_button_gesture_description));
}
super.displayPreference(screen);
}
}

28
tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceControllerTest.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.accessibility;
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON;
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
import static com.google.common.truth.Truth.assertThat;
@@ -26,6 +25,7 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.res.Resources;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
@@ -34,6 +34,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Spy;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
@@ -50,30 +51,29 @@ public class AccessibilityButtonFooterPreferenceControllerTest {
private final Context mContext = ApplicationProvider.getApplicationContext();
@Spy
private final Resources mResources = mContext.getResources();
@Mock
private PreferenceScreen mScreen;
private AccessibilityButtonFooterPreferenceController mController;
private AccessibilityFooterPreference mPreference;
@Before
public void setUp() {
mController = new AccessibilityButtonFooterPreferenceController(mContext,
"test_key");
mController = new AccessibilityButtonFooterPreferenceController(mContext, "test_key");
mPreference = new AccessibilityFooterPreference(mContext);
mPreference.setKey("test_key");
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
when(mContext.getResources()).thenReturn(mResources);
}
@Test
public void getSummary_navigationGestureEnabled_shouldReturnButtonAndGestureSummary() {
public void displayPreference_navigationGestureEnabled_setCorrectTitle() {
when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
.thenReturn(NAV_BAR_MODE_GESTURAL);
assertThat(mController.getSummary()).isEqualTo(
mController.displayPreference(mScreen);
assertThat(mPreference.getTitle()).isEqualTo(
mContext.getText(R.string.accessibility_button_gesture_description));
}
@Test
public void getSummary_navigationGestureDisabled_shouldReturnButtonSummary() {
when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
.thenReturn(NAV_BAR_MODE_2BUTTON);
assertThat(mController.getSummary()).isEqualTo(
mContext.getText(R.string.accessibility_button_description));
}
}