Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd29aada authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev

parents 15f963be 00d8ff5d

res/layout/preference_bluetooth.xml

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2006 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.

-->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center_vertical">



    <!-- Details button -->

    <ImageView

        android:id="@+id/deviceDetails"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:padding="8dip"

        android:background="?android:attr/selectableItemBackground"

        android:src="@drawable/ic_settings"

        android:contentDescription="@string/bluetooth_device_details" />



</LinearLayout>

res/layout/preference_progress_category.xml

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
            android:id="@android:id/icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:tint="?android:attr/textColorPrimary"

            android:maxWidth="18dp"

            android:maxHeight="18dp"/>

    </LinearLayout>
@@ -47,7 +46,8 @@ 
        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_gravity="start|center"

        android:textAppearance="@android:style/TextAppearance.Material.Body2"/>

        android:textAppearance="@android:style/TextAppearance.Material.Body2"

        android:textColor="?android:attr/colorAccent"/>



    <ProgressBar

        android:id="@+id/scanning_progress"

src/com/android/settings/bluetooth/BluetoothDevicePreference.java

+30 −35
Original line number Diff line number Diff line
@@ -30,14 +30,13 @@ import android.text.TextUtils; 
import android.util.Log;

import android.util.Pair;

import android.util.TypedValue;

import android.view.View;

import android.view.View.OnClickListener;

import android.widget.ImageView;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.core.instrumentation.MetricsFeatureProvider;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.widget.GearPreference;

import com.android.settingslib.bluetooth.CachedBluetoothDevice;

import com.android.settingslib.bluetooth.HidProfile;

import com.android.settingslib.bluetooth.LocalBluetoothProfile;
@@ -50,15 +49,14 @@ import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; 
 * BluetoothDevicePreference is the preference type used to display each remote

 * Bluetooth device in the Bluetooth Settings screen.

 */

public final class BluetoothDevicePreference extends Preference implements

        CachedBluetoothDevice.Callback, OnClickListener {

    private static final String TAG = "BluetoothDevicePreference";

public final class BluetoothDevicePreference extends GearPreference implements

        CachedBluetoothDevice.Callback {

    private static final String TAG = "BluetoothDevicePref";



    private static int sDimAlpha = Integer.MIN_VALUE;



    private final CachedBluetoothDevice mCachedDevice;



    private OnClickListener mOnSettingsClickListener;

    private final UserManager mUserManager;



    private AlertDialog mDisconnectDialog;
@@ -76,7 +74,8 @@ public final class BluetoothDevicePreference extends Preference implements 
    public final String BLUETOOTH = r.getString(R.string.bluetooth_talkback_bluetooth);



    public BluetoothDevicePreference(Context context, CachedBluetoothDevice cachedDevice) {

        super(context);

        super(context, null);

        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);



        if (sDimAlpha == Integer.MIN_VALUE) {

            TypedValue outValue = new TypedValue();
@@ -85,14 +84,6 @@ public final class BluetoothDevicePreference extends Preference implements 
        }



        mCachedDevice = cachedDevice;



        if (cachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) {

            UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);

            if (!um.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)) {

                setWidgetLayoutResource(R.layout.preference_bluetooth);

            }

        }



        mCachedDevice.registerCallback(this);



        onDeviceAttributesChanged();
