PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use FooterPreference in xml explicitly"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-08-15 15:47:24 +00:00
committed by Android (Google) Code Review
parent 64600161fa 49ffd8f39f
commit 33051103c6
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/xml/bluetooth_screen.xml
View File

@@ -36,4 +36,8 @@
settings:useAdminDisabledSummary="true" settings:useAdminDisabledSummary="true"
settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"/> settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"/>
<com.android.settingslib.widget.FooterPreference
android:key="bluetooth_screen_footer"
android:selectable="false"
settings:searchable="false"/>
</PreferenceScreen> </PreferenceScreen>

3
src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
View File

@@ -46,6 +46,7 @@ import java.util.List;
public class BluetoothDashboardFragment extends DashboardFragment { public class BluetoothDashboardFragment extends DashboardFragment {
private static final String TAG = "BluetoothDashboardFrag"; 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"; public static final String KEY_BLUETOOTH_SCREEN = "bluetooth_switchbar_screen";
private FooterPreference mFooterPreference; private FooterPreference mFooterPreference;
@@ -75,7 +76,7 @@ public class BluetoothDashboardFragment extends DashboardFragment {
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
mFooterPreference = mFooterPreferenceMixin.createFooterPreference(); mFooterPreference = findPreference(KEY_BLUETOOTH_SCREEN_FOOTER);
} }
@Override @Override