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

Commit 0401d8ab authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6055731 from 95820eb0 to qt-qpr2-release 

Change-Id: I148cdc869b980d6701ea163d408258824e1c6d39
parents 32e6cfe8 95820eb0

res/layout/advanced_bt_entity_sub.xml

+3 −2
Original line number Diff line number Diff line
@@ -51,8 +51,9 @@ 
        android:orientation="horizontal">

        <ImageView

            android:id="@+id/bt_battery_icon"

            android:layout_width="13dp"

            android:layout_height="20dp"/>

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"/>

        <TextView

            android:id="@+id/bt_battery_summary"

            style="@style/TextAppearance.EntityHeaderSummary"

res/values/dimens.xml

+7 −0
Original line number Diff line number Diff line
@@ -414,4 +414,11 @@ 


    <!-- System navigation settings illustration height -->

    <dimen name="system_navigation_illustration_height">320dp</dimen>



    <!-- Header title size of advanced bluetooth device -->

    <dimen name="advanced_bluetooth_header_title_text_size">16sp</dimen>



    <!-- Battery meter icon size of advanced bluetooth device -->

    <dimen name="advanced_bluetooth_battery_meter_width">7.8dp</dimen>

    <dimen name="advanced_bluetooth_battery_meter_height">13dp</dimen>

</resources>

src/com/android/settings/biometrics/face/FaceSettings.java

+4 −0
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ public class FaceSettings extends DashboardFragment { 
                ((FaceSettingsPreferenceController) controller).setUserId(mUserId);

            } else if (controller instanceof FaceSettingsEnrollButtonPreferenceController) {

                ((FaceSettingsEnrollButtonPreferenceController) controller).setUserId(mUserId);

            } else if (controller instanceof FaceSettingsLockscreenBypassPreferenceController) {

                ((FaceSettingsLockscreenBypassPreferenceController) controller).setUserId(mUserId);

            }

        }

        mRemoveController.setUserId(mUserId);
@@ -149,6 +151,7 @@ public class FaceSettings extends DashboardFragment { 
        // Don't show keyguard controller for work profile settings.

        if (mUserManager.isManagedProfile(mUserId)) {

            removePreference(FaceSettingsKeyguardPreferenceController.KEY);

            removePreference(FaceSettingsLockscreenBypassPreferenceController.KEY);

        }



        if (savedInstanceState != null) {
@@ -260,6 +263,7 @@ public class FaceSettings extends DashboardFragment { 
        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        controllers.add(new FaceSettingsVideoPreferenceController(context));

        controllers.add(new FaceSettingsKeyguardPreferenceController(context));

        controllers.add(new FaceSettingsLockscreenBypassPreferenceController(context));

        controllers.add(new FaceSettingsAppPreferenceController(context));

        controllers.add(new FaceSettingsAttentionPreferenceController(context));

        controllers.add(new FaceSettingsRemoveButtonPreferenceController(context));

src/com/android/settings/biometrics/face/FaceSettingsLockscreenBypassPreferenceController.java

+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,10 @@ public class FaceSettingsLockscreenBypassPreferenceController 
    protected FaceManager mFaceManager;

    private UserManager mUserManager;



    public FaceSettingsLockscreenBypassPreferenceController(Context context) {

        this(context, KEY);

    }



    public FaceSettingsLockscreenBypassPreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);

        if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE)) {

src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java

+11 −4
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import java.util.Map; 
public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceController implements

        LifecycleObserver, OnStart, OnStop, OnDestroy, CachedBluetoothDevice.Callback {

    private static final String TAG = "AdvancedBtHeaderCtrl";

    private static final int LOW_BATTERY_LEVEL = 20;



    @VisibleForTesting

    LayoutPreference mLayoutPreference;
@@ -180,12 +181,18 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont 
    Drawable createBtBatteryIcon(Context context, int level, boolean charging) {

        final BatteryMeterView.BatteryMeterDrawable drawable =

                new BatteryMeterView.BatteryMeterDrawable(context,

                        context.getColor(R.color.meter_background_color));

                        context.getColor(R.color.meter_background_color),

                        context.getResources().getDimensionPixelSize(

                                R.dimen.advanced_bluetooth_battery_meter_width),

                        context.getResources().getDimensionPixelSize(

                                R.dimen.advanced_bluetooth_battery_meter_height));

        drawable.setBatteryLevel(level);

        final int attr = level > LOW_BATTERY_LEVEL || charging

                ? android.R.attr.colorControlNormal

                : android.R.attr.colorError;

        drawable.setColorFilter(new PorterDuffColorFilter(

                com.android.settings.Utils.getColorAttrDefaultColor(context,

                        android.R.attr.colorControlNormal),

                PorterDuff.Mode.SRC_IN));

                com.android.settings.Utils.getColorAttrDefaultColor(context, attr),

                PorterDuff.Mode.SRC));

        drawable.setCharging(charging);



        return drawable;