@@ -102,12 +93,20 @@ public final class BluetoothDevicePreference extends Preference implements 
        notifyChanged();

    }



    CachedBluetoothDevice getCachedDevice() {

        return mCachedDevice;

    @Override

    protected boolean shouldHideSecondTarget() {

        return mCachedDevice == null

                || mCachedDevice.getBondState() != BluetoothDevice.BOND_BONDED

                || mUserManager.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH);

    }



    public void setOnSettingsClickListener(OnClickListener listener) {

        mOnSettingsClickListener = listener;

    @Override

    protected int getSecondTargetResId() {

        return R.layout.preference_widget_gear;

    }



    CachedBluetoothDevice getCachedDevice() {

        return mCachedDevice;

    }



    @Override
@@ -120,6 +119,10 @@ public final class BluetoothDevicePreference extends Preference implements 
        }

    }



    public CachedBluetoothDevice getBluetoothDevice() {

        return mCachedDevice;

    }



    public void onDeviceAttributesChanged() {

        /*

         * The preference framework takes care of making sure the value has
@@ -157,11 +160,10 @@ public final class BluetoothDevicePreference extends Preference implements 
        }



        if (mCachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) {

            ImageView deviceDetails = (ImageView) view.findViewById(R.id.deviceDetails);

            ImageView deviceDetails = (ImageView) view.findViewById(R.id.settings_button);



            if (deviceDetails != null) {

                deviceDetails.setOnClickListener(this);

                deviceDetails.setTag(mCachedDevice);

            }

        }

        final ImageView imageView = (ImageView) view.findViewById(android.R.id.icon);
@@ -171,13 +173,6 @@ public final class BluetoothDevicePreference extends Preference implements 
        super.onBindViewHolder(view);

    }



    public void onClick(View v) {

        // Should never be null by construction

        if (mOnSettingsClickListener != null) {

            mOnSettingsClickListener.onClick(v);

        }

    }



    @Override

    public boolean equals(Object o) {

        if ((o == null) || !(o instanceof BluetoothDevicePreference)) {

src/com/android/settings/bluetooth/BluetoothSettings.java

+21 −19
Original line number Diff line number Diff line
@@ -45,13 +45,14 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; 
import com.android.settings.LinkifyUtils;

import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;

import com.android.settings.dashboard.SummaryLoader;

import com.android.settings.location.ScanningSettings;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settings.search.SearchIndexableRaw;

import com.android.settings.widget.FooterPreference;

import com.android.settings.widget.GearPreference;

import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;

import com.android.settings.widget.SwitchBar;

import com.android.settings.widget.SwitchBarController;

import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
@@ -476,24 +477,25 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem 
        }

    }



    private final View.OnClickListener mDeviceProfilesListener = new View.OnClickListener() {

        @Override

        public void onClick(View v) {

    private final GearPreference.OnGearClickListener mDeviceProfilesListener = pref -> {

        // User clicked on advanced options icon for a device in the list

            if (!(v.getTag() instanceof CachedBluetoothDevice)) {

                Log.w(TAG, "onClick() called for other View: " + v);

        if (!(pref instanceof BluetoothDevicePreference)) {

            Log.w(TAG, "onClick() called for other View: " + pref);

            return;

        }



            final CachedBluetoothDevice device = (CachedBluetoothDevice) v.getTag();

            Bundle args = new Bundle();

        final CachedBluetoothDevice device =

                ((BluetoothDevicePreference) pref).getBluetoothDevice();

        if (device == null) {

            Log.w(TAG, "No BT device attached with this pref: " + pref);

            return;

        }

        final Bundle args = new Bundle();

        args.putString(DeviceProfilesSettings.ARG_DEVICE_ADDRESS,

                device.getDevice().getAddress());

            DeviceProfilesSettings profileSettings = new DeviceProfilesSettings();

        final DeviceProfilesSettings profileSettings = new DeviceProfilesSettings();

        profileSettings.setArguments(args);

        profileSettings.show(getFragmentManager(),

                DeviceProfilesSettings.class.getSimpleName());

        }

    };



    /**
@@ -506,7 +508,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem 
        CachedBluetoothDevice cachedDevice = preference.getCachedDevice();

        if (cachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) {

            // Only paired device have an associated advanced settings screen

            preference.setOnSettingsClickListener(mDeviceProfilesListener);

            preference.setOnGearClickListener(mDeviceProfilesListener);

        }

    }

src/com/android/settings/bluetooth/DevicePickerFragment.java

+0 −5
Original line number Diff line number Diff line
@@ -61,11 +61,6 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment { 
        mLaunchClass = intent.getStringExtra(BluetoothDevicePicker.EXTRA_LAUNCH_CLASS);

    }



    @Override

    void initDevicePreference(BluetoothDevicePreference preference) {

        preference.setWidgetLayoutResource(R.layout.preference_empty_list);

    }



    @Override

    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

        menu.add(Menu.NONE, MENU_ID_REFRESH, 0, R.string.bluetooth_search_for_devices)