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

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

Merge "Use FooterPreference in xml explicitly"

parents 64600161 49ffd8f3

res/xml/bluetooth_screen.xml

+4 −0
Original line number Diff line number Diff line
@@ -36,4 +36,8 @@ 
        settings:useAdminDisabledSummary="true"

        settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"/>



    <com.android.settingslib.widget.FooterPreference

        android:key="bluetooth_screen_footer"

        android:selectable="false"

        settings:searchable="false"/>

</PreferenceScreen>
 
 No newline at end of file

src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import java.util.List; 
public class BluetoothDashboardFragment extends DashboardFragment {



    private static final String TAG = "BluetoothDashboardFrag";

    private static final String KEY_BLUETOOTH_SCREEN_FOOTER = "bluetooth_screen_footer";

    public static final String KEY_BLUETOOTH_SCREEN = "bluetooth_switchbar_screen";



    private FooterPreference mFooterPreference;
@@ -75,7 +76,7 @@ public class BluetoothDashboardFragment extends DashboardFragment { 
    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        mFooterPreference = mFooterPreferenceMixin.createFooterPreference();

        mFooterPreference = findPreference(KEY_BLUETOOTH_SCREEN_FOOTER);

    }



    @Override