Snap for 7682397 from 029b6397a8
to sc-qpr1-release
Change-Id: Ife817f7714594de3438c864cdf79d58bd92e2761
This commit is contained in:
@@ -65,6 +65,13 @@
|
|||||||
android:icon="@drawable/ic_folder_vd_theme_24"
|
android:icon="@drawable/ic_folder_vd_theme_24"
|
||||||
android:title="@string/bluetooth_show_files_received_via_bluetooth"/>
|
android:title="@string/bluetooth_show_files_received_via_bluetooth"/>
|
||||||
|
|
||||||
|
<SwitchPreference
|
||||||
|
android:key="uwb_settings"
|
||||||
|
android:title="@string/uwb_settings_title"
|
||||||
|
android:order="100"
|
||||||
|
android:summary="@string/summary_placeholder"
|
||||||
|
settings:controller="com.android.settings.uwb.UwbPreferenceController"/>
|
||||||
|
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
android:key="dashboard_tile_placeholder"
|
android:key="dashboard_tile_placeholder"
|
||||||
android:order="-8"/>
|
android:order="-8"/>
|
||||||
|
@@ -57,7 +57,9 @@ public class UwbPreferenceController extends TogglePreferenceController implemen
|
|||||||
public UwbPreferenceController(Context context, String key) {
|
public UwbPreferenceController(Context context, String key) {
|
||||||
super(context, key);
|
super(context, key);
|
||||||
mExecutor = Executors.newSingleThreadExecutor();
|
mExecutor = Executors.newSingleThreadExecutor();
|
||||||
mUwbManager = context.getSystemService(UwbManager.class);
|
if (isUwbSupportedOnDevice()) {
|
||||||
|
mUwbManager = context.getSystemService(UwbManager.class);
|
||||||
|
}
|
||||||
mAirplaneModeOn = Settings.Global.getInt(mContext.getContentResolver(),
|
mAirplaneModeOn = Settings.Global.getInt(mContext.getContentResolver(),
|
||||||
Settings.Global.AIRPLANE_MODE_ON, 0) == 1;
|
Settings.Global.AIRPLANE_MODE_ON, 0) == 1;
|
||||||
mAirplaneModeChangedReceiver = new BroadcastReceiver() {
|
mAirplaneModeChangedReceiver = new BroadcastReceiver() {
|
||||||
|
Reference in New Issue
Block a user