@@ -500,7 +504,8 @@ public final class Utils extends com.android.settingslib.Utils { * Lookup both {@link Intent#EXTRA_USER} and {@link Intent#EXTRA_USER_ID} in the bundle * and return the {@link UserHandle} object. Return {@code null} if nothing is found. */ - private static @Nullable UserHandle getUserHandleFromBundle(Bundle bundle) { + private static @Nullable + UserHandle getUserHandleFromBundle(Bundle bundle) { if (bundle == null) { return null; } @@ -515,14 +520,14 @@ public final class Utils extends com.android.settingslib.Utils { return null; } - /** - * Returns true if the user provided is in the same profiles group as the current user. - */ - private static boolean isProfileOf(UserManager um, UserHandle otherUser) { - if (um == null || otherUser == null) return false; - return (UserHandle.myUserId() == otherUser.getIdentifier()) - || um.getUserProfiles().contains(otherUser); - } + /** + * Returns true if the user provided is in the same profiles group as the current user. + */ + private static boolean isProfileOf(UserManager um, UserHandle otherUser) { + if (um == null || otherUser == null) return false; + return (UserHandle.myUserId() == otherUser.getIdentifier()) + || um.getUserProfiles().contains(otherUser); + } /** * Return whether or not the user should have a SIM Cards option in Settings. @@ -541,8 +546,9 @@ public final class Utils extends com.android.settingslib.Utils { /** * Queries for the UserInfo of a user. Returns null if the user doesn't exist (was removed). + * * @param userManager Instance of UserManager - * @param checkUser The user to check the existence of. + * @param checkUser The user to check the existence of. * @return UserInfo of the user or null for non-existent user. */ public static UserInfo getExistingUser(UserManager userManager, UserHandle checkUser) { @@ -582,7 +588,7 @@ public final class Utils extends com.android.settingslib.Utils { for (IntentFilter filter : filters) { if (filter.hasCategory(Intent.CATEGORY_BROWSABLE) && (filter.hasDataScheme(IntentFilter.SCHEME_HTTP) || - filter.hasDataScheme(IntentFilter.SCHEME_HTTPS))) { + filter.hasDataScheme(IntentFilter.SCHEME_HTTPS))) { result.addAll(filter.getHostsList()); } } @@ -625,7 +631,8 @@ public final class Utils extends com.android.settingslib.Utils { /** * Returns an accessible SpannableString. - * @param displayText the text to display + * + * @param displayText the text to display * @param accessibileText the text text-to-speech engines should read */ public static SpannableString createAccessibleSequence(CharSequence displayText, @@ -642,7 +649,7 @@ public final class Utils extends com.android.settingslib.Utils { * {@link Intent#EXTRA_USER_ID} if it belongs to the current user. * * @throws SecurityException if the given userId does not belong to the - * current user group. + * current user group. */ public static int getUserIdFromBundle(Context context, Bundle bundle) { return getUserIdFromBundle(context, bundle, false); @@ -653,10 +660,10 @@ public final class Utils extends com.android.settingslib.Utils { * {@link Intent#EXTRA_USER_ID} if it belongs to the current user. * * @param isInternal indicating if the caller is "internal" to the system, - * meaning we're willing to trust extras like - * {@link ChooseLockSettingsHelper#EXTRA_ALLOW_ANY_USER}. + * meaning we're willing to trust extras like + * {@link ChooseLockSettingsHelper#EXTRA_ALLOW_ANY_USER}. * @throws SecurityException if the given userId does not belong to the - * current user group. + * current user group. */ public static int getUserIdFromBundle(Context context, Bundle bundle, boolean isInternal) { if (bundle == null) { @@ -776,7 +783,7 @@ public final class Utils extends com.android.settingslib.Utils { final ApplicationInfo appInfo = context.getPackageManager().getApplicationInfo( packageName, PackageManager.MATCH_DISABLED_COMPONENTS - | PackageManager.MATCH_ANY_USER); + | PackageManager.MATCH_ANY_USER); return appInfo.loadLabel(context.getPackageManager()); } catch (PackageManager.NameNotFoundException e) { Log.w(TAG, "Unable to find info for package: " + packageName); @@ -835,8 +842,9 @@ public final class Utils extends com.android.settingslib.Utils { /** * Launches an intent which may optionally have a user id defined. + * * @param fragment Fragment to use to launch the activity. - * @param intent Intent to launch. + * @param intent Intent to launch. */ public static void launchIntent(Fragment fragment, Intent intent) { try { @@ -864,7 +872,8 @@ public final class Utils extends com.android.settingslib.Utils { /** * Returns if a given user is a profile of another user. - * @param user The user whose profiles wibe checked. + * + * @param user The user whose profiles wibe checked. * @param profile The (potential) profile. * @return if the profile is actually a profile */ @@ -889,9 +898,10 @@ public final class Utils extends com.android.settingslib.Utils { /** * Return {@code true} if the supplied package is device owner or profile owner of at * least one user. - * @param userManager used to get profile owner app for each user + * + * @param userManager used to get profile owner app for each user * @param devicePolicyManager used to check whether it is device owner app - * @param packageName package to check about + * @param packageName package to check about */ public static boolean isProfileOrDeviceOwner(UserManager userManager, DevicePolicyManager devicePolicyManager, String packageName) { @@ -943,8 +953,8 @@ public final class Utils extends com.android.settingslib.Utils { /** * Gets a drawable with a limited size to avoid crashing Settings if it's too big. * - * @param original original drawable, typically an app icon. - * @param maxWidth maximum width, in pixels. + * @param original original drawable, typically an app icon. + * @param maxWidth maximum width, in pixels. * @param maxHeight maximum height, in pixels. */ public static Drawable getSafeDrawable(Drawable original, int maxWidth, int maxHeight) { @@ -977,7 +987,7 @@ public final class Utils extends com.android.settingslib.Utils { public static IconCompat createIconWithDrawable(Drawable drawable) { Bitmap bitmap; if (drawable instanceof BitmapDrawable) { - bitmap = ((BitmapDrawable)drawable).getBitmap(); + bitmap = ((BitmapDrawable) drawable).getBitmap(); } else { final int width = drawable.getIntrinsicWidth(); final int height = drawable.getIntrinsicHeight(); @@ -1065,4 +1075,24 @@ public final class Utils extends com.android.settingslib.Utils { ActionBarShadowController.attachToView(activity, lifecycle, scrollView); } } + + /** + * Add a footer preference into preference group. + * + * @param group The parent {@link PreferenceGroup} of the footer preference. + * @param key The key value of the footer preference. + * @param title The title of the footer preference. + */ + public static void addFooterPreference(@NonNull Context context, @NonNull PreferenceGroup group, + String key, CharSequence title) { + final FooterPreference footerPreference = new FooterPreference(context); + footerPreference.setSelectable(false); + if (!TextUtils.isEmpty(key)) { + footerPreference.setKey(key); + } + if (!TextUtils.isEmpty(title)) { + footerPreference.setTitle(title); + } + group.addPreference(footerPreference); + } } diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java index 835961dee5e..86c45bbc827 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java @@ -25,13 +25,13 @@ import com.android.settings.R; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.widget.FooterPreference; -import com.android.settingslib.widget.FooterPreferenceMixinCompat; /** * This class adds the device MAC address to a footer. */ public class BluetoothDetailsMacAddressController extends BluetoothDetailsController { - FooterPreferenceMixinCompat mFooterPreferenceMixin; + public static final String KEY_DEVICE_DETAILS_FOOTER = "device_details_footer"; + FooterPreference mFooterPreference; public BluetoothDetailsMacAddressController(Context context, @@ -39,12 +39,11 @@ public class BluetoothDetailsMacAddressController extends BluetoothDetailsContro CachedBluetoothDevice device, Lifecycle lifecycle) { super(context, fragment, device, lifecycle); - mFooterPreferenceMixin = new FooterPreferenceMixinCompat(fragment, lifecycle); } @Override protected void init(PreferenceScreen screen) { - mFooterPreference = mFooterPreferenceMixin.createFooterPreference(); + mFooterPreference = screen.findPreference(KEY_DEVICE_DETAILS_FOOTER); mFooterPreference.setTitle(mContext.getString( R.string.bluetooth_device_mac_address, mCachedDevice.getAddress())); } @@ -57,9 +56,6 @@ public class BluetoothDetailsMacAddressController extends BluetoothDetailsContro @Override public String getPreferenceKey() { - if (mFooterPreference == null) { - return null; - } - return mFooterPreference.getKey(); + return KEY_DEVICE_DETAILS_FOOTER; } } \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java index 9798745f6da..ec1549fd8e5 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java @@ -15,8 +15,11 @@ */ package com.android.settings.bluetooth; +import static com.android.settings.bluetooth.BluetoothDetailsMacAddressController.KEY_DEVICE_DETAILS_FOOTER; + import static com.google.common.truth.Truth.assertThat; +import com.android.settings.Utils; import com.android.settingslib.widget.FooterPreference; import org.junit.Test; @@ -25,7 +28,6 @@ import org.robolectric.RobolectricTestRunner; @RunWith(RobolectricTestRunner.class) public class BluetoothDetailsMacAddressControllerTest extends BluetoothDetailsControllerTestBase { - private BluetoothDetailsMacAddressController mController; @Override @@ -34,6 +36,7 @@ public class BluetoothDetailsMacAddressControllerTest extends BluetoothDetailsCo mController = new BluetoothDetailsMacAddressController(mContext, mFragment, mCachedDevice, mLifecycle); setupDevice(mDeviceConfig); + Utils.addFooterPreference(mContext, mScreen, KEY_DEVICE_DETAILS_FOOTER, null /* title */); } @Test