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

Fix scanning settings link clickability in Talkback mode.

Browse Source 
Bug: b/37431709
Test: make RunSettingsRoboTests
Change-Id: I0dc0a524a3c4abd1743748ebc8ebf20937018047
This commit is contained in:
Sundeep Ghuman
2017-04-18 17:16:00 -07:00
parent d2561263a8
commit b3b0250be8
2 changed files with 77 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/LinkablePreference.java
View File

@@ -21,6 +21,7 @@ import android.support.annotation.Nullable;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import android.text.Spannable;
import android.text.method.LinkMovementMethod;
import android.text.style.TextAppearanceSpan;
import android.util.AttributeSet;
import android.widget.TextView;
@@ -81,6 +82,7 @@ public class LinkablePreference extends Preference {
mContentTitle.length(),
Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
textView.setText(boldSpan);
textView.setMovementMethod(new LinkMovementMethod());
}
}

75
tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java Normal file
View File

@@ -0,0 +1,75 @@
/*
* 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.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.support.v7.preference.PreferenceViewHolder;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.android.settings.LinkifyUtils;
import com.android.settings.R;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LinkablePreferenceTest {
private static final String TITLE = "Title";
private Context mContext = RuntimeEnvironment.application;
private LinkablePreference mPreference;
private PreferenceViewHolder mHolder;
private View mView;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mPreference = new LinkablePreference(mContext);
final CharSequence linkableDescription =
mContext.getResources().getText(R.string.wifi_scan_notify_text);
final LinkifyUtils.OnClickListener clickListener = () -> {/* Do nothing */ };
mPreference.setText(TITLE, linkableDescription, clickListener);
LayoutInflater inflater = LayoutInflater.from(mContext);
mView = inflater.inflate(
mPreference.getLayoutResource(), new LinearLayout(mContext), false);
mHolder = PreferenceViewHolder.createInstanceForTests(mView);
mPreference.onBindViewHolder(mHolder);
}
@Test
public void prefWithLinkShouldHaveAccessibilityMovementMethodSet() {
TextView textView = mView.findViewById(android.R.id.title);
assertThat(textView.getMovementMethod()).isNotNull();
}
}