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

Split BluetoothSettings into two pages

Browse Source 
This cl splits the BluetoothSettings into paired device page and
pairing page, including small changes about:
1. Refactor the pages so they could get as much as static preference
from xml file rather than dynamically add/remove them everytime.
2. Remove creating method in BluetoothDeviceNamePreferenceController
and add it in xml file
3. Create BluetoothPairingDetail page, basically move the logic from
BluetoothSettings.
4. Make pairing preference clickable and jump to BluetoothPairingDetail
5. Add and update bunch of tests

Bug: 35877041
Test: RunSettingsRoboTests
Change-Id: Ief9e9690c612f7b46c58e866e5cecc511af642c8
This commit is contained in:
jackqdyulei
2017-05-10 14:57:16 -07:00
parent 5333ecd1fb
commit 52ccb49fbe
14 changed files with 704 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java
View File

@@ -16,12 +16,12 @@
package com.android.settings.bluetooth;
import android.app.Fragment;
import android.content.Context;
import android.support.v14.preference.PreferenceFragment;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.os.UserHandle;
import com.android.settings.SettingsActivity;
import com.android.settings.core.PreferenceController;
import com.android.settings.R;
@@ -34,11 +34,14 @@ public class BluetoothPairingPreferenceController extends PreferenceController {
public static final String KEY_PAIRING = "pref_bt_pairing";
private PreferenceFragment mFragment;
private SettingsActivity mActivity;
private Preference mPreference;
public BluetoothPairingPreferenceController(Context context, PreferenceFragment fragment) {
super(context);
public BluetoothPairingPreferenceController(Context context, PreferenceFragment fragment,
SettingsActivity activity) {
super(context);
mFragment = fragment;
mActivity = activity;
}
@Override
@@ -54,7 +57,9 @@ public class BluetoothPairingPreferenceController extends PreferenceController {
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (KEY_PAIRING.equals(preference.getKey())) {
//TODO: open the pairing page
mActivity.startPreferencePanelAsUser(mFragment, BluetoothPairingDetail.class.getName(),
null, R.string.bluetooth_pairing_page_title, null,
new UserHandle(UserHandle.myUserId()));
return true;
}
@@ -66,10 +71,11 @@ public class BluetoothPairingPreferenceController extends PreferenceController {
*
* @return bluetooth preference that created in this method
*/
public Preference createBluetoothPairingPreference() {
public Preference createBluetoothPairingPreference(int order) {
mPreference = new Preference(mFragment.getPreferenceScreen().getContext());
mPreference.setKey(KEY_PAIRING);
mPreference.setIcon(R.drawable.ic_add);
mPreference.setOrder(order);
mPreference.setTitle(R.string.bluetooth_pairing_pref_title);
return mPreference;