diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-04 23:07:08 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-04 23:07:08 +0000 |
| commit | ded94173df12ad8affcb3dba1a36857139bca6f7 (patch) | |
| tree | 5a533268bf4068f1e8e13988a64ac23324430bcf | |
| parent | 9cfb6bb7cc16168591b192337d4a8658e4549581 (diff) | |
| parent | b297778131df065c9fac7bab768f2d886da430e1 (diff) | |
| download | EmergencyInfo-ded94173df12ad8affcb3dba1a36857139bca6f7.tar.gz | |
Snap for 5533229 from b297778131df065c9fac7bab768f2d886da430e1 to qt-release
Change-Id: Ieb5d610c3ccce5f11eaba4064585d6fbb66d1282
| -rw-r--r-- | src/com/android/emergency/EmergencySearchIndexablesProvider.java | 4 | ||||
| -rw-r--r-- | src/com/android/emergency/preferences/EmergencyListPreference.java | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/emergency/EmergencySearchIndexablesProvider.java b/src/com/android/emergency/EmergencySearchIndexablesProvider.java index 92dfb8dd..ea2db432 100644 --- a/src/com/android/emergency/EmergencySearchIndexablesProvider.java +++ b/src/com/android/emergency/EmergencySearchIndexablesProvider.java @@ -21,7 +21,6 @@ import android.database.MatrixCursor; import android.provider.SearchIndexablesContract.XmlResource; import android.provider.SearchIndexableResource; import android.provider.SearchIndexablesProvider; -import android.util.FeatureFlagUtils; import com.android.emergency.edit.EditInfoActivity; import com.android.emergency.edit.EditMedicalInfoActivity; @@ -51,8 +50,7 @@ public class EmergencySearchIndexablesProvider extends SearchIndexablesProvider @Override public Cursor queryXmlResources(String[] projection) { - if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SAFETY_HUB) - && getContext().getResources().getBoolean(R.bool.config_search_index_disabled)) { + if (getContext().getResources().getBoolean(R.bool.config_search_index_disabled)) { return null; } diff --git a/src/com/android/emergency/preferences/EmergencyListPreference.java b/src/com/android/emergency/preferences/EmergencyListPreference.java index b20a66e1..5815c9f6 100644 --- a/src/com/android/emergency/preferences/EmergencyListPreference.java +++ b/src/com/android/emergency/preferences/EmergencyListPreference.java @@ -91,7 +91,7 @@ public class EmergencyListPreference extends ListPreference SpannableString str = new SpannableString(displayText); str.setSpan(new TtsSpan.TextBuilder((String) accessibleText).build(), 0, displayText.length(), - Spannable.SPAN_INCLUSIVE_INCLUSIVE); + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); return str; } } |