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-09 00:25:22 +00:00
committed by Android (Google) Code Review
parent 6c38db1c39 660b36e061
commit fa9e685fff
4 changed files with 83 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/bluetooth_device_details_fragment.xml
View File

@@ -47,4 +47,10 @@
<PreferenceCategory <PreferenceCategory
android:key="bluetooth_profiles"/> android:key="bluetooth_profiles"/>
<com.android.settingslib.widget.FooterPreference
android:key="device_details_footer"
android:selectable="false"
settings:searchable="false"
settings:controller="com.android.settings.bluetooth.BluetoothDetailsMacAddressController"/>
</PreferenceScreen> </PreferenceScreen>

108
src/com/android/settings/Utils.java
View File

@@ -92,6 +92,7 @@ import android.widget.ListView;
import android.widget.TabWidget; import android.widget.TabWidget;
import androidx.annotation.StringRes; import androidx.annotation.StringRes;
import androidx.annotation.NonNull;
import androidx.core.graphics.drawable.IconCompat; import androidx.core.graphics.drawable.IconCompat;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Lifecycle;
@@ -105,6 +106,7 @@ import com.android.settings.core.FeatureFlags;
import com.android.settings.development.featureflags.FeatureFlagPersistent; import com.android.settings.development.featureflags.FeatureFlagPersistent;
import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.widget.ActionBarShadowController; import com.android.settingslib.widget.ActionBarShadowController;
import com.android.settingslib.widget.FooterPreference;
import java.net.InetAddress; import java.net.InetAddress;
import java.util.Iterator; import java.util.Iterator;
@@ -139,16 +141,16 @@ public final class Utils extends com.android.settingslib.Utils {
* Finds a matching activity for a preference's intent. If a matching * Finds a matching activity for a preference's intent. If a matching
* activity is not found, it will remove the preference. * activity is not found, it will remove the preference.
* *
* @param context The context. * @param context The context.
* @param parentPreferenceGroup The preference group that contains the * @param parentPreferenceGroup The preference group that contains the
* preference whose intent is being resolved. * preference whose intent is being resolved.
* @param preferenceKey The key of the preference whose intent is being * @param preferenceKey The key of the preference whose intent is being
* resolved. * resolved.
* @param flags 0 or one or more of * @param flags 0 or one or more of
* {@link #UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY} * {@link #UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY}
* . * .
* @return Whether an activity was found. If false, the preference was * @return Whether an activity was found. If false, the preference was
* removed. * removed.
*/ */
public static boolean updatePreferenceToSpecificActivityOrRemove(Context context, public static boolean updatePreferenceToSpecificActivityOrRemove(Context context,
PreferenceGroup parentPreferenceGroup, String preferenceKey, int flags) { PreferenceGroup parentPreferenceGroup, String preferenceKey, int flags) {
@@ -221,6 +223,7 @@ public final class Utils extends com.android.settingslib.Utils {
/** /**
* Returns the WIFI IP Addresses, if any, taking into account IPv4 and IPv6 style addresses. * Returns the WIFI IP Addresses, if any, taking into account IPv4 and IPv6 style addresses.
*
* @param context the application context * @param context the application context
* @return the formatted and newline-separated IP addresses, or null if none. * @return the formatted and newline-separated IP addresses, or null if none.
*/ */
@@ -229,7 +232,7 @@ public final class Utils extends com.android.settingslib.Utils {
Network currentNetwork = wifiManager.getCurrentNetwork(); Network currentNetwork = wifiManager.getCurrentNetwork();
if (currentNetwork != null) { if (currentNetwork != null) {
ConnectivityManager cm = (ConnectivityManager) ConnectivityManager cm = (ConnectivityManager)
context.getSystemService(Context.CONNECTIVITY_SERVICE); context.getSystemService(Context.CONNECTIVITY_SERVICE);
LinkProperties prop = cm.getLinkProperties(currentNetwork); LinkProperties prop = cm.getLinkProperties(currentNetwork);
return formatIpAddresses(prop); return formatIpAddresses(prop);
} }
@@ -257,8 +260,9 @@ public final class Utils extends com.android.settingslib.Utils {
// many cases, because the constructor takes the only string as the language // many cases, because the constructor takes the only string as the language
// code. So : new Locale("en", "US").toString() => "en_US" // code. So : new Locale("en", "US").toString() => "en_US"
// And : new Locale("en_US").toString() => "en_us" // And : new Locale("en_US").toString() => "en_us"
if (null == localeStr) if (null == localeStr) {
return Locale.getDefault(); return Locale.getDefault();
}
String[] brokenDownLocale = localeStr.split("_", 3); String[] brokenDownLocale = localeStr.split("_", 3);
// split may not return a 0-length array. // split may not return a 0-length array.
if (1 == brokenDownLocale.length) { if (1 == brokenDownLocale.length) {
@@ -329,7 +333,7 @@ public final class Utils extends com.android.settingslib.Utils {
final long localRowProfileId; final long localRowProfileId;
final Cursor localRawProfile = cr.query( final Cursor localRawProfile = cr.query(
Profile.CONTENT_RAW_CONTACTS_URI, Profile.CONTENT_RAW_CONTACTS_URI,
new String[] {RawContacts._ID}, new String[]{RawContacts._ID},
RawContacts.ACCOUNT_TYPE + " IS NULL AND " + RawContacts.ACCOUNT_TYPE + " IS NULL AND " +
RawContacts.ACCOUNT_NAME + " IS NULL", RawContacts.ACCOUNT_NAME + " IS NULL",
null, null); null, null);
@@ -347,8 +351,8 @@ public final class Utils extends com.android.settingslib.Utils {
// Find the structured name for the raw contact. // Find the structured name for the raw contact.
final Cursor structuredName = cr.query( final Cursor structuredName = cr.query(
Profile.CONTENT_URI.buildUpon().appendPath(Contacts.Data.CONTENT_DIRECTORY).build(), Profile.CONTENT_URI.buildUpon().appendPath(Contacts.Data.CONTENT_DIRECTORY).build(),
new String[] {CommonDataKinds.StructuredName.GIVEN_NAME, new String[]{CommonDataKinds.StructuredName.GIVEN_NAME,
CommonDataKinds.StructuredName.FAMILY_NAME}, CommonDataKinds.StructuredName.FAMILY_NAME},
Data.RAW_CONTACT_ID + "=" + localRowProfileId, Data.RAW_CONTACT_ID + "=" + localRowProfileId,
null, null); null, null);
if (structuredName == null) return null; if (structuredName == null) return null;
@@ -370,7 +374,7 @@ public final class Utils extends com.android.settingslib.Utils {
private static final String getProfileDisplayName(Context context) { private static final String getProfileDisplayName(Context context) {
final ContentResolver cr = context.getContentResolver(); final ContentResolver cr = context.getContentResolver();
final Cursor profile = cr.query(Profile.CONTENT_URI, final Cursor profile = cr.query(Profile.CONTENT_URI,
new String[] {Profile.DISPLAY_NAME}, null, null, null); new String[]{Profile.DISPLAY_NAME}, null, null, null);
if (profile == null) return null; if (profile == null) return null;
try { try {
@@ -451,7 +455,7 @@ public final class Utils extends com.android.settingslib.Utils {
* <ul> * <ul>
* <li> If this activity is launched from other user, return that user id. * <li> If this activity is launched from other user, return that user id.
* <li> If this is launched from the Settings app in same user, return the user contained as an * <li> If this is launched from the Settings app in same user, return the user contained as an
* extra in the arguments or intent extras. * extra in the arguments or intent extras.
* <li> Otherwise, return UserHandle.myUserId(). * <li> Otherwise, return UserHandle.myUserId().
* </ul> * </ul>
* <p> * <p>
@@ -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 * 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. * 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) { if (bundle == null) {
return null; return null;
} }
@@ -515,14 +520,14 @@ public final class Utils extends com.android.settingslib.Utils {
return null; return null;
} }
/** /**
* Returns true if the user provided is in the same profiles group as the current user. * Returns true if the user provided is in the same profiles group as the current user.
*/ */
private static boolean isProfileOf(UserManager um, UserHandle otherUser) { private static boolean isProfileOf(UserManager um, UserHandle otherUser) {
if (um == null || otherUser == null) return false; if (um == null || otherUser == null) return false;
return (UserHandle.myUserId() == otherUser.getIdentifier()) return (UserHandle.myUserId() == otherUser.getIdentifier())
|| um.getUserProfiles().contains(otherUser); || um.getUserProfiles().contains(otherUser);
} }
/** /**
* Return whether or not the user should have a SIM Cards option in Settings. * 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). * Queries for the UserInfo of a user. Returns null if the user doesn't exist (was removed).
*
* @param userManager Instance of UserManager * @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. * @return UserInfo of the user or null for non-existent user.
*/ */
public static UserInfo getExistingUser(UserManager userManager, UserHandle checkUser) { 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) { for (IntentFilter filter : filters) {
if (filter.hasCategory(Intent.CATEGORY_BROWSABLE) if (filter.hasCategory(Intent.CATEGORY_BROWSABLE)
&& (filter.hasDataScheme(IntentFilter.SCHEME_HTTP) || && (filter.hasDataScheme(IntentFilter.SCHEME_HTTP) ||
filter.hasDataScheme(IntentFilter.SCHEME_HTTPS))) { filter.hasDataScheme(IntentFilter.SCHEME_HTTPS))) {
result.addAll(filter.getHostsList()); result.addAll(filter.getHostsList());
} }
} }
@@ -625,7 +631,8 @@ public final class Utils extends com.android.settingslib.Utils {
/** /**
* Returns an accessible SpannableString. * 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 * @param accessibileText the text text-to-speech engines should read
*/ */
public static SpannableString createAccessibleSequence(CharSequence displayText, 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. * {@link Intent#EXTRA_USER_ID} if it belongs to the current user.
* *
* @throws SecurityException if the given userId does not belong to the * @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) { public static int getUserIdFromBundle(Context context, Bundle bundle) {
return getUserIdFromBundle(context, bundle, false); 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. * {@link Intent#EXTRA_USER_ID} if it belongs to the current user.
* *
* @param isInternal indicating if the caller is "internal" to the system, * @param isInternal indicating if the caller is "internal" to the system,
* meaning we're willing to trust extras like * meaning we're willing to trust extras like
* {@link ChooseLockSettingsHelper#EXTRA_ALLOW_ANY_USER}. * {@link ChooseLockSettingsHelper#EXTRA_ALLOW_ANY_USER}.
* @throws SecurityException if the given userId does not belong to the * @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) { public static int getUserIdFromBundle(Context context, Bundle bundle, boolean isInternal) {
if (bundle == null) { if (bundle == null) {
@@ -776,7 +783,7 @@ public final class Utils extends com.android.settingslib.Utils {
final ApplicationInfo appInfo = context.getPackageManager().getApplicationInfo( final ApplicationInfo appInfo = context.getPackageManager().getApplicationInfo(
packageName, packageName,
PackageManager.MATCH_DISABLED_COMPONENTS PackageManager.MATCH_DISABLED_COMPONENTS
| PackageManager.MATCH_ANY_USER); | PackageManager.MATCH_ANY_USER);
return appInfo.loadLabel(context.getPackageManager()); return appInfo.loadLabel(context.getPackageManager());
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
Log.w(TAG, "Unable to find info for package: " + packageName); 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. * Launches an intent which may optionally have a user id defined.
*
* @param fragment Fragment to use to launch the activity. * @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) { public static void launchIntent(Fragment fragment, Intent intent) {
try { 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. * 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. * @param profile The (potential) profile.
* @return if the profile is actually a 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 * Return {@code true} if the supplied package is device owner or profile owner of at
* least one user. * 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 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, public static boolean isProfileOrDeviceOwner(UserManager userManager,
DevicePolicyManager devicePolicyManager, String packageName) { 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. * 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 original original drawable, typically an app icon.
* @param maxWidth maximum width, in pixels. * @param maxWidth maximum width, in pixels.
* @param maxHeight maximum height, in pixels. * @param maxHeight maximum height, in pixels.
*/ */
public static Drawable getSafeDrawable(Drawable original, int maxWidth, int maxHeight) { 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) { public static IconCompat createIconWithDrawable(Drawable drawable) {
Bitmap bitmap; Bitmap bitmap;
if (drawable instanceof BitmapDrawable) { if (drawable instanceof BitmapDrawable) {
bitmap = ((BitmapDrawable)drawable).getBitmap(); bitmap = ((BitmapDrawable) drawable).getBitmap();
} else { } else {
final int width = drawable.getIntrinsicWidth(); final int width = drawable.getIntrinsicWidth();
final int height = drawable.getIntrinsicHeight(); final int height = drawable.getIntrinsicHeight();
@@ -1065,4 +1075,24 @@ public final class Utils extends com.android.settingslib.Utils {
ActionBarShadowController.attachToView(activity, lifecycle, scrollView); 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);
}
} }

12
src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
View File

@@ -25,13 +25,13 @@ import com.android.settings.R;
import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.FooterPreference;
import com.android.settingslib.widget.FooterPreferenceMixinCompat;
/** /**
* This class adds the device MAC address to a footer. * This class adds the device MAC address to a footer.
*/ */
public class BluetoothDetailsMacAddressController extends BluetoothDetailsController { public class BluetoothDetailsMacAddressController extends BluetoothDetailsController {
FooterPreferenceMixinCompat mFooterPreferenceMixin; public static final String KEY_DEVICE_DETAILS_FOOTER = "device_details_footer";
FooterPreference mFooterPreference; FooterPreference mFooterPreference;
public BluetoothDetailsMacAddressController(Context context, public BluetoothDetailsMacAddressController(Context context,
@@ -39,12 +39,11 @@ public class BluetoothDetailsMacAddressController extends BluetoothDetailsContro
CachedBluetoothDevice device, CachedBluetoothDevice device,
Lifecycle lifecycle) { Lifecycle lifecycle) {
super(context, fragment, device, lifecycle); super(context, fragment, device, lifecycle);
mFooterPreferenceMixin = new FooterPreferenceMixinCompat(fragment, lifecycle);
} }
@Override @Override
protected void init(PreferenceScreen screen) { protected void init(PreferenceScreen screen) {
mFooterPreference = mFooterPreferenceMixin.createFooterPreference(); mFooterPreference = screen.findPreference(KEY_DEVICE_DETAILS_FOOTER);
mFooterPreference.setTitle(mContext.getString( mFooterPreference.setTitle(mContext.getString(
R.string.bluetooth_device_mac_address, mCachedDevice.getAddress())); R.string.bluetooth_device_mac_address, mCachedDevice.getAddress()));
} }
@@ -57,9 +56,6 @@ public class BluetoothDetailsMacAddressController extends BluetoothDetailsContro
@Override @Override
public String getPreferenceKey() { public String getPreferenceKey() {
if (mFooterPreference == null) { return KEY_DEVICE_DETAILS_FOOTER;
return null;
}
return mFooterPreference.getKey();
} }
} }

5
tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java
View File

@@ -15,8 +15,11 @@
*/ */
package com.android.settings.bluetooth; 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 static com.google.common.truth.Truth.assertThat;
import com.android.settings.Utils;
import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.FooterPreference;
import org.junit.Test; import org.junit.Test;
@@ -25,7 +28,6 @@ import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class BluetoothDetailsMacAddressControllerTest extends BluetoothDetailsControllerTestBase { public class BluetoothDetailsMacAddressControllerTest extends BluetoothDetailsControllerTestBase {
private BluetoothDetailsMacAddressController mController; private BluetoothDetailsMacAddressController mController;
@Override @Override
@@ -34,6 +36,7 @@ public class BluetoothDetailsMacAddressControllerTest extends BluetoothDetailsCo
mController = mController =
new BluetoothDetailsMacAddressController(mContext, mFragment, mCachedDevice, mLifecycle); new BluetoothDetailsMacAddressController(mContext, mFragment, mCachedDevice, mLifecycle);
setupDevice(mDeviceConfig); setupDevice(mDeviceConfig);
Utils.addFooterPreference(mContext, mScreen, KEY_DEVICE_DETAILS_FOOTER, null /* title */);
} }
@Test @Test