Merge "Remove unused method tryGetWifiInfoForVcn" into main
diff --git a/Settings/res/layout/guided_step_input_action.xml b/Settings/res/layout/guided_step_input_action.xml
index 5ef50c7..084c6b6 100644
--- a/Settings/res/layout/guided_step_input_action.xml
+++ b/Settings/res/layout/guided_step_input_action.xml
@@ -27,7 +27,7 @@
android:paddingEnd="@dimen/guided_action_start_end_padding"
android:paddingStart="@dimen/guided_action_start_end_padding">
- <EditText
+ <com.android.tv.settings.connectivity.util.SettingsGuidedActionEditText
android:id="@+id/guidedactions_item_title"
style="@style/Setup.Action.TextInput"
android:layout_width="match_parent"
@@ -36,5 +36,5 @@
android:gravity="center_vertical"
android:imeOptions="actionDone|flagNoExtractUi"
android:inputType="text">
- </EditText>
+ </com.android.tv.settings.connectivity.util.SettingsGuidedActionEditText>
</FrameLayout>
diff --git a/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceProvider.java b/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceProvider.java
index 60ce6cc..97c26bd 100644
--- a/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceProvider.java
+++ b/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceProvider.java
@@ -178,9 +178,6 @@
if (DEBUG) {
Log.d(TAG, "onBindSlice: " + sliceUri);
}
- if (getBluetoothDevices().isEmpty()) {
- sliceUri = ConnectedDevicesSliceUtils.GENERAL_SLICE_URI;
- }
StrictMode.ThreadPolicy oldPolicy = StrictMode.getThreadPolicy();
try {
// Prevent StrictMode from throwing on access to shared preferences.
diff --git a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java
index 0ecf6c5..2d50633 100644
--- a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java
+++ b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/TwoPanelSettingsFragment.java
@@ -271,9 +271,10 @@
}
} else {
// If there is no corresponding slice provider, thus the corresponding fragment is not
- // created, return false to check the intent of the SlicePreference.
+ // created, return true so it won't be handled by onPreferenceTreeClick in
+ // PreferenceFragment, but instead onPreferenceFocused will handle it.
if (pref instanceof SlicePreference) {
- return false;
+ return true;
}
try {
Fragment fragment = Fragment.instantiate(getActivity(), pref.getFragment(),
